merged beta branch to master
master branch for deployments @ICM
beta
codebase used to migrate to java8 the production system