verification + solve some bugs for organizationEvent
merge
Merge remote-tracking branch 'origin/master' into celdl-228-251

Conflicts:
	app/eu/factorx/awac/models/code/type/QuestionCode.java
	public/javascripts/app.js
end of changes