Merge branch 'master' of https://github.com/Brainwinner/bci

Conflicts:
	app/Controller/ProductsController.php
	app/Controller/SchedulesController.php
	app/View/Products/add.ctp
	app/View/Schedules/add.ctp
update