Merge branch 'master' into public-urls
using https so that the https certificate for #590 dont complain about insecure resources
removing the http redirect
Merge branch 'public-urls' of github.com:fieldlinguist/FieldDBWebServer into public-urls
also removing http redirect
Merge branch 'public-urls' of github.com:OpenSourceFieldlinguistics/FieldDBWebServer into public-urls
for OpenSourceFieldlinguistics/FieldDB#1017 @jdhorner i put the corpus feed in too
Merge pull request #12 from fieldlinguist/public-urls

Public urls