routes and permissions error
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/comment.server.model.js
	public/modules/core/views/home.client.view.html