commit facebook
adaf
Merge branch 'master' of https://github.com/marxen68/comic2

Conflicts:
	.gitmodules
	app/Plugin/DebugKit
	app/tmp/cache/models/myapp_cake_model_default_rexiv_test_cake_sessions
	app/tmp/cache/models/myapp_cake_model_default_rexiv_test_list
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_en-us
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_ja
	app/tmp/cache/persistent/myapp_cake_core_cake_en-us
	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_object_map
	app/tmp/logs/error.log