abilities
Merge remote-tracking branch 'origin/places' into abilities
major fixes
merge conflicts