Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 5 insertions, 3 deletions

diff --git a/doc/Schema-development.md b/doc/Schema-development.md
index e800479f6..3ac96a02b 100644
--- a/doc/Schema-development.md
+++ b/doc/Schema-development.md
@@ -68,11 +68,13 @@ theme are as follows:
 	Set the size of shadows shown with inline images.  Accepts a numerical 
 	value.  Note shadows are not applied to smileys.
 * converse_width
-	Set the maximum width of conversations.  Accepts px, or %.
+	Set the maximum width of the content region in px.
 * nav_min_opacity
 * top_photo
 * reply_photo
-* sloppy_photos
-	Determins whether photos are "sloppy" or aligned.  Set or unset (1 or '')		
+
+If a your_schema_name.css file is found, the content of this file will be attached to the end of style.css.
+This gives the schem developer the possiblity to override any style component.
+
 
 #include doc/macros/main_footer.bb;