temp cache.
Merge branch 'master' of https://github.com/bazocc4/cakepanel

Conflicts:
	app/tmp/cache/models/myapp_cake_model_default_cakepanel_cms_accounts
	app/tmp/cache/models/myapp_cake_model_default_cakepanel_cms_entries
	app/tmp/cache/models/myapp_cake_model_default_cakepanel_cms_entry_metas
	app/tmp/cache/models/myapp_cake_model_default_cakepanel_cms_roles
	app/tmp/cache/models/myapp_cake_model_default_cakepanel_cms_settings
	app/tmp/cache/models/myapp_cake_model_default_cakepanel_cms_type_metas
	app/tmp/cache/models/myapp_cake_model_default_cakepanel_cms_types
	app/tmp/cache/models/myapp_cake_model_default_cakepanel_cms_user_metas
	app/tmp/cache/models/myapp_cake_model_default_cakepanel_cms_users
	app/tmp/cache/models/myapp_cake_model_default_cakepanel_list
	app/tmp/cache/persistent/myapp_cake_core_cake_en-us
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache
	app/tmp/logs/debug.log