adding control to add categories
Merge branch 'master' of https://github.com/Luis-Escobar/BigBoxApplication

Conflicts:
	App/appjs/app.js