added routs and most locales in advertisment
some more locales
some more
locales should be finish - beside english
Merge branch 'develop' into feature/locales

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/user_sessions_controller.rb
	app/models/user.rb
	app/views/articles/_article.html.haml
	app/views/carts/add_article.js
	app/views/carts/add_new.js.erb
	app/views/carts/destroy.js.erb
	app/views/carts/remove_article.js
	app/views/home/admin/_provider.html.haml
	app/views/layouts/_navigation_logout.html.haml
	app/views/providers/index.html.haml
	app/views/providers/show.html.haml
	app/views/shared/_search_head.html.haml
	app/views/shared/modal/_cart.html.haml
	app/views/users/_update_form.html.haml
	config/routes.rb
loacals and an tab bug
last lang changes and bug fixes
Merge branch 'feature/locales' into develop

Conflicts:
	app/views/carts/add_article.js.erb
	app/views/carts/add_new.js.erb
	app/views/carts/destroy.js.erb
	app/views/carts/remove_article.js
Merge branch 'develop' of github.com:DanielMSchmidt/vergleichsportal into develop

Conflicts:
	app/views/shared/modal/_cart.html.haml