post message
Merge origin/master

Conflicts:
	build/web/WEB-INF/classes/core/Category.class
	build/web/WEB-INF/classes/core/CategoryBean.class
	build/web/WEB-INF/classes/core/Message.class
	build/web/WEB-INF/classes/core/Service.class
	build/web/WEB-INF/classes/core/UserBean.class