Merge branch 'master', remote-tracking branch 'origin' into develop
Fix install
Always use our copy of argparse because the bug of python 2.7.0: http:bugs.python.org/issue9340
Merge branch 'develop' of https://github.com/chen3feng/typhoon-blade into develop
Merge pull request #43 from chen3feng/develop

Develop