Redirect HTTP to HTTPS
Merge branch 'master' into dangoor/redirect

Conflicts:
	app.js