udpate the code and fixed some small bugs
Merge branch 'dev' of ssh://github.com/LifeWorks/biojazz into dev