Adsd includes options in unroll
Merge branch 'master' of github.com:ekylibre/ekylibre
Fixes variant_indication with parted? method
Merge branch 'master' of github.com:ekylibre/ekylibre

Conflicts:
	app/views/backend/mineral_matters/show.html.haml
Cleans trailing spaces