Changed some assets to serve only over https.
Merged develop to deploy. Fixed merge errors.