small changes
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	views/private/post-blog.jade