a
Merge branch 'origin/master'

Conflicts:
	www/js/managers/Share_Manager.js
a