bla
a lot of changes
Merge branch 'kevin'

Conflicts:
	index.html
	js/apiFunctions.js
	js/dataFunctions.js
	js/uiFunctions.js