backuped
backup
[CLEANUP]
Merge branch 'sandbox' of github.com:uweschmitt/emzed2 into sandbox

Conflicts:
	sandbox/feature_grouping.py
Merge branch 'sandbox' of github.com:uweschmitt/emzed2 into sandbox
bakcup
Merge branch 'master' of github.com:uweschmitt/emzed2 into sandbox
backup
[CLEANUP]
bakcup
[FIX] fixed modified behaviour of openms metabo ff for mz column
Merge branch 'sandbox' of github.com:uweschmitt/emzed2 into sandbox

Conflicts:
	sandbox/feature_grouping.py
backup
Merge branch 'sandbox' of github.com:uweschmitt/emzed2

Conflicts:
	emzed/version.py
	sandbox/feature_grouping.py