pruebas
pruebas
deshacer bootstrap
deshacer bootstrap
Merge branch 'master' of https://github.com/agustincl/anguilaperro
Merge branch 'master' of https://github.com/agustincl/anguilaperro
Merge branch 'master' of https://github.com/agustincl/anguilaperro
login and logout process
Gmail
Merge pull request #28 from tcivera/master

Gmail auth
groups
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
fix backend without login
Improve groups
Merge pull request #29 from AnikaEDC/master

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

Conflicts:
	application/controllers/Author.php