Fixes
Merge branch 'master' of https://github.com/jtanori/mobiright

Conflicts:
	.bowerrc
	.gitignore
	.jshintrc
	Gruntfile.js
	app/index.html
	app/scripts/app.js
	app/scripts/main.js
	app/scripts/setup.js
	app/scripts/templates/bar.js
	app/styles/main.scss
	app/templates/bar.jade