This is master's diff.
Merge branch 'master' into feture/002

Conflicts:
	CurryBreadMan.php

to f002