Add secure csrf and cookie setting
Add user settings for HTTPS
Merge commit '7a631ec1'