update
Merge branch 'master' of https://github.com/woozzaa/idaginatt2

Conflicts:
	app/config/database.php