Merge branch 'master' of https://github.com/cbtodbsweb/livesitebuild.git

Conflicts:
	build.xml