merging in https://github.com/foursquare/foursquare-app-framework
Merge branch 'master' of github.com:PullRequestFive/CmdrData