Fixed #48, #49
Merge branch 'master' of https://github.com/SustainHawaii/djangoshop

Merge