5.1.1

Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	plugin.xml
#	src/android/nl/xservices/plugins/SocialSharing.java