login and logout working
Merge branch 'master' of github.com:adrianogl/congress

Conflicts:
	app/config/database.php