Merge branch 'master' into Develop

# Conflicts:
#	cps/static/css/style.css
#	cps/web.py

cps/static/js/table.js

@@ -652,6 +652,9 @@ function singlecheckboxFormatter(value, row){
 }
 
 function ratingFormatter(value, row) {
+    if (value == 0) {
+        return "";
+    }
     return (value/2);
 }