uuh yeah
Merge branch 'master' of github.com:carolinagc/webcalendar
Revert "uuh yeah"

This reverts commit 54f187c1d62e1adf584e82038b7626321bb18968.
refactor organizer spec
Use Ruby 2.1

Also now using .ruby-version and .ruby-gemset
added german translation for base app
added translations for devise
Merge pull request #11 from carolinagc/UpgradeRuby21

Use Ruby 2.1
make devise speak tongues
Merge branch 'master' of github.com:carolinagc/webcalendar
limit the available locales to the ones actually available
i18nize user tests
add missing devise partial
fix events integration spec by specifying localized paths
Add translations to en and es yml
Add test for public/private events
Merge branch 'master' of github.com:carolinagc/webcalendar
Add method shown_events to differenciate when to show public and private events
Add i18n to application helper
More localization

Also formatting files