Pray it works
Merge branch 'master' of https://github.com/dddaaammmooo/portal

Conflicts:
	app/config/database.php
	app/storage/sessions/sess_df32esr4ejrhqe19hchl850oa4