Form filled with hardcoded DTO
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/eu/factorx/awac/models/business/Organization.java
	app/eu/factorx/awac/models/business/Product.java
	app/eu/factorx/awac/models/business/Scope.java
	app/eu/factorx/awac/models/business/ScopeType.java
	app/eu/factorx/awac/models/business/Site.java
	app/eu/factorx/awac/models/business/User.java
	app/eu/factorx/awac/models/code/Code.java
	app/eu/factorx/awac/models/code/QuestionCode.java
	app/eu/factorx/awac/models/data/AirTravelInfo.java
	app/eu/factorx/awac/models/data/AirTravelsGroupAnswer.java
	app/eu/factorx/awac/models/data/AuditInfo.java
	app/eu/factorx/awac/models/data/BooleanAnswer.java
	app/eu/factorx/awac/models/data/CodeAnswer.java
	app/eu/factorx/awac/models/data/DoubleAnswer.java
	app/eu/factorx/awac/models/data/NumericAnswer.java
	app/eu/factorx/awac/models/data/Question.java
	app/eu/factorx/awac/models/data/QuestionAnswer.java
	app/eu/factorx/awac/models/data/StringAnswer.java
	app/eu/factorx/awac/models/forms/Campaign.java
	app/eu/factorx/awac/models/forms/Form.java
	app/eu/factorx/awac/models/forms/FormQuestion.java
	app/eu/factorx/awac/models/knowledge/Factor.java
	app/eu/factorx/awac/models/knowledge/FactorValue.java
	app/eu/factorx/awac/models/knowledge/Period.java
	app/eu/factorx/awac/models/knowledge/Unit.java
	app/eu/factorx/awac/models/knowledge/UnitCategory.java
	app/eu/factorx/awac/models/reporting/Indicator.java
	app/eu/factorx/awac/models/reporting/Report.java
	app/uml/UnitCategory.java
	conf/evolutions/default/1.sql
Form filled with hardcoded DTO