bb
abc
Merge branch 'master' of https://github.com/bergero8/291-mobileapp

Conflicts:
	Resources/android/alloy/controllers/home.js
	Resources/android/core.js
lastest commit with Craig
Added more tabs. Keep getting Error message with them. Check core.js 594- ~ 620(?)