Warn that not all data is being displayed when histogram query is timed_out by Elastic Search
AWarn that not all data is being displayed when Term panel query is timed_out by Elastic Search
added a 1 minute timeout to require.js.
Add missing ;
Merge branch 'master' into alert_when_query_timed_out

Conflicts:
	src/app/panels/histogram/module.js
	src/app/panels/terms/module.js
Fix config
Put timed_out check in correct if {}
Put timed_out check in correct if {}
Merge pull request #5 from cityindex/alert_when_query_timed_out

Alert when query timed out
Merge branch 'master' into guided_cityindex_dashboard