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

Conflicts:
	include/config.php
	update.php

view/default.php

@@ -10,7 +10,8 @@
 	<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
 	<section><?php if(x($page,'content')) echo $page['content']; ?>
 		<div id="page-footer"></div>
-	</section>
+	</section>
+	<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
 	<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
 </body>
 </html>