bug fix
Merge branch 'master' into gh-pages
Merge branch 'master' of https://github.com/yutaono/flickrPhotoViewerForSmartPhone
refactoring
Merge branch 'master' into gh-pages