Merge dev into master to test heroku staging app #49

Closed pmillssf closed 7 years ago