Merge branch 'hotfix/#17_Flickr_is_not_working'
Merge branch 'develop' into hotfix/1.0.2.2
Merge branch 'hotfix/1.0.2.2'
Merge branch 'hotfix/1.0.2.2' into develop
Merge branch 'master' into release/1.0.2.3
Merge branch 'release/1.0.2.3' into develop