Merge pull request #18 from ercchy/master

working on scss
geoposition added to event models and forms
added map on view_event page
Merge pull request #19 from ialja/master

added django-geopostion to event view and add
updated reqs with django-geoposition
Merge pull request #20 from ialja/master

updated reqs with django-geoposition
view event url includes title slug
move login to its own page
Merge pull request #21 from ialja/master

prettier urls for events and dedicated login page
event guide v0.1 text added
Define groups on model Event and add two views to display pending and approved events
removed pure elements
Merge pull request #22 from ialja/master

added event guide text and removed all pure css elements
This is a commit to solve a conflict in some files
Merge remote-tracking branch 'upstream/master'
Merge pull request #23 from Konviser/master

Add two views for listing approved and pending request. Define groups on Event model
assign the correct default manager to Event model
Merge pull request #24 from Konviser/master

assign the correct default manager to Event model
little view and add event imporovements
Merge pull request #25 from ialja/master

little view and add event improvements