added test
Merge branch 'master' of github.com:gxa/atlas
GeneProfileDaoMock is used, first attempt to integrate calculator into controller
Merge branch 'master' of github.com:gxa/atlas