Define groups on model Event and add two views to display pending and approved events
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