Sync from GitHub for Mac
Merge https://github.com/yazid/MPBeacon
Updated .gitignore