Fix typo in folder name
Update inherited resources
Merge branch 'master' of github.com:jmuheim/base into features/user_vocabularies
Merge branch 'master' of github.com:jmuheim/base into features/user_vocabularies
Refactor
Merge branch 'master' of github.com:jmuheim/base into features/user_vocabularies

Conflicts:
	app/models/user.rb
	spec/factories/users.rb
Replace legacy Base string with Synaesthesia
Merge branch 'master' of github.com:jmuheim/base into features/user_vocabularies

Conflicts:
	app/views/layouts/application.html.slim
Merge branch 'master' of github.com:jmuheim/base into features/user_vocabularies

Conflicts:
	app/views/layouts/application.html.slim
Merge branch 'master' of github.com:jmuheim/base into features/user_vocabularies
Add guard explicitly to Gemfile
Use custom port for rack livereload
Re-add users resource
Use #current_user instead of #current_or_guest_user
User#has_many :vocabularies
Set default values for source language and target language
Ability specs
Add vocabularies link to navigation
Vocabulary specs
Add rails-footnotes gem