display stock image if there are no images associated with a liquid
Merge branch 'master' of https://github.com/bmease/ecig