Rewrite of FlickrQuery as an Interface.

FlickrQuery now serves as an Interface with the search being performed by FlickrImageQuery, an implementation of FlickrQuery.
The change was made in preparation for future additional search query types.
Merge remote-tracking branch 'origin/master'