Merge origin/master

Conflicts:
	src/java/SessionBeans/PostFacade.java