post content
Merge branch 'lxj' into develop

Conflicts:
	app/models/Post.java
Merge branch 'develop' into Allen_Branch
change some detail views of posts;profile is running well