Commit before merge
Merge branch 'master' of https://github.com/Datsy/front-end

Conflicts:
	public/javascript/views/visualization/ChartView.js
	resources/coffeescript/views/visualization/ChartView.coffee
Merge pull request #30 from collenjones/master

Sorting is working, dates are showing correctly