slightly improved CalcUtil test
Merge branch 'master' of https://github.com/crispmark/galaxy

Conflicts:
	.idea/workspace.xml
commit before pull
Merge branch 'tempMergeBranch'

Conflicts:
	.idea/workspace.xml
	galaxy.iml