Some changes
Merge branch 'master' of https://github.com/UbiquitousSpice/HackathonNovember2014

Conflicts:
	app/www/js/index.js