Update
Merge branch 'master' of https://github.com/AdrPeter/WebArena

Conflicts:
	.htaccess
	README.md
	app/Config/Schema/db_acl.php
	app/Config/Schema/db_acl.sql
	app/Config/Schema/i18n.php
	app/Config/Schema/i18n.sql
	app/Config/Schema/sessions.php
	app/Config/Schema/sessions.sql
	app/Config/acl.ini.php
	app/Config/acl.php
	app/Config/bootstrap.php
	app/Config/core.php
	app/Config/email.php.default
	app/Config/routes.php
	app/Controller/AppController.php
	app/Controller/ArenaController.php
	app/Controller/Component/empty
	app/Controller/PagesController.php
	app/Model/AppModel.php
	app/Model/Behavior/empty
	app/Model/Datasource/empty
	app/Model/Fighter.php
	app/Plugin/empty
	app/View/Arena/Index.ctp~
	app/View/Arena/character.ctp
	app/View/Arena/diary.ctp
	app/View/Arena/index.ctp
	app/View/Arena/login.ctp
	app/View/Arena/sight.ctp
	app/View/Elements/empty
	app/View/Emails/html/default.ctp
	app/View/Emails/text/default.ctp
	app/View/Errors/error400.ctp
	app/View/Errors/error500.ctp
	app/View/Helper/AppHelper.php
	app/View/Layouts/Emails/html/default.ctp
	app/View/Layouts/Emails/text/default.ctp
	app/View/Layouts/ajax.ctp
	app/View/Layouts/default.ctp
	app/View/Layouts/error.ctp
	app/View/Layouts/flash.ctp
	app/View/Layouts/js/default.ctp
	app/View/Layouts/rss/default.ctp
	app/View/Layouts/xml/default.ctp
	app/View/Pages/home.ctp
	app/View/Scaffolds/empty
	app/webroot/.htaccess
	lib/Cake/Console/Command/Task/ViewTask.php
	lib/Cake/Console/Templates/skel/.htaccess
	lib/Cake/Console/Templates/skel/webroot/.htaccess
	lib/Cake/Controller/Component/Auth/DigestAuthenticate.php
	lib/Cake/Controller/Controller.php
	lib/Cake/Core/App.php
	lib/Cake/Model/Datasource/CakeSession.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php
	lib/Cake/Test/Case/Controller/Component/Auth/DigestAuthenticateTest.php
	lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
	lib/Cake/Test/Case/Model/ModelReadTest.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
	lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php
	lib/Cake/Test/Case/Utility/FolderTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Test/Case/View/Helper/TextHelperTest.php
	lib/Cake/TestSuite/CakeTestCase.php
	lib/Cake/Utility/CakeTime.php
	lib/Cake/Utility/Folder.php
	lib/Cake/View/Elements/exception_stack_trace.ctp
	lib/Cake/View/Errors/fatal_error.ctp
	lib/Cake/View/Helper/FormHelper.php