Fixed facebook header (said iOS, should be Android)
Merge remote-tracking branch 'origin/WorkingBranch' into gh-pages