Fixing pygooglechart requirement reference.
Fixing ADMINS inside auth
Merge pull request #1 from carloshfoliveira/master

Fixing ADMINS inside auth
Fixing ADMINS inside auth
Merge pull request #2 from jeffersonxavier/master

Change gitignore locale
Merge pull request #1 from CAEP-UnB/master

Updating gitigonre
Merge branch 'master' of https://github.com/gestorpsi/gestorpsi

Conflicts:
	gestorpsi/gcm/views/auth.py
Merge pull request #3 from rodrigo14/master

Merge pull request #1 from CAEP-UnB/master
Merge pull request #1 from CAEP-UnB/master

Merging differences from forked repos
Merge pull request #2 from gestorpsi/master

Merging official commits
Merge pull request #3 from carloshfoliveira/master

Merging into devel
Exclude error message for not using chrome

Signed-off-by: Aulus Diniz <aulus999@gmail.com>
Signed-off-by: Jefferson Xavier  <jeffersonx.xavier@gmail.com>
Merge pull request #4 from jeffersonxavier/devel

Exclude error message for not using chrome
Exclude error message for not using chrome

Signed-off-by: Aulus Diniz <aulus999@gmail.com>
Signed-off-by: Jefferson Xavier  <jeffersonx.xavier@gmail.com>
Revert "Exclude error message for not using chrome"
Change translation of new device type

Signed-off-by: Álex Mesquita <alex.mesquita06@hotmail.com>
Signed-off-by: Rodrigo Gonçalves <rodrigosg2000@hotmail.com>
Merge pull request #5 from alexmesquita/devel

Change translation of new device type
Merge pull request #6 from carloshfoliveira/revert-4-devel

Revert "Exclude error message for not using chrome"
Merge branch 'devel' of https://github.com/carloshfoliveira/gestorpsi into devel
Merge pull request #7 from jeffersonxavier/devel

Exclude chrome restriction!