Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	include/zot.php
	mod/connedit.php
	util/messages.po

doc/roadmap.bb

@@ -4,7 +4,9 @@ Roadmap for $Projectname V3
 
 Crypto
 	Convert E2EE to dynamic loading (on demand) using jQuery.getScript() [or other methods] to only load encryption libs when you require them. This should also support multiple encryption libraries (e.g. SJCL, others) triggered from the choice of algorithm and remain pluggable.
- 
+
+Diaspora
+	Convert core Diaspora federation code into a plugin. This presents a number of challenges since it touches and special cases a lot of core functionality.
 
 Subscriptions and business models
 	Build enough into core(/addons) to generate income (or at least try and cover costs) out of the box

doc/to_do_code.bb

@@ -4,6 +4,7 @@ We need much more than this, but here are areas where developers can help. Pleas
 
 [li]Documentation - see Red Documentation Project To-Do List[/li]
 [li]Include TOS link in registration/verification email[/li]
+[li]forum widget with unread counts (requires the DB schema changes from v3/hubzilla to be viable)[/li]
 [li]Create bug tracker module[/li]
 [li]translation plugins - moses or apertium[/li]
 [li]Infinite scroll improvements (i.e. embedded page links) see http://scrollsample.appspot.com/items