commit
Merge branch 'master' of https://github.com/DonatoB/tofu

Conflicts:
	src/includes/control_panel.js