Syntax correction
Merge branch 'master' into wysiwyg_post_editor

Conflicts:
	app/views/posts/show.html.haml