Bug Fixed
Clean and comment code
Merge branch 'hotfix/BugShareButton' into develop