updated build
Merge branch 'master-2.5' of github.com:dotCMS/core-2.x into master-2.5