Início das notificações
Merge branch 'master' of https://github.com/Dan111/AdCapp-Client

Conflicts:
	app/views/calendar.js
	index.html
Merge branch 'master' of https://github.com/Dan111/AdCapp-Client

Conflicts:
	index.html