Syntax correction
Merge branch 'master' into wysiwyg_post_editor

Conflicts:
	app/views/posts/show.html.haml
Blog entries design fix
Tools for posts added and fixed some display issues
Merge pull request #1 from Yinfei84/wysiwyg_post_editor

Wysiwyg post editor