Merge branch 'hotfix/20140603-pso2'
g-heaven
g-heaven(2)
g-heaven(3)
Merge branch 'hotfix/20140603-gheaven' into develop