Merge origin/master

Conflicts:
	Ludum Dare 28/public_html/js/chunk.js

Everything will brake after this one. Actionmanager up-to-date
Merge origin/master