database.php
Saving metadata v0.6
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/PostController.php