Merge branch 'hotfix/20140715-dka'
PSO2 wiki
Merge branch 'hotfix/20140714-pso' into develop