#795: child master selection fixed. Image of master preview fixed.
Merge branch 'dev' of ssh://github.com/devbridge/BetterCMS into dev