Clean out obsolete code from search controller
Merge branch 'develop' into feature/frontend
Add sniffer
Fix getCorrelatedCharts request
Merge branch 'feature/frontend' into develop

Conflicts:
	www-src/app/index.html
	www-src/app/scripts/routes.coffee