Migrating to web app rather than chrome app.
Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	js/ng-controllers/notification.controller.js
	js/ng-services/oauth2.js
	js/ng-services/storage.js
	oauth2.html