Merge origin/master

Conflicts:
	ES09-MerLION-ejb/src/java/merlion/ejb/AccountSessionBean.java
	nbproject/project.properties
Merge origin/master
correct sessionbeans/managedbeans to match the entities