Commit
Merge branch 'master' of https://github.com/boblenclume/miniFramework

Conflicts:
	src/Model/Comment.php