added rock/base-cmake and rock/base-types to build script
Merge branch 'master' of https://github.com/rock-simulation/mars

Conflicts:
	scripts/bootstrap/packageList.txt.example
added rock/base-types to install script