Logo and notifications
Merge branch 'master' of https://github.com/antoniocortesjusto/AwesomeTeaser

Conflicts:
	html/demo/css/home.css
	html/demo/html/profile.html
	html/demo/js/controllers.js
	html/home.html
Other