Controller work
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/alphatek/component/controller/AbstractController.java
	src/main/java/com/alphatek/component/controller/Controller.java