Adding new file
Merge branch 'master' of https://github.com/nicobaruna/physical_outlet

Conflicts:
	app/Controller/CategoriesController.php
	app/View/Categories/add.ctp
	app/View/Categories/edit.ctp