updates
Merge branch 'master' of https://github.com/TeamPalmTree/shared

Conflicts:
	classes/mixingwheel.php