Improved buildscript
Merge branch 'master' of https://github.com/tfroehlich82/koalixcrm