add target and settings directories
Update master build script
Update from 1/16/2012
update from 1/16/2013
Merge branch 'master' of https://github.com/NCIP/calims2

Conflicts:
	calims2/build/build.xml
	calims2/src/common/bda-download/bda-ivy-2.0.0-build.xml
	calims2/src/common/bda-download/ivy-bda-settings.xml