#30 disable ssl only for production
Merge branch 'master' into stable