update sharing
Merge branch 'master' of https://github.com/logicdesign/Office365

Conflicts:
	js/main.js
update