Version 0.5.3
NUI editor
Merge branch 'upstream-master'
Merge branch 'editor'