wip
Merge branch 'master' of https://github.com/fhacktory/46cl

Conflicts:
	site/js/action.js