Reenvio do código
Merge branch 'master' of https://github.com/Dan111/AdCapp-Client

Conflicts:
	app/app.config.js