Merge branch 'master' into Develop

# Conflicts:
#	cps/comic.py
#	cps/editbooks.py
#	cps/isoLanguages.py

cps/web.py

@@ -136,7 +136,8 @@ def add_security_headers(resp):
     resp.headers['X-Content-Type-Options'] = 'nosniff'
     resp.headers['X-Frame-Options'] = 'SAMEORIGIN'
     resp.headers['X-XSS-Protection'] = '1; mode=block'
-    # resp.headers['Strict-Transport-Security'] = 'max-age=31536000; includeSubDomains'
+    resp.headers['Strict-Transport-Security'] = 'max-age=31536000; includeSubDomains'
+    # log.debug(request.full_path)
     return resp
 
 web = Blueprint('web', __name__)
@@ -1541,6 +1542,8 @@ def login():
                     flash(_(u"Wrong Username or Password"), category="error")
 
     next_url = request.args.get('next', default=url_for("web.index"), type=str)
+    if url_for("web.logout") == next_url:
+        next_url = url_for("web.index")
     return render_title_template('login.html',
                                  title=_(u"login"),
                                  next_url=next_url,