Merge pull request #687 from brooksryba/develop

Develop
zingermans revamp
Merge pull request #688 from Tendrid/develop

zingermans revamp
QA bug fixes for zingermans
Merge pull request #689 from Tendrid/develop

QA bug fixes for zingermans
add fix for thumbnails
Merge pull request #690 from Tendrid/develop

add fix for thumbnails