Fixes Imagine\Exception\InvalidArgumentException File doesn't exist
Merge remote-tracking branch 'origin/master'

Conflicts:
	controllers/PostController.php