post content
Merge branch 'lxj' into develop

Conflicts:
	app/models/Post.java