Web Interface improvement
Cookie rename NPE fix
Merge branch 'master' into integration
-