varie
Merge branch 'master' of https://github.com/ane1990/Linneo

Conflicts:
	config/routes.rb