Merge branch 'master' into tres

Conflicts:
	include/Import/refimport.php
	include/activities.php
	include/attach.php
	include/event.php
	include/externals.php
	include/identity.php
	include/items.php
	include/notifier.php
	include/photos.php
	include/taxonomy.php
	include/zot.php
	mod/channel.php
	mod/connedit.php
	mod/events.php
	mod/item.php
	mod/like.php
	mod/manage.php
	mod/mood.php
	mod/ping.php
	mod/poke.php
	mod/subthread.php
	mod/tagger.php
	mod/thing.php

1 files changed, 4 insertions, 1 deletions

diff --git a/doc/Comanche.md b/doc/Comanche.md
index 147988938..664412404 100644
--- a/doc/Comanche.md
+++ b/doc/Comanche.md
@@ -83,11 +83,14 @@ This places the menu called "mymenu" at this location on the page, which must be
 
 This places the menu called "mymenu" at this location on the page, which must be inside a region. Additionally it adds the CSS class "horizontal-menu" to this menu. This *may* result in a menu that looks different than the default menu style, *if* the css for the current theme defines a "horizontal-menu" class. 
 
-
 	[block]contributors[/block]
 
 This places a block named "contributors" in this region.
 
+	[block=someclass]contributors[/block]
+
+This places a block named "contributors" in this region. Additionally it applies the "someclass" class to the block. This replaces the default block classes "bblock widget".
+
 	[block][var=wrap]none[/var]contributors[/block]
 
 The variable [var=wrap]none[/var] in a block removes the wrapping div element from the block.