Merge pull request #13 from emailsucks/dev_main

box routes pull
Merge pull request #15 from emailsucks/dev_main

merge from dev main
box route fixes, moved smtp route
Merge pull request #16 from emailsucks/dev_mark

Dev mark
Merge branch 'dev_main' of github.com:emailsucks/flybox_server into front-end-init
settings and compose buttons do things now