Merge branch 'hotfix-whitespace'

* hotfix-whitespace:
  fixed white space
hot fix events add amanda Facebook incorrectly
fixed amanda Facebook
Merge branch 'master' into develop

* master:
  fixed amanda Facebook
  hot fix events add amanda Facebook incorrectly