Update Search - Merge
Merge branch 'master' of https://github.com/khamkham/crowd-watson

Conflicts:
	app/assets/stylesheets/custom/style.css.scss
	app/controllers/Api/analytics/apiController.php
	app/views/media/search/layouts/hb-crowdagents.blade.php