working
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/org/kpi/competence/controller/QualificationController.java