1
Merge branch 'master' of https://github.com/SweetyCoder/cake-jiandan

Conflicts:
	app/View/Layouts/default.ctp
1