Merge pull request #1 from jmcunningham/master

Merge from master
Fix for expired coupon code for course
Merge pull request #221 from AnthonyPAlicea/master

Fix for expired coupon code