Merge branch 'searchConstruction' of
https://github.com/swt14w01/JRMDS.git into searchConstruction

Conflicts:
	foobar/src/main/resources/static/img/group_w.png
minor changes (optimizing header)
Merge branch 'master' into searchConstruction