new fancy chart
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/js/planner.js
	src/views/planner.html