In-merge
Merge with arne's branch complete
Added cf-div and got AMT-button to work properly (not active anymore)
gitignore app\config\database.php
Javascript for calculating costs per sentence is done
Merge branch 'arne' into jelle
Prior to merge with master
Prior to merge 2
Merge finalized
fixed QualificationRequirement bug (didn't clear). Removed getAMT function.
AnswerField from CSV for Gold Questions in multipage HIT's.
Navigation made for post-process and got template templating, values remain to be filled in further
Merge branch 'jelle' of https://github.com/khamkham/crowd-watson into arne

Conflicts:
	app/controllers/ProcessController.php
resolved
Added new files
Merge branch 'jelle' of https://github.com/khamkham/crowd-watson into arne