added favorites to interests
Merge branch 'steve'
Merge branch 'master' into beacon
completed sending location to parse