SS Update
Merge branch 'master' of https://github.com/InfiniusNL/phonegap

Conflicts:
	static/js/socialsharing.js