aa
Merge branch 'master' of github.com:diamond2000/surematome

Conflicts:
	cakephp23/matomeword/tmp/cache/persistent/matomeword_cake_core_cake_dev_ja
	cakephp23/matomeword/tmp/cache/persistent/matomeword_cake_core_cake_ja
	cakephp23/matomeword/tmp/cache/persistent/matomeword_cake_core_debug_kit_ja
	cakephp23/matomeword/tmp/cache/persistent/matomeword_cake_core_file_map