added slim
added events to db/seeds.rb
change show.html.erb to show.slim for welcomes
Merge branch 'slim' of privategithub:itedd/itedd into slim
welcomes show.html.erb removed
improved welcomes#show.slim
set default local
Merge branch 'slim' of github.com:itedd/itedd into slim
updated rails
updated to rails 4.0.2
added ri_cal gem
added basic ical support
merged master
Update Gemfile

* bugged merge
Merge pull request #29 from synopia/master

Moderiertes Freischalten und Chronic Bugfix
Merge pull request #30 from synopia/master

Beim Registrieren eines Users kann auch eine UserGroup angelegt werden
Merge pull request #31 from synopia/master

Startseite zeigt alle naechsten Events nach Datum sortiert
Merge pull request #32 from synopia/master

Anpassungen Layout, Berechtigungen, FAQ und Impressum
Merge pull request #33 from synopia/master

Löschen von Events
added missing row