ruby-gemset und ruby-version
ruby-gemset und ruby-version
foundation to bootstrap material
Merge branch 'foundationtobootstrap' into develop

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/views/layouts/_navigation.html.slim
	app/views/users/_form.html.slim
	config/locales/de.yml
	config/locales/en.yml
	config/locales/fr.yml