Merge https://github.com/friendica/red into pending_merge

doc/install.bb

@@ -15,7 +15,7 @@ local .htaccess file
 php.ini file
         - curl, gd, mysql, and openssl extensions
         - some form of email server or email gateway such that PHP mail() works
-        - mcrypt (optional; used for server-to-server message encryption)
+        - mcrypt 
 
     - Mysql 5.x
 

mod/settings.php

@@ -629,6 +629,7 @@ function settings_content(&$a) {
 			'$submit' 	=> t('Submit'),
 			'$email' 	=> array('email', t('Email Address:'), $email, ''),
 			'$removeme' => t('Remove Account'),
+			'$removeaccount' => t('Remove this account from this server including all its channels'),
 			'$permanent' => t('Warning: This action is permanent and cannot be reversed.'),
 			'$account_settings' => $account_settings
 		));

view/tpl/settings_account.tpl

@@ -2,9 +2,6 @@
 <h1>{{$title}}</h1>
 
 
-
-
-
 <form action="settings/account" id="settings-account-form" method="post" autocomplete="off" >
 <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
@@ -23,4 +20,9 @@
 
 {{$account_settings}}
 
+<div id="settings-remove-account-link">
+<h3 class="settings-heading">{{$removeme}}</h3>
+<div id="settings-remove-account-desc">{{$removeaccount}}</div>
+<button title="{{$permanent}}" class="btn btn-danger" type="submit" formaction="removeaccount">{{$removeme}}</button>
+</div>
 </div>