working on competition controller #21
Merge remote-tracking branch 'origin/master'

Conflicts:
	kpn-quiz-admin/src/main/java/my/gov/kpn/quiz/web/controller/secure/CompetitionController.java
	kpn-quiz-admin/src/main/webapp/secure/competition/competition_view.jsp
working on competition controller #21