Merge pull request #37 from emailsucks/dev_main

from dev_main
ssl not required for s3
Merge pull request #39 from emailsucks/dev_main

from main
Merge branch 'dev_mark' of https://github.com/emailsucks/flybox_server into dev_mark
Merge pull request #40 from emailsucks/dev_mark

Dev mark