working on search page
Merge branch 'master' into design
some PEP8 fixes
working on search page
working on search
working on search
Merge master
styling event without picture
working on search
working on search
Merge pull request #106 from ialja/master

Adding infinite scroll functionality together with our recent changes
minor modifications to files related to infinite scroll functionality
remove import from super template in index page
Merge pull request #108 from Konviser/master

minor modifications to files related to infinite scroll functionality
margin master into design branch
Moved zoom controls to center of map (vertically) so the bottom half (minus) is usable
Merged design branch from errchy
Merge pull request #110 from goranche/master

Moved zoom controls to center of map (vertically) so the bottom half (mi...
Fixed indentation
Added google analytics and cookieCutter cookie notification