Edit to begin including place functionality
Merge remote-tracking branch 'origin/master'
Complete the places api test.
Merge remote-tracking branch 'origin/master'