Last update with DOM element
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/assets/js/incubus/components/player.js
	public/assets/js/incubus/game.js
Last update with DOM element