update cake
ignore cli
debug on in shell
fixing shop schema
Merge branch 'dev' of github.com:infinitas/infinitas into dev

Conflicts:
	CakePHP