Merge origin/master

Conflicts:
	IslandSystem/IslandSystem-ejb/src/java/session/stateless/ScmBean.java
Merge origin/master