rev update
poco xml returning 500 - but with contents?
Merge pull request #599 from fermionic/20130129-colorbox

Switch to Colorbox
rev update
Merge https://github.com/friendica/friendica into pull
Personal modifications:

        - Add privacy policy and terms of service files
        - Add links to TOS and privacy policy to login, registration, and help p
        - Quick hack to remove personal content from emails. Should be made a pl
        - Setup home page to guide users to use only encrypted pages
fix permissions
make the default to not post a status message when uploading new photos
embed private photos for Diaspora posts
debugging -- underscores get escaped
no-visibility-for-edited-photos
restore privacy and TOS to Frost
allow cross-posting private posts
- Send likes on comments to Diaspora
- Only import emails that are FROM: the contact
- Show a contact's network in the @-mention drop-down and the permissions box
- Limit latitude and longitude to 4 decimal places as theme default
minified javascript updates
manual email search; some small tweaks
add 'boring' button to posts
update Frost's main.min.js
convert custom templates to Smarty3
boring css