biosed added
Merge branch 'master' of https://github.com/chipster/chipster.git

Conflicts:
	src/main/modules/misc/misc-module.xml
Biosed added
Merge branch 'master' of https://github.com/chipster/chipster.git