support various and multiple content_types on the display side - still have some work to do on the posting side.
small fixes for events
Merge pull request #41 from unary/events

small fixes for events
rename 'uri' (and parent_uri) to 'mid' (and parent_mid) since these no longer remotely resemble uri's and are actually message_id's. This change is potentially destabilising because it touches a lot of code and structure. But it has to get done and there's no better time than the present.
Merge https://github.com/friendica/red into zpull
Redbasic - get rid of max-height for images (got lost in the merge last time it was fixed)
Add prettyPhoto library.
Remove Twatter/Facebook shit.
Implement prettyPhoto (somewhat).
Merge remote-tracking branch 'upstream/master'
rev update
Merge pull request #42 from beardy-unixer/master

Use prettyPhoto for photo albums
Merge https://github.com/friendica/red into zpull
descriptive text