can now change map transition
Merge remote-tracking branch 'origin/master'
Fixed friend circle on map page