Dumoed version to 2.1.0 and added all modules to build.
Merge branch 'develop' into Christian
Moved webtemplates above webservices that depends on it.
Merge branch 'develop' into Christian

Fixed Conflicts:
	pom.xml