WIP
Merge branch 'master' of https://github.com/LausDaeus/IS3Team11Project
Some fixes
Merge branch 'master' of https://github.com/LausDaeus/IS3Team11Project

Conflicts:
	js/charts.js
	js/createView.js