Merge remote-tracking branch 'upstream/master'

Conflicts:
	view/theme/redbasic/css/style.css

whatever

1 files changed, 2 insertions, 2 deletions

diff --git a/assets/home.html b/assets/home.html
index fa0d8b3bc..42059c398 100644
--- a/assets/home.html
+++ b/assets/home.html
@@ -164,7 +164,7 @@ $(document).ready(function() {
 <img style="width: 450px; margin-bottom: 30px;" src="assets/logo_simplifiedap.png" >
 <div style="color:#808080;font-weight:bold;font-size:3.0em; margin-bottom:30px;">Dream it. Do it.</div>
 <div class="tr" style="font-size: 1.6em; color: #666; margin-left: 75px; margin-right: 75px;">
-The RedMatrix (aka "red") is a highly advanced social networking platform which was created by a <a style="color: #555;" href="#" class="cb">farmer in Australia</a> - that grew disgusted by the lack of privacy and the increasing tendency of foreign corporations and governments to monitor and control the internet. This has strangled and subverted all that was once good about the web - and turned it into a "steaming pile of crap". (Aussies typically don't mince words.) 
+The RedMatrix (aka "red") is an advanced social networking platform which was created by a <a style="color: #555;" href="#" class="cb">farmer in Australia</a> - who grew disgusted by the lack of privacy and the increasing tendency of foreign corporations and governments to monitor and control the internet. This has strangled and subverted all that was once good about the web - and turned it into a "steaming pile of crap". (Aussies typically don't mince words.) 
 </div>
 <br />
 <div class="tr" style="font-size: 1.6em; color: #666; margin-left: 75px; margin-right: 75px;">
@@ -172,7 +172,7 @@ Working with a team of volunteers from six continents and over a period of sever
 </div>
 <br />
 <div class="tr" style="font-size: 1.6em; color: #666; margin-left: 75px; margin-right: 75px;">
-Taking cues from life in the Aussie outback, the Red Matrix has no central authority. Each channel (or social profile) is independent and autonomous - controlling its own publishing privacy as desired. Some will want more privacy, some less. Unlike your typical social network - the matrix has no say in this decision and cannot subvert it. Server hubs are self-sufficient and the network will continue to function if any single node in the matrix goes offline. It also provides channel resilience. You can "clone" your channel (or social profile) to any hub in the network and carry on without interruption if your primary server "chucks a wobbly" for an hour - or a week. (No fail whale needed here.) 
+Taking cues from life in the Aussie outback, the Red Matrix has no central authority. Each channel (or social profile) is independent and autonomous - controlling its own publishing privacy as desired. Some will want more privacy, some less. Unlike your typical social network - the matrix has no say in this decision and cannot subvert it. The NSA and all the other creepy voyeurs trying to find out what you and your friends are discussing can just bugger off. Server hubs are self-sufficient and the network will continue to function if any single node in the matrix goes offline. It also provides channel resilience. You can "clone" your channel (or social profile) to any hub in the network and carry on without interruption if your primary server chucks a wobbly for an hour - or a week. (No fail whale needed here.) 
 </div>
 <br />
 <div class="tr" style="font-size: 1.6em; color: #666; margin-left: 75px; margin-right: 75px;">