Merge branch 'master' into dev
+ added build number logic; build number gets increased with every call to jar task
* modified build number logic; build number only gets bumped up when run with '-PbumpBuild'
* refactoring
Merge branch 'dev'
* build script bug fixes