Merge remote branch 'friendica/master'
Merge remote branch 'friendica/master'
add source strings to plugins
add per-plugin language files
fix plugins strings
Merge pull request #103 from annando/master

gpluspost: Posting to Google+
Merge pull request #102 from fabrixxm/addonlangs

Per-plugins strings.php
Merge remote-tracking branch 'upstream/master'
gpluspost: Wrong table used. You should never mix "contact" with "user" :)