Updated query for JSON
Merge branch 'master' of https://github.com/CustomCupcakes/Custom-Cupcakes
Updated query for JSON
Merge branch 'master' of https://github.com/CustomCupcakes/Custom-Cupcakes into Greg
updated files from the server
Merge branch 'master' of https://github.com/CustomCupcakes/Custom-Cupcakes into Greg
Added database modelin .dia and .png formats