Check validation
Merge branch 'master' of https://github.com/CafeShoppe/Cafe-Shoppe.git