fixed #1075
fixed link on welcome page
bugfixes for random things
more links
fixed link on startpage
changed order
Merge branch 'master' of github.com:fairmondo/fairmondo
text changed
added jbuilder
mass_uplaod_limit + jbuilder
quick fixes
clean hash for filters
index finished for json
basic price fix
basic price fix
changed mapping
dont delete images of sold articles
fixes a bug in slides.js
added some whitespace + categories.index.json
Merge branch 'master' into develop

Conflicts:
	app/assets/stylesheets/controller/welcome.css.scss
	app/views/welcome/index.html.slim