asldkjf
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/config/database.php
	app/controllers/EditingController.php