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

doc/TermsOfService.md

@@ -1,4 +1,4 @@
 Terms of Service
 ================
 
-#include SiteTOS;
+#include doc/SiteTOS.md;

view/tpl/chat.tpl

@@ -89,3 +89,20 @@ function update_chats(chats) {
 }
 
 </script>
+<script>
+function isMobile() {
+  try{ document.createEvent("TouchEvent"); return true; }
+  catch(e){ return false; }
+}
+$(function(){
+
+  $('#chatText').keypress(function(e){
+  	if (e.keyCode == 13 && e.shiftKey||isMobile()) {
+	}
+    else if (e.keyCode == 13) {
+	  e.preventDefault();
+      $(this).parent('form').trigger('submit');
+    }
+  });
+});
+</script>