reset to master
Merge remote-tracking branch 'origin/master' into featureGroup
feature rule
ComponentController Update
Merge branch 'featureGroup'
Merge branch 'master' into projectcontrollernew

Conflicts:
	foobar/src/main/java/jrmds/controller/ComponenController.java