Merge pull request #305 from beardy-unixer/master

Pass mids to conv_item template
allow somebody to type #^{{naked link}}
--  auto-linkify it and create a bookmark tag.
Merge https://github.com/friendica/red into zpull
revert last fix, it double tags
that's better
Add class to bookmark links to make it better them able

E.g.: css (not yet included)
.bookmark-identifier{
display:none;
}
.bookmark:hover:before{
text-decoration:none;
content:"#^";
color:#000000;
background:#FFFFFF;
}

.bookmark:hover{
	color: #FFFFFF;
	background: #3465A4;
}
.
Merge pull request #306 from cvogeley/master

Add class to bookmark links to make it better themable
fix wall photos
Merge https://github.com/friendica/red into zpull
Doco - abcjsplugin from Olivier
fix the "every other link gets messed up" problem
Merge https://github.com/friendica/red into zpull
theming chat a little
don't allow the browser to open uploaded html/css/js
moving background-color to style.css
whitespace
more XSS blockage of uploaded files
Merge pull request #307 from git-marijus/master

theming chat a little
backend for chatroom activity monitor - honours permissions and returns (json) how many in room and last chat timestamp, regardless of whether the observer is actually in the room.