ほげほげー
Merge branch 'master' of github.com:ivezuki/pj_contents_cakephp

Conflicts:
	app/tmp/cache/models/myapp_cake_model_default__p_j_codes
	app/tmp/cache/models/myapp_cake_model_default__p_j_jumps
	app/tmp/cache/models/myapp_cake_model_default__p_j_list
	app/tmp/cache/models/myapp_cake_model_default__p_j_movies
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_ja
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache