replaced the old logo with a new one
Merge pull request #241 from MucaLisa/master

logo with proper typography
add logo attribution to about page
Merge pull request #242 from ialja/master

add logo attribution to about page
show current event status instead of fixed status
Merge remote-tracking branch 'upstream/master'
Merge pull request #244 from ialja/master

show current event status instead of fixed status
Merge pull request #230 from naisnouk/cancelevent

reject event + save/add button fixed
added next pending event
added 'next pending event' button + merged master
Merge pull request #245 from naisnouk/nexteventview

Nexteventview
adding missing init in tests module
Merge pull request #247 from ercchy/master

adding missing init in tests module
update index with text with new fields

test_index_with_approved_events was failing because it hasn't been updated to match the new output we use on the map. It was missing picture and description fields.
add view test for events without pictures

We forgot to check for event pictures when displaying view_event on several occasions, so I wrote a test that checks whether the view_event page is served when the event is pictureless.
Merge pull request #248 from ialja/master

updated index view test and added test for viewing events without pics
test for next_or_previous_event
Merge pull request #249 from naisnouk/master

test for next_or_previous_event
fixing yaml for Travis
made some pep8 corrections