Merge branch 'master' of https://github.com/Factor-X/awac

Conflicts:
	app/eu/factorx/awac/AwacDummyDataCreator.java
	app/eu/factorx/awac/controllers/AnswerController.java
	app/eu/factorx/awac/models/code/CodeList.java
	app/eu/factorx/awac/models/code/type/QuestionCode.java
	conf/components.xml
Merge branch 'master' of https://github.com/Factor-X/awac