fixing last commits
Merge branch 'master' into HEAD

Conflicts:
	lib/rubabel/molecule/fragmentable/asms_2002_scheme1.rb