Links generated with block now =)
Merge ../x0y0

Conflicts:
	Gemfile.lock
	app/helpers/links_helper.rb
BS3 migration fixes