change
Merge branch 'master' of git@github.com:UberMedved/allo.git

Conflicts:
	ejb/pom.xml
	ejb/src/main/java/bbc/juniperus/allo/ejb/BizzBean.java
Dont get it.