popup fixes
ordering of timeseries
removed max
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/lizard/collections/Timeseries.js
	app/scripts/settings.js