Live Edit: improve layout drag/drop
Merge remote branch 'origin/master'