Merge pull request #161 from annando/master

Some more debug information for twitter-sync and facebook-sync
Merge pull request #162 from annando/master

fbsync: Removed misleading option to add the contacts
Merge pull request #163 from annando/master

fbsync: Showing shared posts, import only from contacts in your contact list
CAL: one closing div to much
Wording submit -> save settings
wording submit -> save settings
wording submit -> save settings
Merge pull request #164 from tobiasd/20131119

Wording of the Submit button in the settings of the addons
Merge pull request #165 from annando/master

fromgplus: doubled text and avoiding first time spam
Merge pull request #166 from annando/master

inflate/deflate settings
inflate/deflate MathJax settings
inflate/deflate event export settings
jappixmini one closing div to many
inflate/deflate fromapp settings
inflate/deflate twitter connector settings
Merge pull request #167 from tobiasd/more_inflate

More inflate/deflate
Merge remote-tracking branch 'upstream/master'

Conflicts:
	twitter/twitter.php