Merge branch 'develop' into feature/wysiwyg-editor

* develop:
  Renamed Stories.render_action() to render_json_action()
  Added account image with link to https://gravatar.com
  Added HTML sanitizer for comments and stories. Fixes issue 64.
  Added button for easily adding a username to the troll filter
  Implemented “gaslighting” of troll comments, i.e. hiding a comment of a known troll for everyone else but themselves
  Removed misleading trailing “(Server)” from console output
  Fixes issue 143
  Separated rendering of core and custom CSS with Less and added more detailed error output
  Improved display of console messages
  Added bottom margin after article meta in case there is no title
  Introduced another value for the color of borders, vertical and horizontal lines

Conflicts:
	code/Global/0.node.js
	code/Global/Global.js
	code/Site/$Site.skin
	code/Story/$Story.skin
	code/Story/Story.js
	code/Story/Story.skin

package.json

@@ -33,6 +33,7 @@
     "less": "git://github.com/less/less.js#v1.7.5",
     "marked": "^0.3.3",
     "minifyify": "^6.1.0",
-    "napa": "^1.1.0"
+    "napa": "^1.1.0",
+    "sanitize-html": "^1.6.1"
   }
 }