testing
bla
figuring it out
completed search
Merge branch 'master' into searchConstruction

Conflicts:
	foobar/src/main/java/jrmds/controller/ComponenController.java
change
Merge branch 'master' into searchConstruction
Merge branch 'searchConstruction'