Merge remote-tracking branch 'upstream/master' into cancelevent
New app for emails
make search aware of past setting
Merge pull request #266 from ialja/master

make search aware of past setting
add top margin to footer, so it can breathe better
Show ten near by events on view event page
fixing bug and get near by events
tests for get_nearby_events processor
Merge remote-tracking branch 'upstream/master'
changing filters in get_nearby_events processor
change variable name from near_by to nearby
change variable name
remove empty lines
add empty line
add empty line again
add new line at the end of test_events_processors
add if condition to view_event
show ambassadors from your country on index
Merge pull request #267 from NinaKos/master

Show ten near by events on view event page and test
Merge remote-tracking branch 'upstream/master'