Gmail
Merge pull request #28 from tcivera/master

Gmail auth
Merge
Merge branch 'master' of https://github.com/AnikaEDC/anguilaperro into AnikaEDC-master

Conflicts:
	.buildpath
Merge branch 'master' of https://github.com/agustincl/anguilaperro

Conflicts:
	application/controllers/Author.php
	application/views/author/login.phtml
Login & Special Groups
Merge pull request #29 from AnikaEDC/master

fix backend without login
Register User
Register User
Merge branch 'master' of https://github.com/jabrilcru/anguilaperro into jabrilcru-master

Conflicts:
	application/controllers/Author.php
Merge pull request #31 from AnikaEDC/master

hello in login
Gmail working more or less
Timeout
Merge branch 'tcivera-master'

Conflicts:
	application/controllers/Author.php
Fix for register
Languages .po .mo
idiomas