Merge branch 'master' into tres

Conflicts:
	mod/events.php
	view/css/mod_events.css

mod/item.php

@@ -511,6 +511,7 @@ function item_post(&$a) {
 		 * First protect any url inside certain bbcode tags so we don't double link it.
 		 */
 
+
 		$body = preg_replace_callback('/\[code(.*?)\[\/(code)\]/ism','red_escape_codeblock',$body);
 		$body = preg_replace_callback('/\[url(.*?)\[\/(url)\]/ism','red_escape_codeblock',$body);
 		$body = preg_replace_callback('/\[zrl(.*?)\[\/(zrl)\]/ism','red_escape_codeblock',$body);