ELB clean up
Added a test of wide search criteria image search, to make sure large number of images can be loaded and parsed correctly.
Merge pull request #48 from maksimov/develop

Develop
Merge pull request #14 from greese/develop

Merge upstream dasein