Fix for server
Merge branch 'master' of https://github.com/agustincl/anguilaperro

Conflicts:
	application/configs/config.ini