20130523 1604
Merge branch 'master' of github.com:starlifht/internalAPI