Misc
Merge branch '2.0' of https://github.com/eiskalteschatten/scratchpad into 2.0

Conflicts:

ScratchPad/ScratchPad.xcodeproj/project.xcworkspace/xcuserdata/alexseife
rt.xcuserdatad/UserInterfaceState.xcuserstate