3d in progress
Merge branch 'master' of https://github.com/hjujah/dock

Conflicts:
	js/loadApp.js
	js/templates/navigation.html