Merge branch 'master' into jelle
Finished merging Arne and Master into Jelle
Merge branch 'jelle' of https://github.com/khamkham/crowd-watson into arne

Conflicts:
	app/models/Job.php
	app/models/MongoDB/Entity.php
	app/routes.php
started import jobconf
Merge branch 'master' of https://github.com/khamkham/crowd-watson into arne

Conflicts:
	app/routes.php
fixed routes