Merge branch 'hotfix/20130822'
Merge branch 'release/20130825'
Merge branch 'release/20130826'
rename zshrc