Version Bump (0.5r11)
Some bugfixes in Editor
Merge remote-tracking branch 'origin/master'