updating login system
Merge branch 'master' of github.com:pagliaccio/AgeOfEvolution

Conflicts:
	application/configs/application.ini
	application/controllers/ErrorController.php
	application/controllers/RegController.php

updating login system