Enteprise 7 commit
Merge branch 'master' of https://github.com/bunnika/Enterprise7.git