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, 3 insertions, 4 deletions

diff --git a/include/features.php b/include/features.php
index 6b4bc34c6..4121880a4 100644
--- a/include/features.php
+++ b/include/features.php
@@ -44,10 +44,8 @@ function get_features() {
 			array('webpages',            t('Web Pages'),              t('Provide managed web pages on your channel'),false),
 			array('private_notes',       t('Private Notes'),          t('Enables a tool to store notes and reminders'),false),
 			array('nav_channel_select',  t('Navigation Channel Select'), t('Change channels directly from within the navigation dropdown menu'),false),
+			array('photo_location',       t('Photo Location'),          t('If location data is available on uploaded photos, link this to a map.'),false),
 
-
-			//FIXME - needs a description, but how the hell do we explain this to normals?
-			array('sendzid',		t('Extended Identity Sharing'),	t('Share your identity with all websites on the internet. When disabled, identity is only shared with sites in the matrix.'),false),
 			array('expert',       t('Expert Mode'),                 t('Enable Expert Mode to provide advanced configuration options'),false),
 			array('premium_channel', t('Premium Channel'), t('Allows you to set restrictions and terms on those that connect with your channel'),false),
 		),
@@ -60,7 +58,8 @@ function get_features() {
 			array('large_photos',   t('Large Photos'),              t('Include large (640px) photo thumbnails in posts. If not enabled, use small (320px) photo thumbnails'),false),
 			array('channel_sources', t('Channel Sources'),          t('Automatically import channel content from other channels or feeds'),false),
 			array('content_encrypt', t('Even More Encryption'),          t('Allow optional encryption of content end-to-end with a shared secret key'),false),
-			array('adult_photo_flagging', t('Flag Adult Photos'),   t('Provide photo edit option to hide adult photos from default album view'),false), 
+			array('consensus_tools', t('Enable voting tools'),      t('Provide a class of post which others can vote on'),false),
+
 		),
 
 		// Network Tools