Merge branch 'master-2.1' of github.com:dotCMS/dotCMS into master-2.1

build updated

dotCMS#844 fix task for dotFolderPath

updated build.xml for .git exclusion

Working on issue dotCMS#264 fixes on autoupdater for 2.0