auth service
Merge branch 'master' into auth

Conflicts:
	Firefox/www/js/app.js
	Firefox/www/js/controllers.js
	Firefox/www/js/services.js