Merge branch 'hotfix/cache-dir' into develop
fix no return issue during updating user info
Merge branch 'release/v20140428'