Commets
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/forum/category.blade.php
	app/views/profile/user.blade.php