Merge branches 'master' and 'develop' into develop
addthis.com disabled click and address bar tracking
lot of bug fixes, twitter works again, FB Like was removed, doesn't work on GSites
Merge branches 'master' and 'develop'