sd
Merge remote-tracking branch 'origin/master'

Conflicts:
	UBlog/WebContent/assets/TEMPLATES/common_feed.jsp