Merge branch '3404-river-revamp' of https://github.com/ewinslow/Elgg into ewinslow...

Conflicts:
	languages/en.php

diff --cc languages/en.php
Simple merge

diff --cc mod/groups/languages/en.php
Simple merge

diff --cc mod/groups/start.php
Simple merge

diff --cc mod/thewire/languages/en.php
Simple merge