test
Merge branch 'master' of https://github.com/amiraaZebra/kosenmn

Conflicts:
	app/tmp/cache/models/myapp_cake_model_default_kosenmn_list
	app/tmp/cache/models/myapp_cake_model_default_kosenmn_posts
	app/tmp/cache/models/myapp_cake_model_default_kosenmn_users
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_ja
	app/tmp/cache/persistent/myapp_cake_core_cake_ja
	app/tmp/cache/persistent/myapp_cake_core_debug_kit_ja
	app/tmp/cache/persistent/myapp_cake_core_default_ja
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache
	app/tmp/cache/persistent/myapp_cake_core_users_ja
	app/tmp/logs/error.log