Fix CRYBeaconManager
Add Location to Article
Merge remote-tracking branch 'origin/master'