wanghua 20130718
Merge branch 'master' of https://github.com/GalaxyFutures/NDAPGalaxy