#943 updated jquery and jqueryui
#943 updated jquery and jqueryui
Merge branch 'master' into 943_jquery2_update

Conflicts:
	tendenci/core/site_settings/settings.json
#943 - added missed updates
Merge branch '943_jquery2_update' into bixly-testing

Conflicts:
	tendenci/addons/memberships/admin.py