Revert "Revert 350f492..77e77d0"

This reverts commit 571be1d543f8cf00c3a43cf6b058c5ce59d56922.

Conflicts:
	game/core/view.js