update to Q3 2014
Merge branch 'master' of github.com:littleark/githut
Merge branch 'master' into gh-pages

Conflicts:
	web/js/linechart.js
	web/js/main.js
Only sort once