db
fixes
reorganised styl added contact route and page
editor
fixed rebase