Fixed js error and added html loading for desktop
Merge branch 'master' of https://github.com/Avans-Everyware-42IN11EWe/Everyware-HTML-5-app

Conflicts:
	assets/webapp/js/pageloader.js
Merge branch 'master' of https://github.com/Avans-Everyware-42IN11EWe/Everyware-HTML-5-app

Conflicts:
	assets/webapp/js/pageloader.js