problemas de conflitos
Merge branch 'master' of github.com:humbertocruz/AuthBootstrap