added "switch builder/editor" to wpswitches (in working state now)
Merge branch 'dev'

Fixed wpswitch, made "switch builder/editor"