Kibana:
Update
Merge branch '2014q4' into gh-pages

Conflicts:
	radars/radarData.js