velocity added
Added category field in TemplatesEditorPart and ParticipantsChoosePart
Issue 92 and code clean up
Merge branch 'dev'

Conflicts:
	net.ostis.confman.ui/src/net/ostis/confman/ui/parts/arrival/ParticipantArrivalView.java