hot fix
db
Merge branch 'master' of https://github.com/charleschoi/promotion
test administration