Add cocoon gem
Add word pairs
Update inherited_resources
Set inherited_resources version explicitly
Remove rails-footnotes because of deprecation warnings.

See https://github.com/josevalim/rails-footnotes/pull/93#issuecomment-37311317
Remove default scope which excluded guests.

Associations only work with objects available in the default scope, so e.g. guest has_many :comments wouldn't work. So it's better to remove the default scope.
Merge branch 'master' of github.com:jmuheim/base
Merge branch 'master' into features/user_vocabularies
Remove comment
Refactor app controller incl. skipping user confirmation
Implement User#annex_and_destroy! method
Refactor registrations/sessions
More specs
Add more specs
Add specs for sessions controller
Add vocabularies ability specs
Remove pow
Guard-Shell now automatically stops webrick when needed.

Sadly, I didn't find a way to start it again yet.
Whitespace
Change default port of webrick