Adding missing changes
Merge branch 'master' of https://github.com/phalcon/forum

Conflicts:
	app/controllers/DiscussionsController.php
	app/views/partials/list-posts.volt