Fixed 'cola' problem (not returning chocolate)
Category size generation stuff
Merge branch 'master' of github.com:TeamAlberto/AlbertoApp

Conflicts:
	api/controllers/search.js