Initial commit of all the files
Commit #
Merged branch tatiana; conflicts fixed
added upload template functionality. Format and domain are inherited from batch now. Fixed selecting of no platform and added validation of jobconf before creation on platform.
Made platformview platform agnostic. Config is not gitignored anymore and includes platforms. Platforms extend abstract class FrameWork. Removed Platformbutton Jquery.
first basic implementation of Queues.
Update mturk.php
Update retrievejobs.php
Update retrievejobs.php
Update SaveAnnotation.php
Update UpdateJob.php
Update UpdateJob.php
Added updateCrowdAgent for saving stats. Entity::id($id) is now possible. Moved updateCrowdAgent to bottom of retrieveJobs files.
fixed amt factspan and relex, added some checks for crowdagent update
Added flag worker and message worker, added workerService in ng
Working on FactorSpan CF vectorcreation
Merge branch 'jelle' of https://github.com/khamkham/crowd-watson into arne
Merge with Jelle's branch

Conflicts:
	app/controllers/ProcessController.php
	app/views/jobs/listview.blade.php
	composer.lock
	public/custom_assets/dataretrieval.js
ready for merge with master
Merge branch 'master' of https://github.com/khamkham/crowd-watson into arne

Conflicts:
	app/assets/stylesheets/nv.d3.css
	app/controllers/AnalyticsController.php
	app/lib/Metrics/AnnotationMetrics/Annotation.py
	app/lib/Metrics/AnnotationMetrics/AnnotationMetricsEnum.py
	app/lib/Metrics/AnnotationMetrics/__init__.py
	app/lib/Metrics/Filters.py
	app/lib/Metrics/TaskMetrics/Task.py
	app/lib/Metrics/TaskMetrics/__init__.py
	app/lib/Metrics/UnitMetrics/Unit.py
	app/lib/Metrics/UnitMetrics/UnitFiltersEnum.py
	app/lib/Metrics/UnitMetrics/UnitMetricsEnum.py
	app/lib/Metrics/UnitMetrics/__init__.py
	app/lib/Metrics/VectorMetrics.py
	app/lib/Metrics/WorkerMetrics/Worker.py
	app/lib/Metrics/WorkerMetrics/WorkerFiltersEnum.py
	app/lib/Metrics/WorkerMetrics/WorkerMetricsEnum.py
	app/lib/Metrics/WorkerMetrics/__init__.py
	app/lib/Metrics/__init__.py
	app/lib/Metrics/config.py
	app/lib/Metrics/encoder.py
	app/lib/computeResults.py
	app/lib/testUnit.py
	app/lib/testWorker.py
	app/routes.php
	app/views/analytics/jobview.blade.php
	public/custom_assets/dataretrieval.js
more dictionary rules, tweaked CF FactSpan.