Trying to get local working project
Merge branch 'master' of https://github.com/bergero8/291-mobileapp

Conflicts:
	app/controllers/categories.js
	app/controllers/home.js
	app/controllers/index.js
	app/controllers/settings.js
	app/controllers/setup.js
	app/lib/core.js
	app/lib/data/app.json
	app/styles/index.tss
	app/views/categories.xml
	app/views/home.xml
	app/views/setup.xml
Update with some Army stuff