smá UI gaman
Merge branch 'master' of https://github.com/thdg/Tales-of-Binklebard

Conflicts:
	js/entities/UIManager.js