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, 2 insertions, 5 deletions

diff --git a/doc/external-resource-links.bb b/doc/external-resource-links.bb
index ca1d6f55e..62cbbc33d 100644
--- a/doc/external-resource-links.bb
+++ b/doc/external-resource-links.bb
@@ -6,18 +6,15 @@
 [*][url=https://github.com/omigeot/redstrap3]Redstrap[/url]

 [*][url=https://bitbucket.org/tobiasd/red-clean]Clean[/url]

 [*][url=https://github.com/tonybaldwin/redmatrixthemes/]nubasic[/url]

+[*][url=https://github.com/deadsuperhero/redmatrix-themes]Sean Tilley's Redmatrix themes[/url]

 

 [b]Third-Party Addons[/b]

-[*][url=http://gitweb.whogotzot.com/red-addons-extra/tree]Additional RedMatrix addons[/url]

 [*][url=https://abcentric.net/git/abcjsplugin.git]ABCjs integration - display scores in posts (WIP)[/url]

-[*][url=http://gitweb.whogotzot.com/extra_dir_fns/tree]Extra directory functions[/url]

 [b]Related Projects[/b]

 

 [*][url=https://addons.mozilla.org/en-US/firefox/addon/redshare/]Redshare for Firefox[/url]

 [*][url=https://github.com/cvogeley/red-for-android]Red for Android[/url]

 [*][url=https://github.com/zzottel/feed2red]feed2red.pl (posts Atom/RSS feeds to channel)[/url]

-[*][url=http://gitweb.whogotzot.com/red-stable/tree]Red Stable - up-to-date-but-not-bleeding-edge RedMatrix distribution[/url]

-[b]Utilities[/b]

-[*][url=http://gitweb.whogotzot.com/debian-install-script]Debian Install Script[/url]

+[*][url=https://wordpress.org/plugins/redmatrix-wp/]WordPress gateway (combine with wppost addon for full features)[/url]

 

 #include doc/macros/main_footer.bb;