3 commits

Author	SHA1	Message	Date
Luke Pulverenti	33b01d778c	merge from dev	2015-12-14 10:43:03 -05:00
Luke Pulverenti	930c8cf6d8	update offline detection	2015-09-21 11:43:10 -04:00
Luke Pulverenti	6c549ec80b	update jqm	2015-09-01 00:15:10 -04:00