Fixed an 'undefined type' error
Merge branch 'master' of https://github.com/Minjammben/CUPterodactyl
Merge branch 'master' of https://github.com/Minjammben/CUPterodactyl

Conflicts:
	js/UI/ViewModel.js