Merge branch 'hotfix/20141217-dixq'
playapp
Merge branch 'hotfix/20141217-playapp' into develop