merged with sam's changes
Merge branch 'editor' into live
new home routing and cleanup