ProjectController + htmls
Merge branch 'master' into featureGroup

Conflicts:
	foobar/src/main/java/jrmds/xml/XmlController.java
	foobar/src/main/java/jrmds/xml/XmlConverter.java