apiV1AndRoutes
General update - search, twrex, api
merge
Update routes.php
Update AnalyticsController.php
crowdflower better localhost check
Merge branch 'master' of https://github.com/khamkham/crowd-watson into arne

-- Resolved using 'theirs'

Conflicts:
	.gitignore
	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