fixes
Merge branches 'dev-photoviewer' and 'master' of https://github.com/dirong/test_githubusers into dev-photoviewer