Nat: Added in Junit testing and changed view all staff back to normal (HAVEN'T TEST)
Merge origin/master

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