misc
Merge remote-tracking branch 'origin/master'

Conflicts:
	JeViewerEnterprise-ejb/pom.xml
misc