Merge origin/master

Conflicts:
	Ludum Dare 28/public_html/js/entity.js
	Ludum Dare 28/public_html/test.html

Nog meer action manager meuk!!!!!
Merge origin/master
Merge origin/master