Dashboard: Fix for zoom out causing right hand to range to be set in the future. Closes #724
Merge branch 'master' into filtering_overhaul

Conflicts:
	src/app/controllers/dashboardNavCtrl.js
fixes to templating
new template system is starting to work 100%, not all features are in, like regex selection, influxdb support, and other stuff