sql from dev
Merge branch 'master' of https://github.com/tylerhargett/GUIDB-Cupcake
Merge branch 'master' of https://github.com/tylerhargett/GUIDB-Cupcake