Finish the yearly stats graph
Merge remote-tracking branch 'origin/master'

Conflicts:
	Managment Server/web/AngularViews/userStatistics.jsp
after push