Add map click handler, convert EntryActivity to use Venue
Merge remote branch 'origin/cleanup' into cleanup