allwoing for static controlpanel
Merge branch 'master' of https://github.com/JackMF/Dementia

Conflicts:
	Dementia.xcodeproj/project.pbxproj