working on web
Merge remote-tracking branch 'origin/master'

Conflicts:
	kpn-quiz-web/src/main/java/my/gov/kpn/quiz/core/dao/impl/QaPrincipalDaoImpl.java