rdam
Merge branch 'integration' of https://github.com/fschram/cdtoolset.git
into integration

Conflicts:
	springmvcapp/src/main/webapp/WEB-INF/views/home.jsp