Merge pull request #1003 from annando/master

app.net feeds, number of comments and better handling of the reply button in "vier"
NL: update to the strings
Merge pull request #1007 from tobiasd/20140602

NL: update to the strings
Fix API string values
Merge pull request #1011 from sim6/fix-api-string-values

Fix API string values
NL: update to the strings
Merge pull request #1013 from tobiasd/20140610

NL: update to the strings
rev up

in preperation for the big pull
Merge pull request #1008 from annando/master

Expire, "attachment" element and database structure
Merge remote-tracking branch 'upstream/master'
BBCode: Support for preview parameter in attachment, rearranged code for share