Added notifications
Merge branch 'master' of github.com:wilsonpage/firefoxos-media-backup

Conflicts:
	js/app.js
Restructure