From 57e175552a07eb2de69aa2793ead734a7c35a3b7 Mon Sep 17 00:00:00 2001
From: LAV45 <lav451@gmail.com>
Date: Wed, 8 May 2013 18:10:02 +0300
Subject: [PATCH 001/152] The first rule of a template can not start with a
 "/", even if it has a default value

---
 framework/web/UrlRule.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/web/UrlRule.php b/framework/web/UrlRule.php
index 53bd747..96cb994 100644
--- a/framework/web/UrlRule.php
+++ b/framework/web/UrlRule.php
@@ -125,7 +125,7 @@ class UrlRule extends Object
 				if (isset($this->defaults[$name])) {
 					$length = strlen($match[0][0]);
 					$offset = $match[0][1];
-					if ($this->pattern[$offset - 1] === '/' && $this->pattern[$offset + $length] === '/') {
+					if ($offset > 1 && $this->pattern[$offset - 1] === '/' && $this->pattern[$offset + $length] === '/') {
 						$tr["/<$name>"] = "(/(?P<$name>$pattern))?";
 					} else {
 						$tr["<$name>"] = "(?P<$name>$pattern)?";

From 97992bdc89ecec7f742835d0184f521aac4c91ac Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sat, 4 May 2013 08:03:40 -0400
Subject: [PATCH 002/152] Fixes for issue #81.

---
 framework/YiiBase.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/framework/YiiBase.php b/framework/YiiBase.php
index 9d501b1..ed975c9 100644
--- a/framework/YiiBase.php
+++ b/framework/YiiBase.php
@@ -600,6 +600,13 @@ class YiiBase
 	 */
 	public static function t($message, $params = array(), $language = null)
 	{
-		return self::$app->getI18N()->translate($message, $params, $language);
+		if (self::$app !== null) {
+			return self::$app->getI18N()->translate($message, $params, $language);
+		} else {
+			if (strpos($message, '|') !== false && preg_match('/^([\w\-\\/\.\\\\]+)\|(.*)/', $message, $matches)) {
+				$message = $matches[2];
+			}
+			return is_array($params) ? strtr($message, $params) : $message;
+		}
 	}
 }

From 0454d03177ce7acf431a1b279a75f3db29b97561 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sat, 4 May 2013 08:08:46 -0400
Subject: [PATCH 003/152] Fixed test break.

---
 framework/helpers/base/Html.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/framework/helpers/base/Html.php b/framework/helpers/base/Html.php
index 5b8e7db..3e7c7a2 100644
--- a/framework/helpers/base/Html.php
+++ b/framework/helpers/base/Html.php
@@ -95,9 +95,9 @@ class Html
 	public static $attributeOrder = array(
 		'type',
 		'id',
+		'class',
 		'name',
 		'value',
-		'class',
 
 		'href',
 		'src',
@@ -375,7 +375,8 @@ class Html
 	 */
 	public static function mailto($text, $email = null, $options = array())
 	{
-		return static::a($text, 'mailto:' . ($email === null ? $text : $email), $options);
+		$options['href'] = 'mailto:' . ($email === null ? $text : $email);
+		return static::tag('a', $text, $options);
 	}
 
 	/**

From 2da3cbecdfb9ec5044f4f8e184a57b9bb8919276 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sat, 4 May 2013 09:23:43 -0300
Subject: [PATCH 004/152] Update readme.md

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index dfb9c45..6293292 100644
--- a/readme.md
+++ b/readme.md
@@ -34,6 +34,6 @@ You are welcome to participate in Yii 2 development in the following ways:
 * [Report issues](https://github.com/yiisoft/yii2/issues)
 * [Give us feedback or start a design discussion](http://www.yiiframework.com/forum/index.php/forum/42-design-discussions-for-yii-20/)
 * Fix issues, develop features, write/polish documentation
-    - Before you start, please adopt an existing issue or start a new one to avoid duplicated efforts.
+    - Before you start, please adopt an existing issue (labelled with "ready for adoption") or start a new one to avoid duplicated efforts.
     - Please submit a merge request after you finish development.
 

From 2bdfc27692731da995f61bef103681b5c0aca184 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sat, 4 May 2013 08:28:27 -0400
Subject: [PATCH 005/152] Fixes for issue #78.

---
 framework/helpers/base/Html.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/framework/helpers/base/Html.php b/framework/helpers/base/Html.php
index 3e7c7a2..15db823 100644
--- a/framework/helpers/base/Html.php
+++ b/framework/helpers/base/Html.php
@@ -127,13 +127,15 @@ class Html
 	 * Encodes special characters into HTML entities.
 	 * The [[yii\base\Application::charset|application charset]] will be used for encoding.
 	 * @param string $content the content to be encoded
+	 * @param boolean $doubleEncode whether to encode HTML entities in `$content`. If false,
+	 * HTML entities in `$content` will not be further encoded.
 	 * @return string the encoded content
 	 * @see decode
 	 * @see http://www.php.net/manual/en/function.htmlspecialchars.php
 	 */
-	public static function encode($content)
+	public static function encode($content, $doubleEncode = true)
 	{
-		return htmlspecialchars($content, ENT_QUOTES, Yii::$app->charset);
+		return htmlspecialchars($content, ENT_QUOTES, Yii::$app->charset, $doubleEncode);
 	}
 
 	/**

From 992992b4a3f3912119a54aa542a2946cf3ee3843 Mon Sep 17 00:00:00 2001
From: Suralc <thesurwaveing@googlemail.com>
Date: Sat, 4 May 2013 15:55:01 +0200
Subject: [PATCH 006/152] Fix build command.

---
 build/build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/build b/build/build
index fff4282..691eba9 100755
--- a/build/build
+++ b/build/build
@@ -16,5 +16,5 @@ require(__DIR__ . '/../framework/yii.php');
 $id = 'yiic-build';
 $basePath = __DIR__;
 
-$application = new yii\console\Application($id, $basePath);
+$application = new yii\console\Application(array('id' => $id, 'basePath' => $basePath));
 $application->run();

From 985f076b2db578bd44c896a1d80faa3a772d6761 Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Sat, 4 May 2013 21:47:01 +0700
Subject: [PATCH 007/152] Testsuite config

---
 phpunit.xml.dist       | 13 +++++++++++++
 tests/unit/phpunit.xml |  7 -------
 2 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 phpunit.xml.dist
 delete mode 100644 tests/unit/phpunit.xml

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 0000000..bf37a26
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<phpunit bootstrap="./tests/unit/bootstrap.php"
+		colors="true"
+		convertErrorsToExceptions="true"
+		convertNoticesToExceptions="true"
+		convertWarningsToExceptions="true"
+		stopOnFailure="false">
+		<testsuites>
+			<testsuite name="Yii Test Suite">
+				<directory>./tests/unit</directory>
+			</testsuite>
+		</testsuites>
+</phpunit>
\ No newline at end of file
diff --git a/tests/unit/phpunit.xml b/tests/unit/phpunit.xml
deleted file mode 100644
index 17db94e..0000000
--- a/tests/unit/phpunit.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<phpunit bootstrap="bootstrap.php"
-		colors="false"
-		convertErrorsToExceptions="true"
-		convertNoticesToExceptions="true"
-		convertWarningsToExceptions="true"
-		stopOnFailure="false">
-</phpunit>
\ No newline at end of file

From 305028b5c81463b977493de208167d87c28f47c0 Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Sun, 5 May 2013 00:09:12 +0700
Subject: [PATCH 008/152] Travis configuration

---
 .travis.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..e4b8278
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,14 @@
+language: php
+
+php:
+  - 5.3
+  - 5.4
+  - 5.5
+
+env:
+  - DB=mysql
+
+before_script:
+  - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS yiitest;'; fi"
+
+script: phpunit
\ No newline at end of file

From 51de7571401fea3ca272f5862cfb12e4dc0774a4 Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Sun, 5 May 2013 00:10:17 +0700
Subject: [PATCH 009/152] Use travis as user instead root within DSN

---
 tests/unit/data/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/data/config.php b/tests/unit/data/config.php
index fc15690..238a7cc 100644
--- a/tests/unit/data/config.php
+++ b/tests/unit/data/config.php
@@ -3,7 +3,7 @@
 return array(
 	'mysql' => array(
 		'dsn' => 'mysql:host=127.0.0.1;dbname=yiitest',
-		'username' => 'root',
+		'username' => 'travis',
 		'password' => '',
 		'fixture' => __DIR__ . '/mysql.sql',
 	),

From 88bfce96d43b5c067ea8a0c6fed3f103320f534d Mon Sep 17 00:00:00 2001
From: ekerazha <ekerazha@gmail.com>
Date: Sat, 4 May 2013 21:15:24 +0300
Subject: [PATCH 010/152] Use AES-192 for encryption

---
 framework/helpers/base/SecurityHelper.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/framework/helpers/base/SecurityHelper.php b/framework/helpers/base/SecurityHelper.php
index 6ba48ba..e2f2215 100644
--- a/framework/helpers/base/SecurityHelper.php
+++ b/framework/helpers/base/SecurityHelper.php
@@ -42,7 +42,8 @@ class SecurityHelper
 	public static function encrypt($data, $key)
 	{
 		$module = static::openCryptModule();
-		$key = StringHelper::substr($key, 0, mcrypt_enc_get_key_size($module));
+		// 192-bit (24 bytes) key size
+		$key = StringHelper::substr($key, 0, 24);
 		srand();
 		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($module), MCRYPT_RAND);
 		mcrypt_generic_init($module, $key, $iv);
@@ -63,7 +64,8 @@ class SecurityHelper
 	public static function decrypt($data, $key)
 	{
 		$module = static::openCryptModule();
-		$key = StringHelper::substr($key, 0, mcrypt_enc_get_key_size($module));
+		// 192-bit (24 bytes) key size
+		$key = StringHelper::substr($key, 0, 24);
 		$ivSize = mcrypt_enc_get_iv_size($module);
 		$iv = StringHelper::substr($data, 0, $ivSize);
 		mcrypt_generic_init($module, $key, $iv);
@@ -148,7 +150,8 @@ class SecurityHelper
 		if (!extension_loaded('mcrypt')) {
 			throw new InvalidConfigException('The mcrypt PHP extension is not installed.');
 		}
-		$module = @mcrypt_module_open('rijndael-256', '', MCRYPT_MODE_CBC, '');
+		// AES uses a 128-bit block size
+		$module = @mcrypt_module_open('rijndael-128', '', MCRYPT_MODE_CBC, '');
 		if ($module === false) {
 			throw new Exception('Failed to initialize the mcrypt module.');
 		}
@@ -269,4 +272,4 @@ class SecurityHelper
 		$salt .= str_replace('+', '.', substr(base64_encode($rand), 0, 22));
 		return $salt;
 	}
-}
\ No newline at end of file
+}

From 3b12bbd8f22196ff5ee894d5b12088f787b93602 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sat, 4 May 2013 14:28:09 -0400
Subject: [PATCH 011/152] Fixes issue #90

---
 framework/base/Widget.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/framework/base/Widget.php b/framework/base/Widget.php
index 13e6d30..1aabd4f 100644
--- a/framework/base/Widget.php
+++ b/framework/base/Widget.php
@@ -83,7 +83,8 @@ class Widget extends Component
 	 */
 	public function render($view, $params = array())
 	{
-		return $this->view->render($view, $params, $this);
+		$viewFile = $this->findViewFile($view);
+		return $this->view->renderFile($viewFile, $params, $this);
 	}
 
 	/**

From 14781584f9bacdff21ee03ec14dbb8c9bcf79e96 Mon Sep 17 00:00:00 2001
From: ekerazha <ekerazha@gmail.com>
Date: Sat, 4 May 2013 22:02:39 +0300
Subject: [PATCH 012/152] Use a string for the mode too

The cipher is already specified as string
---
 framework/helpers/base/SecurityHelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/helpers/base/SecurityHelper.php b/framework/helpers/base/SecurityHelper.php
index e2f2215..ed5bfd6 100644
--- a/framework/helpers/base/SecurityHelper.php
+++ b/framework/helpers/base/SecurityHelper.php
@@ -151,7 +151,7 @@ class SecurityHelper
 			throw new InvalidConfigException('The mcrypt PHP extension is not installed.');
 		}
 		// AES uses a 128-bit block size
-		$module = @mcrypt_module_open('rijndael-128', '', MCRYPT_MODE_CBC, '');
+		$module = @mcrypt_module_open('rijndael-128', '', 'cbc', '');
 		if ($module === false) {
 			throw new Exception('Failed to initialize the mcrypt module.');
 		}

From d8beaa648e5ec8e1aa7fe14513b47ba1ea2fb897 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sat, 4 May 2013 23:23:29 +0400
Subject: [PATCH 013/152] added doc files

---
 docs/guide/active-record.md  |  0
 docs/guide/authentication.md |  0
 docs/guide/authorization.md  |  0
 docs/guide/caching.md        |  3 +++
 docs/guide/console.md        |  0
 docs/guide/dao.md            |  0
 docs/guide/error.md          |  3 +++
 docs/guide/extension.md      |  0
 docs/guide/form.md           |  0
 docs/guide/gii.md            |  0
 docs/guide/i18n.md           |  0
 docs/guide/installation.md   | 11 ++++++-----
 docs/guide/logging.md        |  0
 docs/guide/migration.md      |  3 +++
 docs/guide/mvc.md            |  3 ++-
 docs/guide/performance.md    |  0
 docs/guide/query-builder.md  |  0
 docs/guide/security.md       |  0
 docs/guide/template.md       |  0
 docs/guide/testing.md        |  0
 docs/guide/theming.md        |  0
 docs/guide/upgrade.md        |  0
 docs/guide/url.md            |  3 +++
 docs/guide/validation.md     |  0
 24 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 docs/guide/active-record.md
 create mode 100644 docs/guide/authentication.md
 create mode 100644 docs/guide/authorization.md
 create mode 100644 docs/guide/caching.md
 create mode 100644 docs/guide/console.md
 create mode 100644 docs/guide/dao.md
 create mode 100644 docs/guide/error.md
 create mode 100644 docs/guide/extension.md
 create mode 100644 docs/guide/form.md
 create mode 100644 docs/guide/gii.md
 create mode 100644 docs/guide/i18n.md
 create mode 100644 docs/guide/logging.md
 create mode 100644 docs/guide/migration.md
 create mode 100644 docs/guide/performance.md
 create mode 100644 docs/guide/query-builder.md
 create mode 100644 docs/guide/security.md
 create mode 100644 docs/guide/template.md
 create mode 100644 docs/guide/testing.md
 create mode 100644 docs/guide/theming.md
 create mode 100644 docs/guide/upgrade.md
 create mode 100644 docs/guide/url.md
 create mode 100644 docs/guide/validation.md

diff --git a/docs/guide/active-record.md b/docs/guide/active-record.md
new file mode 100644
index 0000000..e69de29
diff --git a/docs/guide/authentication.md b/docs/guide/authentication.md
new file mode 100644
index 0000000..e69de29
diff --git a/docs/guide/authorization.md b/docs/guide/authorization.md
new file mode 100644
index 0000000..e69de29
diff --git a/docs/guide/caching.md b/docs/guide/caching.md
new file mode 100644
index 0000000..cd945e7
--- /dev/null
+++ b/docs/guide/caching.md
@@ -0,0 +1,3 @@
+Caching
+=======
+
diff --git a/docs/guide/console.md b/docs/guide/console.md
new file mode 100644
index 0000000..e69de29
diff --git a/docs/guide/dao.md b/docs/guide/dao.md
new file mode 100644
index 0000000..e69de29
diff --git a/docs/guide/error.md b/docs/guide/error.md
new file mode 100644
index 0000000..c97fada
--- /dev/null
+++ b/docs/guide/error.md
@@ -0,0 +1,3 @@
+Error Handling
+==============
+
diff --git a/docs/guide/extension.md b/docs/guide/extension.md
new file mode 100644
index 0000000..e69de29
diff --git a/docs/guide/form.md b/docs/guide/form.md
new file mode 100644
index 0000000..e69de29
diff --git a/docs/guide/gii.md b/docs/guide/gii.md
new file mode 100644
index 0000000..e69de29
diff --git a/docs/guide/i18n.md b/docs/guide/i18n.md
new file mode 100644
index 0000000..e69de29
diff --git a/docs/guide/installation.md b/docs/guide/installation.md
index 6cc5ef8..3f9a803 100644
--- a/docs/guide/installation.md
+++ b/docs/guide/installation.md
@@ -25,8 +25,8 @@ http://hostname/path/to/yii/requirements/index.php
 ~~~
 
 Yii requires PHP 5.3, so the server must have PHP 5.3 or above installed and
-available to the web server.  Yii has been tested with [Apache HTTP server](http://httpd.apache.org/)
-on Windows and Linux.  It may also run on other Web servers and platforms,
+available to the web server. Yii has been tested with [Apache HTTP server](http://httpd.apache.org/)
+on Windows and Linux. It may also run on other Web servers and platforms,
 provided PHP 5.3 is supported.
 
 
@@ -34,7 +34,7 @@ Recommended Apache Configuration
 --------------------------------
 
 Yii is ready to work with a default Apache web server configuration.
-The `.htaccess` files in Yii framework and application folders restrict
+The `.htaccess` files in Yii framework and application folders deny
 access to the restricted resources. To hide the bootstrap file (usually `index.php`)
 in your URLs you can add `mod_rewrite` instructions to the `.htaccess` file
 in your document root or to the virtual host configuration:
@@ -63,7 +63,7 @@ server {
     access_log  /www/mysite/log/access.log  main;
 
     server_name  mysite;
-    root   $host_path/htdocs;
+    root  $host_path/htdocs;
     set $yii_bootstrap "index.php";
 
     charset utf-8;
@@ -108,4 +108,5 @@ server {
 }
 ~~~
 
-Using this configuration you can set `cgi.fix_pathinfo=0` in php.ini to avoid many unnecessary system stat() calls.
+Using this configuration you can set `cgi.fix_pathinfo=0` in php.ini to avoid
+many unnecessary system `stat()` calls.
diff --git a/docs/guide/logging.md b/docs/guide/logging.md
new file mode 100644
index 0000000..e69de29
diff --git a/docs/guide/migration.md b/docs/guide/migration.md
new file mode 100644
index 0000000..0fe2fb3
--- /dev/null
+++ b/docs/guide/migration.md
@@ -0,0 +1,3 @@
+Database Migration
+==================
+
diff --git a/docs/guide/mvc.md b/docs/guide/mvc.md
index 79140ce..a99d043 100644
--- a/docs/guide/mvc.md
+++ b/docs/guide/mvc.md
@@ -11,7 +11,7 @@ the communication between the model and the view.
 
 Besides implementing MVC, Yii also introduces a front-controller, called
 `Application`, which encapsulates the execution context for the processing
-of a request.  Application collects some information about a user request and
+of a request. Application collects information about a user request and
 then dispatches it to an appropriate controller for further handling.
 
 The following diagram shows the static structure of a Yii application:
@@ -21,6 +21,7 @@ The following diagram shows the static structure of a Yii application:
 
 A Typical Workflow
 ------------------
+
 The following diagram shows a typical workflow of a Yii application when
 it is handling a user request:
 
diff --git a/docs/guide/performance.md b/docs/guide/performance.md
new file mode 100644
index 0000000..e69de29
diff --git a/docs/guide/query-builder.md b/docs/guide/query-builder.md
new file mode 100644
index 0000000..e69de29
diff --git a/docs/guide/security.md b/docs/guide/security.md
new file mode 100644
index 0000000..e69de29
diff --git a/docs/guide/template.md b/docs/guide/template.md
new file mode 100644
index 0000000..e69de29
diff --git a/docs/guide/testing.md b/docs/guide/testing.md
new file mode 100644
index 0000000..e69de29
diff --git a/docs/guide/theming.md b/docs/guide/theming.md
new file mode 100644
index 0000000..e69de29
diff --git a/docs/guide/upgrade.md b/docs/guide/upgrade.md
new file mode 100644
index 0000000..e69de29
diff --git a/docs/guide/url.md b/docs/guide/url.md
new file mode 100644
index 0000000..46bb177
--- /dev/null
+++ b/docs/guide/url.md
@@ -0,0 +1,3 @@
+URL Management
+==============
+
diff --git a/docs/guide/validation.md b/docs/guide/validation.md
new file mode 100644
index 0000000..e69de29

From 1a317ebe313252c08fcbf3f89388b06414975d0f Mon Sep 17 00:00:00 2001
From: Rinat Silnov <mail@rinat.io>
Date: Sat, 4 May 2013 23:54:59 +0400
Subject: [PATCH 014/152] Fixed VarDumper::dump for objects

Otherwise it throws an exception that "Object of class ClassName
could not be converted to string"
---
 framework/helpers/base/VarDumper.php           |  2 +-
 tests/unit/framework/helpers/VarDumperTest.php | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 tests/unit/framework/helpers/VarDumperTest.php

diff --git a/framework/helpers/base/VarDumper.php b/framework/helpers/base/VarDumper.php
index fe15d98..43b0cd8 100644
--- a/framework/helpers/base/VarDumper.php
+++ b/framework/helpers/base/VarDumper.php
@@ -116,7 +116,7 @@ class VarDumper
 				} elseif (self::$_depth <= $level) {
 					self::$_output .= get_class($var) . '(...)';
 				} else {
-					$id = self::$_objects[] = $var;
+					$id = array_push(self::$_objects, $var);
 					$className = get_class($var);
 					$members = (array)$var;
 					$spaces = str_repeat(' ', $level * 4);
diff --git a/tests/unit/framework/helpers/VarDumperTest.php b/tests/unit/framework/helpers/VarDumperTest.php
new file mode 100644
index 0000000..8757588
--- /dev/null
+++ b/tests/unit/framework/helpers/VarDumperTest.php
@@ -0,0 +1,12 @@
+<?php
+namespace yiiunit\framework\helpers;
+use \yii\helpers\VarDumper;
+
+class VarDumperTest extends \yii\test\TestCase
+{
+	public function testDumpObject()
+	{
+		$obj = new \StdClass();
+		VarDumper::dump($obj);
+	}
+}
\ No newline at end of file

From aed66bcd1bccbb2be98cd63cc3950e327fbf0028 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sun, 5 May 2013 00:02:14 +0400
Subject: [PATCH 015/152] started performance section of the guide

---
 docs/guide/performance.md | 100 ++++++++++++++++++++++++++++++++++++++++++++++
 docs/guide/template.md    |   3 ++
 2 files changed, 103 insertions(+)

diff --git a/docs/guide/performance.md b/docs/guide/performance.md
index e69de29..a480a0b 100644
--- a/docs/guide/performance.md
+++ b/docs/guide/performance.md
@@ -0,0 +1,100 @@
+Performance Tuning
+==================
+
+Application performance consists of two parts. First is the framework performance
+and the second is the application itself. Yii has a pretty low performance impact
+on your application out of the box and can be fine-tuned further for production
+environment. As for the application, we'll provide some of the best practices
+along with examples on how to apply them to Yii.
+
+Preparing framework for production
+----------------------------------
+
+### Disabling Debug Mode
+
+First thing you should do before deploying your application to production environment
+is to disable debug mode. A Yii application runs in debug mode if the constant
+`YII_DEBUG` is defined as `true` in `index.php`. Debug mode is useful during
+development stage, but it would impact performance because some components
+cause extra burden in debug mode. For example, the message logger may record
+additional debug information for every message being logged.
+
+### Enabling PHP opcode cache
+
+Enabling the PHP opcode cache improves any PHP application performance and lowers
+memory usage. Yii is no exception. It was tested with APC extension that caches
+and optimizes PHP intermediate code and avoids the time spent in parsing PHP
+scripts for every incoming request.
+
+### Turning on ActiveRecord database schema caching
+
+If the application is using Active Record, we should turn on the schema caching
+to save the time of parsing database schema. This can be done by setting the
+`Connection::enableSchemaCache` property to be `true` via application configuration
+`protected/config/main.php`:
+
+```php
+
+```
+
+### Combining and Minimizing Assets
+
+
+### Using better storage for sessions
+
+By default PHP uses plain files to handle sessions. It is OK for development and
+small projects but when it comes to handling concurrent requests it's better to
+switch to another storage such as database. You can do so by configuring your
+application via `protected/config/main.php`:
+
+
+```php
+```
+
+
+Improving application
+---------------------
+
+### Using Caching Techniques
+
+As described in the Caching section, Yii provides several caching solutions that
+may improve the performance of a Web application significantly. If the generation
+of some data takes long time, we can use the data caching approach to reduce the
+data generation frequency; If a portion of page remains relatively static, we
+can use the fragment caching approach to reduce its rendering frequency;
+If a whole page remains relative static, we can use the page caching approach to
+save the rendering cost for the whole page.
+
+
+### Database Optimization
+
+Fetching data from database is often the main performance bottleneck in
+a Web application. Although using caching may alleviate the performance hit,
+it does not fully solve the problem. When the database contains enormous data
+and the cached data is invalid, fetching the latest data could be prohibitively
+expensive without proper database and query design.
+
+Design index wisely in a database. Indexing can make SELECT queries much faster,
+but it may slow down INSERT, UPDATE or DELETE queries.
+
+For complex queries, it is recommended to create a database view for it instead
+of issuing the queries inside the PHP code and asking DBMS to parse them repetitively.
+
+Do not overuse Active Record. Although Active Record is good at modelling data
+in an OOP fashion, it actually degrades performance due to the fact that it needs
+to create one or several objects to represent each row of query result. For data
+intensive applications, using DAO or database APIs at lower level could be
+a better choice.
+
+Last but not least, use LIMIT in your SELECT queries. This avoids fetching
+overwhelming data from database and exhausting the memory allocated to PHP.
+
+### Using asArray
+
+### Processing data in background
+
+In order to respond to user requests faster you can process heavy parts of the
+request later if there's no need for immediate response.
+
+- Cron jobs + console.
+- queues + handlers.
\ No newline at end of file
diff --git a/docs/guide/template.md b/docs/guide/template.md
index e69de29..dc83d15 100644
--- a/docs/guide/template.md
+++ b/docs/guide/template.md
@@ -0,0 +1,3 @@
+Template
+========
+

From 958aeb76b6c866615a2f428b3c60e1e8d768845f Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sun, 5 May 2013 00:26:18 +0400
Subject: [PATCH 016/152] more on performance tuning

---
 docs/guide/performance.md | 82 +++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 72 insertions(+), 10 deletions(-)

diff --git a/docs/guide/performance.md b/docs/guide/performance.md
index a480a0b..58e8258 100644
--- a/docs/guide/performance.md
+++ b/docs/guide/performance.md
@@ -14,15 +14,22 @@ Preparing framework for production
 
 First thing you should do before deploying your application to production environment
 is to disable debug mode. A Yii application runs in debug mode if the constant
-`YII_DEBUG` is defined as `true` in `index.php`. Debug mode is useful during
-development stage, but it would impact performance because some components
-cause extra burden in debug mode. For example, the message logger may record
-additional debug information for every message being logged.
+`YII_DEBUG` is defined as `true` in `index.php` so to disable debug the following
+should be in your `index.php`:
+
+```php
+defined('YII_DEBUG') or define('YII_DEBUG', false);
+```
+
+Debug mode is very useful during development stage, but it would impact performance
+because some components cause extra burden in debug mode. For example, the message
+logger may record additional debug information for every message being logged.
 
 ### Enabling PHP opcode cache
 
 Enabling the PHP opcode cache improves any PHP application performance and lowers
-memory usage. Yii is no exception. It was tested with APC extension that caches
+memory usage significantly. Yii is no exception. It was tested with
+[APC PHP extension](http://php.net/manual/en/book.apc.php) that caches
 and optimizes PHP intermediate code and avoids the time spent in parsing PHP
 scripts for every incoming request.
 
@@ -34,28 +41,69 @@ to save the time of parsing database schema. This can be done by setting the
 `protected/config/main.php`:
 
 ```php
-
+return array(
+	// ...
+	'components' => array(
+		// ...
+		'db' => array(
+			'class' => 'yii\db\Connection',
+			'dsn' => 'mysql:host=localhost;dbname=mydatabase',
+			'username' => 'root',
+			'password' => '',
+			'enableSchemaCache' => true,
+
+			// Duration of schema cache.
+			// 'schemaCacheDuration' => 3600,
+
+			// Name of the cache component used. Default is 'cache'.
+			//'schemaCache' => 'cache',
+		),
+		'cache' => array(
+			'class' => 'yii\caching\FileCache',
+		),
+	),
+);
 ```
 
+Note that `cache` application component should be configured.
+
 ### Combining and Minimizing Assets
 
+TBD
 
 ### Using better storage for sessions
 
-By default PHP uses plain files to handle sessions. It is OK for development and
+By default PHP uses files to handle sessions. It is OK for development and
 small projects but when it comes to handling concurrent requests it's better to
 switch to another storage such as database. You can do so by configuring your
 application via `protected/config/main.php`:
 
-
 ```php
+return array(
+	// ...
+	'components' => array(
+		'session' => array(
+			'class' => 'yii\web\DbSession',
+
+			// Set the following if want to use DB component other than
+			// default 'db'.
+			// 'db' => 'mydb',
+
+			// To override default session table set the following
+			// 'sessionTable' => 'my_session',
+		),
+	),
+);
 ```
 
+You can use `CacheSession` to store sessions using cache. Note that some
+cache storages such as memcached has no guaranteee that session data will not
+be lost leading to unexpected logouts.
 
 Improving application
 ---------------------
 
-### Using Caching Techniques
+### Using Serverside Caching Techniques
 
 As described in the Caching section, Yii provides several caching solutions that
 may improve the performance of a Web application significantly. If the generation
@@ -66,6 +114,10 @@ If a whole page remains relative static, we can use the page caching approach to
 save the rendering cost for the whole page.
 
 
+### Leveraging HTTP to save procesing time and bandwidth
+
+TBD
+
 ### Database Optimization
 
 Fetching data from database is often the main performance bottleneck in
@@ -91,10 +143,20 @@ overwhelming data from database and exhausting the memory allocated to PHP.
 
 ### Using asArray
 
+A good way to save memory and processing time on read-only pages is to use
+ActiveRecord's `asArray` method.
+
+```php
+```
+
+TBD
+
 ### Processing data in background
 
 In order to respond to user requests faster you can process heavy parts of the
 request later if there's no need for immediate response.
 
 - Cron jobs + console.
-- queues + handlers.
\ No newline at end of file
+- queues + handlers.
+
+TBD
\ No newline at end of file

From 03cd47aed94512ddc117815bcca631c1a5763807 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sun, 5 May 2013 01:26:40 +0400
Subject: [PATCH 017/152] phpdoc typos

---
 framework/db/Query.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/db/Query.php b/framework/db/Query.php
index 2239f5d..6f76265 100644
--- a/framework/db/Query.php
+++ b/framework/db/Query.php
@@ -483,7 +483,7 @@ class Query extends \yii\base\Component
 	 * Sets the ORDER BY part of the query.
 	 * @param string|array $columns the columns (and the directions) to be ordered by.
 	 * Columns can be specified in either a string (e.g. "id ASC, name DESC") or an array
-	 * (e.g. `array('id' => Query::SORT_ASC ASC, 'name' => Query::SORT_DESC)`).
+	 * (e.g. `array('id' => Query::SORT_ASC, 'name' => Query::SORT_DESC)`).
 	 * The method will automatically quote the column names unless a column contains some parenthesis
 	 * (which means the column contains a DB expression).
 	 * @return Query the query object itself
@@ -499,7 +499,7 @@ class Query extends \yii\base\Component
 	 * Adds additional ORDER BY columns to the query.
 	 * @param string|array $columns the columns (and the directions) to be ordered by.
 	 * Columns can be specified in either a string (e.g. "id ASC, name DESC") or an array
-	 * (e.g. `array('id' => Query::SORT_ASC ASC, 'name' => Query::SORT_DESC)`).
+	 * (e.g. `array('id' => Query::SORT_ASC, 'name' => Query::SORT_DESC)`).
 	 * The method will automatically quote the column names unless a column contains some parenthesis
 	 * (which means the column contains a DB expression).
 	 * @return Query the query object itself

From a948e7387231ee49d0664c114c40a9cce7b41eb8 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sun, 5 May 2013 01:27:13 +0400
Subject: [PATCH 018/152] example for using asArray

---
 docs/guide/performance.md | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/docs/guide/performance.md b/docs/guide/performance.md
index 58e8258..9a871dc 100644
--- a/docs/guide/performance.md
+++ b/docs/guide/performance.md
@@ -147,9 +147,28 @@ A good way to save memory and processing time on read-only pages is to use
 ActiveRecord's `asArray` method.
 
 ```php
+class PostController extends Controller
+{
+	public function actionIndex()
+	{
+		$posts = Post::find()->orderBy('id DESC')->limit(100)->asArray()->all();
+		echo $this->render('index', array(
+			'posts' => $posts,
+		));
+	}
+}
 ```
 
-TBD
+In the view you should access fields of each invidual record from `$posts` as array:
+
+```php
+foreach($posts as $post) {
+	echo $post['title']."<br>";
+}
+```
+
+Note that you can use array notation even if `asArray` wasn't specified and you're
+working with AR objects.
 
 ### Processing data in background
 

From f3286df32880b46ec117d2eab8c5d783eec64952 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sun, 5 May 2013 01:44:34 +0400
Subject: [PATCH 019/152] Fixes #76

---
 docs/view_renderers.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/view_renderers.md b/docs/view_renderers.md
index 1d88d21..e26fe83 100644
--- a/docs/view_renderers.md
+++ b/docs/view_renderers.md
@@ -27,6 +27,9 @@ array(
 )
 ```
 
+Note that Smarty and Twig are not bundled with Yii and you have to download and
+unpack these yourself and then specify `twigPath` and `smartyPath` respectively.
+
 Twig
 ----
 

From ddf67f0833d96d16a4f01667c1237d51558fa481 Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Sun, 5 May 2013 03:18:37 +0400
Subject: [PATCH 020/152] Code style fix

---
 framework/db/ActiveRelation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/db/ActiveRelation.php b/framework/db/ActiveRelation.php
index f1b198b..97e2a8c 100644
--- a/framework/db/ActiveRelation.php
+++ b/framework/db/ActiveRelation.php
@@ -266,7 +266,7 @@ class ActiveRelation extends ActiveQuery
 	{
 		$attributes = array_keys($this->link);
 		$values = array();
-		if (count($attributes) ===1) {
+		if (count($attributes) === 1) {
 			// single key
 			$attribute = reset($this->link);
 			foreach ($models as $model) {

From 932ed70a7279056b2de4942f5282584a528580e7 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sat, 4 May 2013 19:25:35 -0400
Subject: [PATCH 021/152] Fixes issue #99.

---
 framework/web/Request.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/web/Request.php b/framework/web/Request.php
index ac19d5a..5e2f064 100644
--- a/framework/web/Request.php
+++ b/framework/web/Request.php
@@ -96,7 +96,7 @@ class Request extends \yii\base\Request
 	 */
 	public function getIsPostRequest()
 	{
-		return isset($_SERVER['REQUEST_METHOD']) && !strcasecmp($_SERVER['REQUEST_METHOD'], 'POST');
+		return $this->getRequestMethod() === 'POST';
 	}
 
 	/**

From 6166e70f201817c74cb4f5109ee7fb337196c40a Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sat, 4 May 2013 20:17:43 -0400
Subject: [PATCH 022/152] Fixes issue #80

---
 framework/db/Connection.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/db/Connection.php b/framework/db/Connection.php
index 797508a..f71b940 100644
--- a/framework/db/Connection.php
+++ b/framework/db/Connection.php
@@ -517,7 +517,7 @@ class Connection extends Component
 	public function quoteSql($sql)
 	{
 		$db = $this;
-		return preg_replace_callback('/(\\{\\{([\w\-\. ]+)\\}\\}|\\[\\[([\w\-\. ]+)\\]\\])/',
+		return preg_replace_callback('/(\\{\\{([%\w\-\. ]+)\\}\\}|\\[\\[([\w\-\. ]+)\\]\\])/',
 			function($matches) use($db) {
 				if (isset($matches[3])) {
 					return $db->quoteColumnName($matches[3]);

From 6e779e02d655a222157aeeb38112325ba0ae997c Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sat, 4 May 2013 21:24:00 -0400
Subject: [PATCH 023/152] Fixed issue #7: ArrayHelper::multisort is not
 compatible with PHP 5.3

---
 framework/helpers/base/ArrayHelper.php           | 40 +++++++++++++++---------
 tests/unit/framework/helpers/ArrayHelperTest.php | 11 ++++++-
 2 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/framework/helpers/base/ArrayHelper.php b/framework/helpers/base/ArrayHelper.php
index 9870542..8a9a38c 100644
--- a/framework/helpers/base/ArrayHelper.php
+++ b/framework/helpers/base/ArrayHelper.php
@@ -236,15 +236,17 @@ class ArrayHelper
 	 * To sort by multiple keys, provide an array of keys here.
 	 * @param boolean|array $ascending whether to sort in ascending or descending order. When
 	 * sorting by multiple keys with different ascending orders, use an array of ascending flags.
-	 * @param integer|array $sortFlag the PHP sort flag. Valid values include:
-	 * `SORT_REGULAR`, `SORT_NUMERIC`, `SORT_STRING`, and `SORT_STRING | SORT_FLAG_CASE`. The last
-	 * value is for sorting strings in case-insensitive manner. Please refer to
-	 * See [PHP manual](http://php.net/manual/en/function.sort.php) for more details.
-	 * When sorting by multiple keys with different sort flags, use an array of sort flags.
+	 * @param integer|array $sortFlag the PHP sort flag. Valid values include
+	 * `SORT_REGULAR`, `SORT_NUMERIC`, `SORT_STRING`, `SORT_LOCALE_STRING` and `SORT_NATURAL`.
+	 * and `SORT_STRING | SORT_FLAG_CASE`. Please refer to [PHP manual](http://php.net/manual/en/function.sort.php)
+	 * for more details. When sorting by multiple keys with different sort flags, use an array of sort flags.
+	 * @param boolean|array $caseSensitive whether to sort string in case-sensitive manner. This parameter
+	 * is used only when `$sortFlag` is either `SORT_STRING` or `SORT_NATURAL`.
+	 * When sorting by multiple keys with different case sensitivities, use an array of boolean values.
 	 * @throws InvalidParamException if the $ascending or $sortFlag parameters do not have
 	 * correct number of elements as that of $key.
 	 */
-	public static function multisort(&$array, $key, $ascending = true, $sortFlag = SORT_REGULAR)
+	public static function multisort(&$array, $key, $ascending = true, $sortFlag = SORT_REGULAR, $caseSensitive = true)
 	{
 		$keys = is_array($key) ? $key : array($key);
 		if (empty($keys) || empty($array)) {
@@ -259,20 +261,30 @@ class ArrayHelper
 		if (is_scalar($sortFlag)) {
 			$sortFlag = array_fill(0, $n, $sortFlag);
 		} elseif (count($sortFlag) !== $n) {
-			throw new InvalidParamException('The length of $ascending parameter must be the same as that of $keys.');
+			throw new InvalidParamException('The length of $sortFlag parameter must be the same as that of $keys.');
+		}
+		if (is_scalar($caseSensitive)) {
+			$caseSensitive = array_fill(0, $n, $caseSensitive);
+		} elseif (count($caseSensitive) !== $n) {
+			throw new InvalidParamException('The length of $caseSensitive parameter must be the same as that of $keys.');
 		}
 		$args = array();
 		foreach ($keys as $i => $key) {
 			$flag = $sortFlag[$i];
-			if ($flag == (SORT_STRING | SORT_FLAG_CASE)) {
-				$flag = SORT_STRING;
-				$column = array();
-				foreach (static::getColumn($array, $key) as $k => $value) {
-					$column[$k] = strtolower($value);
+			$cs = $caseSensitive[$i];
+			if (!$cs && ($flag === SORT_STRING || $flag === SORT_NATURAL)) {
+				if (defined('SORT_FLAG_CASE')) {
+					$flag = $flag | SORT_FLAG_CASE;
+					$args[] = static::getColumn($array, $key);
+				} else {
+					$column = array();
+					foreach (static::getColumn($array, $key) as $k => $value) {
+						$column[$k] = mb_strtolower($value);
+					}
+					$args[] = $column;
 				}
-				$args[] = $column;
 			} else {
-				$args[] = static::getColumn($array, $key);
+				$args[] =  static::getColumn($array, $key);
 			}
 			$args[] = $ascending[$i] ? SORT_ASC : SORT_DESC;
 			$args[] = $flag;
diff --git a/tests/unit/framework/helpers/ArrayHelperTest.php b/tests/unit/framework/helpers/ArrayHelperTest.php
index 187217f..b3ffabf 100644
--- a/tests/unit/framework/helpers/ArrayHelperTest.php
+++ b/tests/unit/framework/helpers/ArrayHelperTest.php
@@ -40,11 +40,20 @@ class ArrayHelperTest extends \yii\test\TestCase
 		$array = array(
 			array('name' => 'a', 'age' => 3),
 			array('name' => 'b', 'age' => 2),
+			array('name' => 'B', 'age' => 4),
 			array('name' => 'A', 'age' => 1),
 		);
-		ArrayHelper::multisort($array, array('name', 'age'), SORT_ASC, array(SORT_STRING|SORT_FLAG_CASE, SORT_REGULAR));
+
+		ArrayHelper::multisort($array, array('name', 'age'), SORT_ASC, array(SORT_STRING, SORT_REGULAR));
+		$this->assertEquals(array('name' => 'A', 'age' => 1), $array[0]);
+		$this->assertEquals(array('name' => 'B', 'age' => 4), $array[1]);
+		$this->assertEquals(array('name' => 'a', 'age' => 3), $array[2]);
+		$this->assertEquals(array('name' => 'b', 'age' => 2), $array[3]);
+
+		ArrayHelper::multisort($array, array('name', 'age'), SORT_ASC, array(SORT_STRING, SORT_REGULAR), false);
 		$this->assertEquals(array('name' => 'A', 'age' => 1), $array[0]);
 		$this->assertEquals(array('name' => 'a', 'age' => 3), $array[1]);
 		$this->assertEquals(array('name' => 'b', 'age' => 2), $array[2]);
+		$this->assertEquals(array('name' => 'B', 'age' => 4), $array[3]);
 	}
 }

From dc73c916fc4a864ac6c9f15b521931fb884360f2 Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Sun, 5 May 2013 09:39:43 +0700
Subject: [PATCH 024/152] Fix unsupported flag in php 5.3.x environment
 [ArrayHelper::multisort]

---
 framework/helpers/base/ArrayHelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/helpers/base/ArrayHelper.php b/framework/helpers/base/ArrayHelper.php
index 8a9a38c..5c94887 100644
--- a/framework/helpers/base/ArrayHelper.php
+++ b/framework/helpers/base/ArrayHelper.php
@@ -272,7 +272,7 @@ class ArrayHelper
 		foreach ($keys as $i => $key) {
 			$flag = $sortFlag[$i];
 			$cs = $caseSensitive[$i];
-			if (!$cs && ($flag === SORT_STRING || $flag === SORT_NATURAL)) {
+			if (!$cs && ($flag === SORT_STRING)) {
 				if (defined('SORT_FLAG_CASE')) {
 					$flag = $flag | SORT_FLAG_CASE;
 					$args[] = static::getColumn($array, $key);

From cfc958201fb32f089cc5bbec2f5ccdf75f44f7c1 Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Sun, 5 May 2013 10:00:59 +0700
Subject: [PATCH 025/152] Remove reference to php 5.4-only constants in
 arrayhelper

---
 framework/helpers/base/ArrayHelper.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/framework/helpers/base/ArrayHelper.php b/framework/helpers/base/ArrayHelper.php
index 5c94887..5f72fe4 100644
--- a/framework/helpers/base/ArrayHelper.php
+++ b/framework/helpers/base/ArrayHelper.php
@@ -237,11 +237,11 @@ class ArrayHelper
 	 * @param boolean|array $ascending whether to sort in ascending or descending order. When
 	 * sorting by multiple keys with different ascending orders, use an array of ascending flags.
 	 * @param integer|array $sortFlag the PHP sort flag. Valid values include
-	 * `SORT_REGULAR`, `SORT_NUMERIC`, `SORT_STRING`, `SORT_LOCALE_STRING` and `SORT_NATURAL`.
-	 * and `SORT_STRING | SORT_FLAG_CASE`. Please refer to [PHP manual](http://php.net/manual/en/function.sort.php)
+	 * `SORT_REGULAR`, `SORT_NUMERIC`, `SORT_STRING` and `SORT_LOCALE_STRING`.
+	 * Please refer to [PHP manual](http://php.net/manual/en/function.sort.php)
 	 * for more details. When sorting by multiple keys with different sort flags, use an array of sort flags.
 	 * @param boolean|array $caseSensitive whether to sort string in case-sensitive manner. This parameter
-	 * is used only when `$sortFlag` is either `SORT_STRING` or `SORT_NATURAL`.
+	 * is used only when `$sortFlag` is `SORT_STRING`.
 	 * When sorting by multiple keys with different case sensitivities, use an array of boolean values.
 	 * @throws InvalidParamException if the $ascending or $sortFlag parameters do not have
 	 * correct number of elements as that of $key.

From 3ed7b62233ffdf5eb1905067c7e10ab3f1c15744 Mon Sep 17 00:00:00 2001
From: FrediL <inferi.gladius@gmail.com>
Date: Sun, 5 May 2013 06:36:48 +0300
Subject: [PATCH 026/152] Use Html::getInputName instead
 ActiveForm::getInputName

---
 framework/web/UploadedFile.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/framework/web/UploadedFile.php b/framework/web/UploadedFile.php
index c67281c..6e685a3 100644
--- a/framework/web/UploadedFile.php
+++ b/framework/web/UploadedFile.php
@@ -7,7 +7,7 @@
 
 namespace yii\web;
 
-use yii\widgets\ActiveForm;
+use yii\widgets\Html;
 
 /**
  * @author Qiang Xue <qiang.xue@gmail.com>
@@ -66,7 +66,7 @@ class UploadedFile extends \yii\base\Object
 	 */
 	public static function getInstance($model, $attribute)
 	{
-		$name = ActiveForm::getInputName($model, $attribute);
+		$name = Html::getInputName($model, $attribute);
 		return static::getInstanceByName($name);
 	}
 
@@ -80,7 +80,7 @@ class UploadedFile extends \yii\base\Object
 	 */
 	public static function getInstances($model, $attribute)
 	{
-		$name = ActiveForm::getInputName($model, $attribute);
+		$name = Html::getInputName($model, $attribute);
 		return static::getInstancesByName($name);
 	}
 

From 64217b855fc411727ac71c341fedac6cf49efa41 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sun, 5 May 2013 12:08:59 +0400
Subject: [PATCH 027/152] migration docs

---
 docs/guide/migration.md | 316 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 316 insertions(+)

diff --git a/docs/guide/migration.md b/docs/guide/migration.md
index 0fe2fb3..bafd293 100644
--- a/docs/guide/migration.md
+++ b/docs/guide/migration.md
@@ -1,3 +1,319 @@
 Database Migration
 ==================
 
+Like source code, the structure of a database is evolving as we develop and maintain
+a database-driven application. For example, during development, we may want to
+add a new table; or after the application is put into production, we may realize
+the need of adding an index on a column. It is important to keep track of these
+structural database changes (called **migration**) like we do with our source
+code. If the source code and the database are out of sync, it is very likely
+the whole system may break. For this reason, Yii provides a database migration
+tool that can keep track of database migration history, apply new migrations,
+or revert existing ones.
+
+The following steps show how we can use database migration during development:
+
+1. Tim creates a new migration (e.g. create a new table)
+2. Tim commits the new migration into source control system (e.g. GIT, Mercurial)
+3. Doug updates from source control system and receives the new migration
+4. Doug applies the migration to his local development database
+
+
+Yii supports database migration via the `yiic migrate` command line tool. This
+tool supports creating new migrations, applying/reverting/redoing migrations, and
+showing migration history and new migrations.
+
+Creating Migrations
+-------------------
+
+To create a new migration (e.g. create a news table), we run the following command:
+
+~~~
+yiic migrate/create <name>
+~~~
+
+The required `name` parameter specifies a very brief description of the migration
+(e.g. `create_news_table`). As we will show in the following, the `name` parameter
+is used as part of a PHP class name. Therefore, it should only contain letters,
+digits and/or underscore characters.
+
+~~~
+yiic migrate/create create_news_table
+~~~
+
+The above command will create under the `protected/migrations` directory a new
+file named `m101129_185401_create_news_table.php` which contains the following
+initial code:
+
+~~~
+[php]
+class m101129_185401_create_news_table extends \yii\db\Migration
+{
+	public function up()
+	{
+	}
+
+	public function down()
+	{
+		echo "m101129_185401_create_news_table cannot be reverted.\n";
+		return false;
+	}
+}
+~~~
+
+Notice that the class name is the same as the file name which is of the pattern
+`m<timestamp>_<name>`, where `<timestamp>` refers to the UTC timestamp (in the
+format of `yymmdd_hhmmss`) when the migration is created, and `<name>` is taken
+from the command's `name` parameter.
+
+The `up()` method should contain the code implementing the actual database
+migration, while the `down()` method may contain the code reverting what is
+done in `up()`.
+
+Sometimes, it is impossible to implement `down()`. For example, if we delete
+table rows in `up()`, we will not be able to recover them in `down()`. In this
+case, the migration is called irreversible, meaning we cannot roll back to
+a previous state of the database. In the above generated code, the `down()`
+method returns `false` to indicate that the migration cannot be reverted.
+
+As an example, let's show the migration about creating a news table.
+
+~~~
+[php]
+class m101129_185401_create_news_table extends \yii\db\Migration
+{
+	public function up()
+	{
+		$this->db->createCommand()->createTable('tbl_news, array(
+			'id' => 'pk',
+			'title' => 'string NOT NULL',
+			'content' => 'text',
+		))->execute();
+	}
+
+	public function down()
+	{
+		$this->db->createCommand()->dropTable('tbl_news')->execute();
+	}
+}
+~~~
+
+The base class [\yii\db\Migration] exposes a database connection via `db`
+property. You can use it for manipulating data and schema of a database.
+
+Transactional Migrations
+------------------------
+
+While performing complex DB migrations, we usually want to make sure that each
+migration succeed or fail as a whole so that the database maintains the
+consistency and integrity. In order to achieve this goal, we can exploit
+DB transactions.
+
+We could explicitly start a DB transaction and enclose the rest of the DB-related
+code within the transaction, like the following:
+
+~~~
+[php]
+class m101129_185401_create_news_table extends \yii\db\Migration
+{
+	public function up()
+	{
+		$transaction=$this->getDbConnection()->beginTransaction();
+		try
+		{
+			$this->db->createCommand()->createTable('tbl_news, array(
+				'id' => 'pk',
+				'title' => 'string NOT NULL',
+				'content' => 'text',
+			))->execute();
+			$transaction->commit();
+		}
+		catch(Exception $e)
+		{
+			echo "Exception: ".$e->getMessage()."\n";
+			$transaction->rollback();
+			return false;
+		}
+	}
+
+	// ...similar code for down()
+}
+~~~
+
+> Note: Not all DBMS support transactions. And some DB queries cannot be put
+> into a transaction. In this case, you will have to implement `up()` and
+> `down()`, instead. And for MySQL, some SQL statements may cause
+> [implicit commit](http://dev.mysql.com/doc/refman/5.1/en/implicit-commit.html).
+
+
+Applying Migrations
+-------------------
+
+To apply all available new migrations (i.e., make the local database up-to-date),
+run the following command:
+
+~~~
+yiic migrate
+~~~
+
+The command will show the list of all new migrations. If you confirm to apply
+the migrations, it will run the `up()` method in every new migration class, one
+after another, in the order of the timestamp value in the class name.
+
+After applying a migration, the migration tool will keep a record in a database
+table named `tbl_migration`. This allows the tool to identify which migrations
+have been applied and which are not. If the `tbl_migration` table does not exist,
+the tool will automatically create it in the database specified by the `db`
+application component.
+
+Sometimes, we may only want to apply one or a few new migrations. We can use the
+following command:
+
+~~~
+yiic migrate/up 3
+~~~
+
+This command will apply the 3 new migrations. Changing the value 3 will allow
+us to change the number of migrations to be applied.
+
+We can also migrate the database to a specific version with the following command:
+
+~~~
+yiic migrate/to 101129_185401
+~~~
+
+That is, we use the timestamp part of a migration name to specify the version
+that we want to migrate the database to. If there are multiple migrations between
+the last applied migration and the specified migration, all these migrations
+will be applied. If the specified migration has been applied before, then all
+migrations applied after it will be reverted (to be described in the next section).
+
+
+Reverting Migrations
+--------------------
+
+To revert the last one or several applied migrations, we can use the following
+command:
+
+~~~
+yiic migrate/down [step]
+~~~
+
+where the optional `step` parameter specifies how many migrations to be reverted
+back. It defaults to 1, meaning reverting back the last applied migration.
+
+As we described before, not all migrations can be reverted. Trying to revert
+such migrations will throw an exception and stop the whole reverting process.
+
+
+Redoing Migrations
+------------------
+
+Redoing migrations means first reverting and then applying the specified migrations.
+This can be done with the following command:
+
+~~~
+yiic migrate/redo [step]
+~~~
+
+where the optional `step` parameter specifies how many migrations to be redone.
+It defaults to 1, meaning redoing the last migration.
+
+
+Showing Migration Information
+-----------------------------
+
+Besides applying and reverting migrations, the migration tool can also display
+the migration history and the new migrations to be applied.
+
+~~~
+yiic migrate/history [limit]
+yiic migrate/new [limit]
+~~~
+
+where the optional parameter `limit` specifies the number of migrations to be
+displayed. If `limit` is not specified, all available migrations will be displayed.
+
+The first command shows the migrations that have been applied, while the second
+command shows the migrations that have not been applied.
+
+
+Modifying Migration History
+---------------------------
+
+Sometimes, we may want to modify the migration history to a specific migration
+version without actually applying or reverting the relevant migrations. This
+often happens when developing a new migration. We can use the following command
+to achieve this goal.
+
+~~~
+yiic migrate/mark 101129_185401
+~~~
+
+This command is very similar to `yiic migrate/to` command, except that it only
+modifies the migration history table to the specified version without applying
+or reverting the migrations.
+
+
+Customizing Migration Command
+-----------------------------
+
+There are several ways to customize the migration command.
+
+### Use Command Line Options
+
+The migration command comes with four options that can be specified in command
+line:
+
+* `interactive`: boolean, specifies whether to perform migrations in an
+  interactive mode. Defaults to true, meaning the user will be prompted when
+  performing a specific migration. You may set this to false should the
+  migrations be done in a background process.
+
+* `migrationPath`: string, specifies the directory storing all migration class
+  files. This must be specified in terms of a path alias, and the corresponding
+  directory must exist. If not specified, it will use the `migrations`
+  sub-directory under the application base path.
+
+* `migrationTable`: string, specifies the name of the database table for storing
+  migration history information. It defaults to `tbl_migration`. The table
+  structure is `version varchar(255) primary key, apply_time integer`.
+
+* `connectionID`: string, specifies the ID of the database application component.
+  Defaults to 'db'.
+
+* `templateFile`: string, specifies the path of the file to be served as the code
+  template for generating the migration classes. This must be specified in terms
+  of a path alias (e.g. `application.migrations.template`). If not set, an
+  internal template will be used. Inside the template, the token `{ClassName}`
+  will be replaced with the actual migration class name.
+
+To specify these options, execute the migrate command using the following format
+
+~~~
+yiic migrate/up --option1=value1 --option2=value2 ...
+~~~
+
+For example, if we want to migrate for a `forum` module whose migration files
+are located within the module's `migrations` directory, we can use the following
+command:
+
+~~~
+yiic migrate/up --migrationPath=ext.forum.migrations
+~~~
+
+
+### Configure Command Globally
+
+While command line options allow us to configure the migration command
+on-the-fly, sometimes we may want to configure the command once for all.
+For example, we may want to use a different table to store the migration history,
+or we may want to use a customized migration template. We can do so by modifying
+the console application's configuration file like the following,
+
+```php
+TBD
+```
+
+Now if we run the `migrate` command, the above configurations will take effect
+without requiring us to enter the command line options every time.

From aa3fe610a8c9f1cb53f2442ee7f35eddd1564511 Mon Sep 17 00:00:00 2001
From: Vladimir Vyachin <vladimir@vyachin.net>
Date: Sun, 5 May 2013 17:03:54 +0400
Subject: [PATCH 028/152] Fix log messages collection

---
 framework/logging/Target.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/logging/Target.php b/framework/logging/Target.php
index e76e8ac..311334d 100644
--- a/framework/logging/Target.php
+++ b/framework/logging/Target.php
@@ -89,7 +89,7 @@ abstract class Target extends \yii\base\Component
 	 */
 	public function collect($messages, $final)
 	{
-		$this->_messages = array($this->_messages, $this->filterMessages($messages));
+		$this->_messages = array_merge($this->_messages, $this->filterMessages($messages));
 		$count = count($this->_messages);
 		if ($count > 0 && ($final || $this->exportInterval > 0 && $count >= $this->exportInterval)) {
 			if (($context = $this->getContextMessage()) !== '') {

From af72a948f6f965f4a4623e34f347abeb19da4db4 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sun, 5 May 2013 09:07:51 -0400
Subject: [PATCH 029/152] Fixes issue #107: UrlManager::showScriptName default
 to false.

---
 framework/web/UrlManager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/web/UrlManager.php b/framework/web/UrlManager.php
index 318f329..329bf07 100644
--- a/framework/web/UrlManager.php
+++ b/framework/web/UrlManager.php
@@ -51,7 +51,7 @@ class UrlManager extends Component
 	 * @var boolean whether to show entry script name in the constructed URL. Defaults to true.
 	 * This property is used only if [[enablePrettyUrl]] is true.
 	 */
-	public $showScriptName = true;
+	public $showScriptName = false;
 	/**
 	 * @var string the GET variable name for route. This property is used only if [[enablePrettyUrl]] is false.
 	 */

From c9895eff82d59695eeba6d9083c56c954a915a51 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sun, 5 May 2013 10:06:40 -0400
Subject: [PATCH 030/152] Fixes issue #110.

---
 framework/base/View.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/base/View.php b/framework/base/View.php
index a72982e..115bfad 100644
--- a/framework/base/View.php
+++ b/framework/base/View.php
@@ -744,10 +744,10 @@ class View extends Component
 	{
 		$lines = array();
 		if (!empty($this->metaTags)) {
-			$lines[] = implode("\n", $this->cssFiles);
+			$lines[] = implode("\n", $this->metaTags);
 		}
 		if (!empty($this->linkTags)) {
-			$lines[] = implode("\n", $this->cssFiles);
+			$lines[] = implode("\n", $this->linkTags);
 		}
 		if (!empty($this->cssFiles)) {
 			$lines[] = implode("\n", $this->cssFiles);

From c91a0f4b26ac14d75b98845eec7575a3d3b0eb57 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sun, 5 May 2013 10:14:55 -0400
Subject: [PATCH 031/152] Fixes issue #105: route var appears twice in the
 created URL

---
 framework/web/UrlManager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/web/UrlManager.php b/framework/web/UrlManager.php
index 329bf07..a300033 100644
--- a/framework/web/UrlManager.php
+++ b/framework/web/UrlManager.php
@@ -174,7 +174,7 @@ class UrlManager extends Component
 	public function createUrl($route, $params = array())
 	{
 		$anchor = isset($params['#']) ? '#' . $params['#'] : '';
-		unset($params['#']);
+		unset($params['#'], $params[$this->routeVar]);
 
 		$route = trim($route, '/');
 		$baseUrl = $this->getBaseUrl();

From b6cee8af881305557a3657893ec7c0db406055d7 Mon Sep 17 00:00:00 2001
From: Vladimir Vyachin <vladimir@vyachin.net>
Date: Sun, 5 May 2013 18:21:10 +0400
Subject: [PATCH 032/152] fix assetconverter file extensions change only first
 time

---
 framework/web/AssetConverter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/web/AssetConverter.php b/framework/web/AssetConverter.php
index 8340be5..f2871fe 100644
--- a/framework/web/AssetConverter.php
+++ b/framework/web/AssetConverter.php
@@ -53,8 +53,8 @@ class AssetConverter extends Component implements IAssetConverter
 					));
 					exec($command, $output);
 					Yii::info("Converted $asset into $result: " . implode("\n", $output), __METHOD__);
-					return "$baseUrl/$result";
 				}
+				return "$baseUrl/$result";
 			}
 		}
 		return "$baseUrl/$asset";

From 3c83b8ed7cb0442fc88e66a63d9764d4d31b2bcf Mon Sep 17 00:00:00 2001
From: Rasmus Lerdorf <rasmus@php.net>
Date: Sun, 5 May 2013 07:31:09 -0700
Subject: [PATCH 033/152] Fix typos

A couple of obvious typos here
---
 framework/validators/FileValidator.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/framework/validators/FileValidator.php b/framework/validators/FileValidator.php
index 0fddcf5..ebe6cad 100644
--- a/framework/validators/FileValidator.php
+++ b/framework/validators/FileValidator.php
@@ -192,11 +192,11 @@ class FileValidator extends Validator
 				break;
 			case UPLOAD_ERR_CANT_WRITE:
 				$this->addError($object, $attribute, $this->message);
-				Yii::warning('Failed to write the uploaded file to disk: ', $file->getName(), __METHOD__);
+				Yii::warning('Failed to write the uploaded file to disk: ' . $file->getName(), __METHOD__);
 				break;
 			case UPLOAD_ERR_EXTENSION:
 				$this->addError($object, $attribute, $this->message);
-				Yii::warning('File upload was stopped by some PHP extension: ', $file->getName(), __METHOD__);
+				Yii::warning('File upload was stopped by some PHP extension: ' . $file->getName(), __METHOD__);
 				break;
 			default:
 				break;
@@ -248,4 +248,4 @@ class FileValidator extends Validator
 				return (int)$sizeStr;
 		}
 	}
-}
\ No newline at end of file
+}

From 7f5cbce69cc702633691836a20ecb7f44589e847 Mon Sep 17 00:00:00 2001
From: Vladimir Vyachin <vladimir@vyachin.net>
Date: Sun, 5 May 2013 18:46:54 +0400
Subject: [PATCH 034/152] fix SecurityHelper description

---
 framework/helpers/base/SecurityHelper.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/helpers/base/SecurityHelper.php b/framework/helpers/base/SecurityHelper.php
index ed5bfd6..d220bf4 100644
--- a/framework/helpers/base/SecurityHelper.php
+++ b/framework/helpers/base/SecurityHelper.php
@@ -167,11 +167,11 @@ class SecurityHelper
 	 *
 	 * ~~~
 	 * // generates the hash (usually done during user registration or when the password is changed)
-	 * $hash = SecurityHelper::hashPassword($password);
+	 * $hash = SecurityHelper::generatePasswordHash($password);
 	 * // ...save $hash in database...
 	 *
 	 * // during login, validate if the password entered is correct using $hash fetched from database
-	 * if (PasswordHelper::verifyPassword($password, $hash) {
+	 * if (SecurityHelper::verifyPassword($password, $hash) {
 	 *     // password is good
 	 * } else {
 	 *     // password is bad

From 802c0c94a81d89ea3409dc62ef08a3ec7967fd44 Mon Sep 17 00:00:00 2001
From: Rinat Silnov <mail@rinat.io>
Date: Sun, 5 May 2013 19:18:04 +0400
Subject: [PATCH 035/152] Check apc.enable_cli for ApcTestCase unit tests

---
 tests/unit/framework/caching/ApcCacheTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/unit/framework/caching/ApcCacheTest.php b/tests/unit/framework/caching/ApcCacheTest.php
index 74ede2a..604efde 100644
--- a/tests/unit/framework/caching/ApcCacheTest.php
+++ b/tests/unit/framework/caching/ApcCacheTest.php
@@ -17,6 +17,8 @@ class ApcCacheTest extends CacheTest
 	{
 		if(!extension_loaded("apc")) {
 			$this->markTestSkipped("APC not installed. Skipping.");
+		} else if ('cli' === PHP_SAPI && !ini_get('apc.enable_cli')) {
+			$this->markTestSkipped("APC cli is not enabled. Skipping.");
 		}
 
 		if($this->_cacheInstance === null) {

From 47c643fbff9ebfc28a5760789c719278a8ccfc2d Mon Sep 17 00:00:00 2001
From: Rinat Silnov <mail@rinat.io>
Date: Sun, 5 May 2013 19:25:36 +0400
Subject: [PATCH 036/152] Call static::dumpAsString in VarDumper::dump

This way we can extend VarDumper::dumpAsString
---
 framework/helpers/base/VarDumper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/helpers/base/VarDumper.php b/framework/helpers/base/VarDumper.php
index 43b0cd8..5268568 100644
--- a/framework/helpers/base/VarDumper.php
+++ b/framework/helpers/base/VarDumper.php
@@ -39,7 +39,7 @@ class VarDumper
 	 */
 	public static function dump($var, $depth = 10, $highlight = false)
 	{
-		echo self::dumpAsString($var, $depth, $highlight);
+		echo static::dumpAsString($var, $depth, $highlight);
 	}
 
 	/**

From 4be9e195c2d572c318a0e68c90765b0ceb823fd0 Mon Sep 17 00:00:00 2001
From: Zander Baldwin <mynameiszanders@gmail.com>
Date: Sun, 5 May 2013 17:04:55 +0100
Subject: [PATCH 037/152] Add Newlines

Appended newlines to every PHP document that did not have a newline as the last character in the file.
---
 app/protected/config/assets.php                                         | 2 +-
 app/protected/config/main.php                                           | 2 +-
 app/protected/controllers/SiteController.php                            | 2 +-
 app/protected/models/ContactForm.php                                    | 2 +-
 app/protected/models/LoginForm.php                                      | 2 +-
 app/protected/models/User.php                                           | 2 +-
 app/protected/views/layouts/main.php                                    | 2 +-
 app/protected/views/site/contact.php                                    | 2 +-
 app/protected/views/site/login.php                                      | 2 +-
 framework/assets.php                                                    | 2 +-
 framework/base/ActionFilter.php                                         | 2 +-
 framework/base/Exception.php                                            | 2 +-
 framework/base/View.php                                                 | 2 +-
 framework/base/ViewEvent.php                                            | 2 +-
 framework/base/Widget.php                                               | 2 +-
 framework/caching/Cache.php                                             | 2 +-
 framework/caching/Dependency.php                                        | 2 +-
 framework/caching/MemCacheServer.php                                    | 2 +-
 framework/caching/WinCache.php                                          | 2 +-
 framework/console/Controller.php                                        | 2 +-
 framework/console/controllers/AppController.php                         | 2 +-
 framework/console/controllers/AssetController.php                       | 2 +-
 framework/console/controllers/HelpController.php                        | 2 +-
 framework/console/webapp/config.php                                     | 2 +-
 framework/console/webapp/default/index.php                              | 2 +-
 framework/console/webapp/default/protected/config/main.php              | 2 +-
 .../console/webapp/default/protected/controllers/SiteController.php     | 2 +-
 framework/console/webapp/default/protected/views/layouts/main.php       | 2 +-
 framework/console/webapp/default/protected/views/site/index.php         | 2 +-
 framework/db/Exception.php                                              | 2 +-
 framework/db/Expression.php                                             | 2 +-
 framework/db/Migration.php                                              | 2 +-
 framework/db/StaleObjectException.php                                   | 2 +-
 framework/helpers/ArrayHelper.php                                       | 2 +-
 framework/helpers/FileHelper.php                                        | 2 +-
 framework/helpers/JsExpression.php                                      | 2 +-
 framework/helpers/Json.php                                              | 2 +-
 framework/helpers/SecurityHelper.php                                    | 2 +-
 framework/helpers/VarDumper.php                                         | 2 +-
 framework/helpers/base/ArrayHelper.php                                  | 2 +-
 framework/helpers/base/FileHelper.php                                   | 2 +-
 framework/helpers/base/Json.php                                         | 2 +-
 framework/helpers/base/VarDumper.php                                    | 2 +-
 framework/i18n/PhpMessageSource.php                                     | 2 +-
 framework/i18n/data/plurals.php                                         | 2 +-
 framework/logging/EmailTarget.php                                       | 2 +-
 framework/logging/ProfileTarget.php                                     | 2 +-
 framework/logging/WebTarget.php                                         | 2 +-
 framework/renderers/SmartyViewRenderer.php                              | 2 +-
 framework/validators/InlineValidator.php                                | 2 +-
 framework/validators/NumberValidator.php                                | 2 +-
 framework/validators/UniqueValidator.php                                | 2 +-
 framework/views/error.php                                               | 2 +-
 framework/web/AccessControl.php                                         | 2 +-
 framework/web/AccessRule.php                                            | 2 +-
 framework/web/AssetBundle.php                                           | 2 +-
 framework/web/AssetConverter.php                                        | 2 +-
 framework/web/Controller.php                                            | 2 +-
 framework/web/HttpCache.php                                             | 2 +-
 framework/web/IAssetConverter.php                                       | 2 +-
 framework/web/Identity.php                                              | 2 +-
 framework/web/PageCache.php                                             | 2 +-
 framework/web/Pagination.php                                            | 2 +-
 framework/web/Sort.php                                                  | 2 +-
 framework/web/UserEvent.php                                             | 2 +-
 framework/widgets/ActiveField.php                                       | 2 +-
 framework/widgets/Block.php                                             | 2 +-
 framework/widgets/FragmentCache.php                                     | 2 +-
 tests/unit/MysqlTestCase.php                                            | 2 +-
 tests/unit/TestCase.php                                                 | 2 +-
 tests/unit/data/ar/ActiveRecord.php                                     | 2 +-
 tests/unit/data/ar/Customer.php                                         | 2 +-
 tests/unit/data/ar/Item.php                                             | 2 +-
 tests/unit/data/ar/Order.php                                            | 2 +-
 tests/unit/data/ar/OrderItem.php                                        | 2 +-
 tests/unit/data/base/Singer.php                                         | 2 +-
 tests/unit/framework/base/ComponentTest.php                             | 2 +-
 tests/unit/framework/base/ObjectTest.php                                | 2 +-
 tests/unit/framework/caching/ApcCacheTest.php                           | 2 +-
 tests/unit/framework/caching/DbCacheTest.php                            | 2 +-
 tests/unit/framework/caching/FileCacheTest.php                          | 2 +-
 tests/unit/framework/caching/MemCacheTest.php                           | 2 +-
 tests/unit/framework/caching/MemCachedTest.php                          | 2 +-
 tests/unit/framework/caching/WinCacheTest.php                           | 2 +-
 tests/unit/framework/caching/XCacheTest.php                             | 2 +-
 tests/unit/framework/caching/ZendDataCacheTest.php                      | 2 +-
 tests/unit/framework/db/ActiveRecordTest.php                            | 2 +-
 tests/unit/framework/db/CommandTest.php                                 | 2 +-
 tests/unit/framework/db/QueryTest.php                                   | 2 +-
 tests/unit/framework/helpers/JsonTest.php                               | 2 +-
 tests/unit/framework/helpers/StringHelperTest.php                       | 2 +-
 tests/unit/framework/helpers/VarDumperTest.php                          | 2 +-
 tests/unit/framework/validators/EmailValidatorTest.php                  | 2 +-
 tests/web/app/protected/config/main.php                                 | 2 +-
 tests/web/app/protected/controllers/SiteController.php                  | 2 +-
 tests/web/app/protected/views/site/index.php                            | 2 +-
 96 files changed, 96 insertions(+), 96 deletions(-)

diff --git a/app/protected/config/assets.php b/app/protected/config/assets.php
index 6602a6e..a3ba847 100644
--- a/app/protected/config/assets.php
+++ b/app/protected/config/assets.php
@@ -16,4 +16,4 @@ return array(
 			'yii',
 		),
 	),
-);
\ No newline at end of file
+);
diff --git a/app/protected/config/main.php b/app/protected/config/main.php
index b982506..96e0986 100644
--- a/app/protected/config/main.php
+++ b/app/protected/config/main.php
@@ -18,4 +18,4 @@ return array(
 	'params' => array(
 		'adminEmail' => 'admin@example.com',
 	),
-);
\ No newline at end of file
+);
diff --git a/app/protected/controllers/SiteController.php b/app/protected/controllers/SiteController.php
index 7e6bb15..d1186f6 100644
--- a/app/protected/controllers/SiteController.php
+++ b/app/protected/controllers/SiteController.php
@@ -46,4 +46,4 @@ class SiteController extends Controller
 	{
 		echo $this->render('about');
 	}
-}
\ No newline at end of file
+}
diff --git a/app/protected/models/ContactForm.php b/app/protected/models/ContactForm.php
index 8e8f831..5124b2c 100644
--- a/app/protected/models/ContactForm.php
+++ b/app/protected/models/ContactForm.php
@@ -60,4 +60,4 @@ class ContactForm extends Model
 			return false;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/app/protected/models/LoginForm.php b/app/protected/models/LoginForm.php
index 23e8c92..5ba1dc6 100644
--- a/app/protected/models/LoginForm.php
+++ b/app/protected/models/LoginForm.php
@@ -55,4 +55,4 @@ class LoginForm extends Model
 			return false;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/app/protected/models/User.php b/app/protected/models/User.php
index fcbf14a..afbf9f8 100644
--- a/app/protected/models/User.php
+++ b/app/protected/models/User.php
@@ -58,4 +58,4 @@ class User extends \yii\base\Object implements \yii\web\Identity
 	{
 		return $this->password === $password;
 	}
-}
\ No newline at end of file
+}
diff --git a/app/protected/views/layouts/main.php b/app/protected/views/layouts/main.php
index a455f20..8fb915a 100644
--- a/app/protected/views/layouts/main.php
+++ b/app/protected/views/layouts/main.php
@@ -54,4 +54,4 @@ $this->registerAssetBundle('app');
 </div>
 </body>
 </html>
-<?php $this->endPage(); ?>
\ No newline at end of file
+<?php $this->endPage(); ?>
diff --git a/app/protected/views/site/contact.php b/app/protected/views/site/contact.php
index 246570d..4ca40f1 100644
--- a/app/protected/views/site/contact.php
+++ b/app/protected/views/site/contact.php
@@ -30,4 +30,4 @@ $this->title = 'Contact';
 	<div class="form-actions">
 		<?php echo Html::submitButton('Submit', null, null, array('class' => 'btn btn-primary')); ?>
 	</div>
-<?php $this->endWidget(); ?>
\ No newline at end of file
+<?php $this->endWidget(); ?>
diff --git a/app/protected/views/site/login.php b/app/protected/views/site/login.php
index 5608ffb..8672eeb 100644
--- a/app/protected/views/site/login.php
+++ b/app/protected/views/site/login.php
@@ -18,4 +18,4 @@ $this->title = 'Login';
 	<div class="form-actions">
 		<?php echo Html::submitButton('Login', null, null, array('class' => 'btn btn-primary')); ?>
 	</div>
-<?php $this->endWidget(); ?>
\ No newline at end of file
+<?php $this->endWidget(); ?>
diff --git a/framework/assets.php b/framework/assets.php
index 5cea992..919011b 100644
--- a/framework/assets.php
+++ b/framework/assets.php
@@ -28,4 +28,4 @@ return array(
 		),
 		'depends' => array('yii', 'yii/validation'),
 	),
-);
\ No newline at end of file
+);
diff --git a/framework/base/ActionFilter.php b/framework/base/ActionFilter.php
index 1f82e5d..d69c0fe 100644
--- a/framework/base/ActionFilter.php
+++ b/framework/base/ActionFilter.php
@@ -87,4 +87,4 @@ class ActionFilter extends Behavior
 	{
 		return !in_array($action->id, $this->except, true) && (empty($this->only) || in_array($action->id, $this->only, true));
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/base/Exception.php b/framework/base/Exception.php
index 9ee698b..7d26bd0 100644
--- a/framework/base/Exception.php
+++ b/framework/base/Exception.php
@@ -22,4 +22,4 @@ class Exception extends \Exception
 	{
 		return \Yii::t('yii|Exception');
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/base/View.php b/framework/base/View.php
index 115bfad..4718d90 100644
--- a/framework/base/View.php
+++ b/framework/base/View.php
@@ -797,4 +797,4 @@ class View extends Component
 		}
 		return implode("\n", $lines);
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/base/ViewEvent.php b/framework/base/ViewEvent.php
index cac7be4..f1ee7b9 100644
--- a/framework/base/ViewEvent.php
+++ b/framework/base/ViewEvent.php
@@ -41,4 +41,4 @@ class ViewEvent extends Event
 		$this->viewFile = $viewFile;
 		parent::__construct($config);
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/base/Widget.php b/framework/base/Widget.php
index 1aabd4f..c0c524f 100644
--- a/framework/base/Widget.php
+++ b/framework/base/Widget.php
@@ -134,4 +134,4 @@ class Widget extends Component
 
 		return pathinfo($file, PATHINFO_EXTENSION) === '' ? $file . '.php' : $file;
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/caching/Cache.php b/framework/caching/Cache.php
index fb56d5e..78f2854 100644
--- a/framework/caching/Cache.php
+++ b/framework/caching/Cache.php
@@ -349,4 +349,4 @@ abstract class Cache extends Component implements \ArrayAccess
 	{
 		$this->delete($key);
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/caching/Dependency.php b/framework/caching/Dependency.php
index feb8c07..d1428fc 100644
--- a/framework/caching/Dependency.php
+++ b/framework/caching/Dependency.php
@@ -49,4 +49,4 @@ abstract class Dependency extends \yii\base\Object
 	 * @return mixed the data needed to determine if dependency has been changed.
 	 */
 	abstract protected function generateDependencyData();
-}
\ No newline at end of file
+}
diff --git a/framework/caching/MemCacheServer.php b/framework/caching/MemCacheServer.php
index 105137e..dc0de08 100644
--- a/framework/caching/MemCacheServer.php
+++ b/framework/caching/MemCacheServer.php
@@ -46,4 +46,4 @@ class MemCacheServer extends \yii\base\Object
 	 * @var boolean if the server should be flagged as online upon a failure. This is used by memcache only.
 	 */
 	public $status = true;
-}
\ No newline at end of file
+}
diff --git a/framework/caching/WinCache.php b/framework/caching/WinCache.php
index ee6b4a9..4e07c7f 100644
--- a/framework/caching/WinCache.php
+++ b/framework/caching/WinCache.php
@@ -89,4 +89,4 @@ class WinCache extends Cache
 	{
 		return wincache_ucache_clear();
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/console/Controller.php b/framework/console/Controller.php
index c7c5642..2eaf4b8 100644
--- a/framework/console/Controller.php
+++ b/framework/console/Controller.php
@@ -147,4 +147,4 @@ class Controller extends \yii\base\Controller
 	{
 		return array();
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/console/controllers/AppController.php b/framework/console/controllers/AppController.php
index a47acfe..17f7420 100644
--- a/framework/console/controllers/AppController.php
+++ b/framework/console/controllers/AppController.php
@@ -321,4 +321,4 @@ class AppController extends Controller
 		closedir($handle);
 		return $list;
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/console/controllers/AssetController.php b/framework/console/controllers/AssetController.php
index 71a2cae..aab489b 100644
--- a/framework/console/controllers/AssetController.php
+++ b/framework/console/controllers/AssetController.php
@@ -350,4 +350,4 @@ return array(
 EOD;
 		file_put_contents($configFile, $template);
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/console/controllers/HelpController.php b/framework/console/controllers/HelpController.php
index 74c354b..82bd6fe 100644
--- a/framework/console/controllers/HelpController.php
+++ b/framework/console/controllers/HelpController.php
@@ -418,4 +418,4 @@ class HelpController extends Controller
 		$name = $required ? "$name (required)" : $name;
 		return $doc === '' ? $name : "$name: $doc";
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/console/webapp/config.php b/framework/console/webapp/config.php
index 112fb18..47ddcc1 100644
--- a/framework/console/webapp/config.php
+++ b/framework/console/webapp/config.php
@@ -14,4 +14,4 @@ return array(
 			'permissions' => 0755,
 		),
 	),
-);
\ No newline at end of file
+);
diff --git a/framework/console/webapp/default/index.php b/framework/console/webapp/default/index.php
index b84e257..2aa3580 100644
--- a/framework/console/webapp/default/index.php
+++ b/framework/console/webapp/default/index.php
@@ -7,4 +7,4 @@ $config = require dirname(__DIR__).'/protected/config/main.php';
 $config['basePath'] = dirname(__DIR__).'/protected';
 
 $app = new \yii\web\Application($config);
-$app->run();
\ No newline at end of file
+$app->run();
diff --git a/framework/console/webapp/default/protected/config/main.php b/framework/console/webapp/default/protected/config/main.php
index 795811e..5817783 100644
--- a/framework/console/webapp/default/protected/config/main.php
+++ b/framework/console/webapp/default/protected/config/main.php
@@ -17,4 +17,4 @@ return array(
 			'class' => 'yii\caching\DummyCache',
 		),
 	),
-);
\ No newline at end of file
+);
diff --git a/framework/console/webapp/default/protected/controllers/SiteController.php b/framework/console/webapp/default/protected/controllers/SiteController.php
index b47b93c..ac8c1dd 100644
--- a/framework/console/webapp/default/protected/controllers/SiteController.php
+++ b/framework/console/webapp/default/protected/controllers/SiteController.php
@@ -12,4 +12,4 @@ class SiteController extends Controller
 			'name' => 'Qiang',
 		));
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/console/webapp/default/protected/views/layouts/main.php b/framework/console/webapp/default/protected/views/layouts/main.php
index 5c883e6..9837038 100644
--- a/framework/console/webapp/default/protected/views/layouts/main.php
+++ b/framework/console/webapp/default/protected/views/layouts/main.php
@@ -14,4 +14,4 @@
 			<?php echo \Yii::powered()?>
 		</div>
 	</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/framework/console/webapp/default/protected/views/site/index.php b/framework/console/webapp/default/protected/views/site/index.php
index 0fb8784..08c5288 100644
--- a/framework/console/webapp/default/protected/views/site/index.php
+++ b/framework/console/webapp/default/protected/views/site/index.php
@@ -1 +1 @@
-Hello, <?php echo $name?>!
\ No newline at end of file
+Hello, <?php echo $name?>!
diff --git a/framework/db/Exception.php b/framework/db/Exception.php
index ad97b5a..b7a60b4 100644
--- a/framework/db/Exception.php
+++ b/framework/db/Exception.php
@@ -41,4 +41,4 @@ class Exception extends \yii\base\Exception
 	{
 		return \Yii::t('yii|Database Exception');
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/db/Expression.php b/framework/db/Expression.php
index 4ebcd5f..77e9f60 100644
--- a/framework/db/Expression.php
+++ b/framework/db/Expression.php
@@ -57,4 +57,4 @@ class Expression extends \yii\base\Object
 	{
 		return $this->expression;
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/db/Migration.php b/framework/db/Migration.php
index ce2cf97..88abab5 100644
--- a/framework/db/Migration.php
+++ b/framework/db/Migration.php
@@ -368,4 +368,4 @@ class Migration extends \yii\base\Component
 		$this->db->createCommand()->dropIndex($name, $table)->execute();
 		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/db/StaleObjectException.php b/framework/db/StaleObjectException.php
index 860c9fc..0a04bd3 100644
--- a/framework/db/StaleObjectException.php
+++ b/framework/db/StaleObjectException.php
@@ -20,4 +20,4 @@ class StaleObjectException extends Exception
 	{
 		return \Yii::t('yii|Stale Object Exception');
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/helpers/ArrayHelper.php b/framework/helpers/ArrayHelper.php
index 3061717..d58341c 100644
--- a/framework/helpers/ArrayHelper.php
+++ b/framework/helpers/ArrayHelper.php
@@ -16,4 +16,4 @@ namespace yii\helpers;
  */
 class ArrayHelper extends base\ArrayHelper
 {
-}
\ No newline at end of file
+}
diff --git a/framework/helpers/FileHelper.php b/framework/helpers/FileHelper.php
index 3fb24e1..04ce4e1 100644
--- a/framework/helpers/FileHelper.php
+++ b/framework/helpers/FileHelper.php
@@ -18,4 +18,4 @@ namespace yii\helpers;
  */
 class FileHelper extends base\FileHelper
 {
-}
\ No newline at end of file
+}
diff --git a/framework/helpers/JsExpression.php b/framework/helpers/JsExpression.php
index 0054b64..5a1f9bd 100644
--- a/framework/helpers/JsExpression.php
+++ b/framework/helpers/JsExpression.php
@@ -42,4 +42,4 @@ class JsExpression extends Object
 	{
 		return $this->expression;
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/helpers/Json.php b/framework/helpers/Json.php
index 2a20f3c..5e77c3f 100644
--- a/framework/helpers/Json.php
+++ b/framework/helpers/Json.php
@@ -15,4 +15,4 @@ namespace yii\helpers;
 class Json extends base\Json
 {
 	
-}
\ No newline at end of file
+}
diff --git a/framework/helpers/SecurityHelper.php b/framework/helpers/SecurityHelper.php
index d3cb2ad..d16e7e6 100644
--- a/framework/helpers/SecurityHelper.php
+++ b/framework/helpers/SecurityHelper.php
@@ -26,4 +26,4 @@ namespace yii\helpers;
  */
 class SecurityHelper extends base\SecurityHelper
 {
-}
\ No newline at end of file
+}
diff --git a/framework/helpers/VarDumper.php b/framework/helpers/VarDumper.php
index 2659188..59a1718 100644
--- a/framework/helpers/VarDumper.php
+++ b/framework/helpers/VarDumper.php
@@ -25,4 +25,4 @@ namespace yii\helpers;
  */
 class VarDumper extends base\VarDumper
 {
-}
\ No newline at end of file
+}
diff --git a/framework/helpers/base/ArrayHelper.php b/framework/helpers/base/ArrayHelper.php
index 5f72fe4..86445d7 100644
--- a/framework/helpers/base/ArrayHelper.php
+++ b/framework/helpers/base/ArrayHelper.php
@@ -349,4 +349,4 @@ class ArrayHelper
 		}
 		return $d;
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/helpers/base/FileHelper.php b/framework/helpers/base/FileHelper.php
index 2f62f43..954c86e 100644
--- a/framework/helpers/base/FileHelper.php
+++ b/framework/helpers/base/FileHelper.php
@@ -169,4 +169,4 @@ class FileHelper
 		}
 		closedir($handle);
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/helpers/base/Json.php b/framework/helpers/base/Json.php
index 1deb5c2..c92e208 100644
--- a/framework/helpers/base/Json.php
+++ b/framework/helpers/base/Json.php
@@ -104,4 +104,4 @@ class Json
 			return $data;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/helpers/base/VarDumper.php b/framework/helpers/base/VarDumper.php
index 5268568..730aafe 100644
--- a/framework/helpers/base/VarDumper.php
+++ b/framework/helpers/base/VarDumper.php
@@ -131,4 +131,4 @@ class VarDumper
 				break;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/i18n/PhpMessageSource.php b/framework/i18n/PhpMessageSource.php
index 1ada44a..f62939f 100644
--- a/framework/i18n/PhpMessageSource.php
+++ b/framework/i18n/PhpMessageSource.php
@@ -76,4 +76,4 @@ class PhpMessageSource extends MessageSource
 			return array();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/i18n/data/plurals.php b/framework/i18n/data/plurals.php
index 52c733b..468f7e2 100644
--- a/framework/i18n/data/plurals.php
+++ b/framework/i18n/data/plurals.php
@@ -624,4 +624,4 @@ return array (
   array (
     0 => 'in_array(fmod($n,10),array(1,2))||fmod($n,20)==0',
   ),
-);
\ No newline at end of file
+);
diff --git a/framework/logging/EmailTarget.php b/framework/logging/EmailTarget.php
index 4c84739..bb02e34 100644
--- a/framework/logging/EmailTarget.php
+++ b/framework/logging/EmailTarget.php
@@ -69,4 +69,4 @@ class EmailTarget extends Target
 		}
 		mail($sentTo, $subject, $body, implode("\r\n", $headers));
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/logging/ProfileTarget.php b/framework/logging/ProfileTarget.php
index 2b6ffe6..335e172 100644
--- a/framework/logging/ProfileTarget.php
+++ b/framework/logging/ProfileTarget.php
@@ -189,4 +189,4 @@ class CProfileLogRoute extends CWebLogRoute
 		$total += $delta;
 		return array($token, $calls, $min, $max, $total);
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/logging/WebTarget.php b/framework/logging/WebTarget.php
index b71e1a2..c98fd9f 100644
--- a/framework/logging/WebTarget.php
+++ b/framework/logging/WebTarget.php
@@ -58,4 +58,4 @@ class CWebLogRoute extends CLogRoute
 		$viewFile = YII_PATH . DIRECTORY_SEPARATOR . 'views' . DIRECTORY_SEPARATOR . $view . '.php';
 		include($app->findLocalizedFile($viewFile, 'en'));
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/renderers/SmartyViewRenderer.php b/framework/renderers/SmartyViewRenderer.php
index 920f3c6..29d7b97 100644
--- a/framework/renderers/SmartyViewRenderer.php
+++ b/framework/renderers/SmartyViewRenderer.php
@@ -102,4 +102,4 @@ class SmartyViewRenderer extends ViewRenderer
 
 		return $template->fetch();
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/validators/InlineValidator.php b/framework/validators/InlineValidator.php
index 3689a2f..8af5bbc 100644
--- a/framework/validators/InlineValidator.php
+++ b/framework/validators/InlineValidator.php
@@ -96,4 +96,4 @@ class InlineValidator extends Validator
 			return null;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/validators/NumberValidator.php b/framework/validators/NumberValidator.php
index d0a4002..c0f81cd 100644
--- a/framework/validators/NumberValidator.php
+++ b/framework/validators/NumberValidator.php
@@ -151,4 +151,4 @@ class NumberValidator extends Validator
 
 		return 'yii.validation.number(value, messages, ' . Json::encode($options) . ');';
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/validators/UniqueValidator.php b/framework/validators/UniqueValidator.php
index 2240e0a..7072ff4 100644
--- a/framework/validators/UniqueValidator.php
+++ b/framework/validators/UniqueValidator.php
@@ -97,4 +97,4 @@ class UniqueValidator extends Validator
 			$this->addError($object, $attribute, $this->message);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/views/error.php b/framework/views/error.php
index 548d04b..009050a 100644
--- a/framework/views/error.php
+++ b/framework/views/error.php
@@ -64,4 +64,4 @@ $title = $context->htmlEncode($exception instanceof \yii\base\Exception ? $excep
 		<?php echo YII_DEBUG ? $context->versionInfo : ''?>
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/framework/web/AccessControl.php b/framework/web/AccessControl.php
index f5983ae..e890510 100644
--- a/framework/web/AccessControl.php
+++ b/framework/web/AccessControl.php
@@ -103,4 +103,4 @@ class AccessControl extends ActionFilter
 			throw new HttpException(403, Yii::t('yii|You are not allowed to perform this action.'));
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/web/AccessRule.php b/framework/web/AccessRule.php
index 3f8c057..b195048 100644
--- a/framework/web/AccessRule.php
+++ b/framework/web/AccessRule.php
@@ -185,4 +185,4 @@ class AccessRule extends Component
 	{
 		return empty($this->matchCallback) || call_user_func($this->matchCallback, $this, $action);
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/web/AssetBundle.php b/framework/web/AssetBundle.php
index 4e1eb59..37577dd 100644
--- a/framework/web/AssetBundle.php
+++ b/framework/web/AssetBundle.php
@@ -173,4 +173,4 @@ class AssetBundle extends Object
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/web/AssetConverter.php b/framework/web/AssetConverter.php
index f2871fe..4fde1fc 100644
--- a/framework/web/AssetConverter.php
+++ b/framework/web/AssetConverter.php
@@ -59,4 +59,4 @@ class AssetConverter extends Component implements IAssetConverter
 		}
 		return "$baseUrl/$asset";
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/web/Controller.php b/framework/web/Controller.php
index 099bf96..517f4b4 100644
--- a/framework/web/Controller.php
+++ b/framework/web/Controller.php
@@ -40,4 +40,4 @@ class Controller extends \yii\base\Controller
 		}
 		return Yii::$app->getUrlManager()->createUrl($route, $params);
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/web/HttpCache.php b/framework/web/HttpCache.php
index f64b37f..0a3bb86 100644
--- a/framework/web/HttpCache.php
+++ b/framework/web/HttpCache.php
@@ -128,4 +128,4 @@ class HttpCache extends ActionFilter
 	{
 		return '"' . base64_encode(sha1($seed, true)) . '"';
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/web/IAssetConverter.php b/framework/web/IAssetConverter.php
index 4334d3e..d1d1da0 100644
--- a/framework/web/IAssetConverter.php
+++ b/framework/web/IAssetConverter.php
@@ -24,4 +24,4 @@ interface IAssetConverter
 	 * need conversion, "$baseUrl/$asset" should be returned.
 	 */
 	public function convert($asset, $basePath, $baseUrl);
-}
\ No newline at end of file
+}
diff --git a/framework/web/Identity.php b/framework/web/Identity.php
index 6d67bc0..101ecdb 100644
--- a/framework/web/Identity.php
+++ b/framework/web/Identity.php
@@ -78,4 +78,4 @@ interface Identity
 	 * @see getAuthKey()
 	 */
 	public function validateAuthKey($authKey);
-}
\ No newline at end of file
+}
diff --git a/framework/web/PageCache.php b/framework/web/PageCache.php
index 5a50825..2fe36b3 100644
--- a/framework/web/PageCache.php
+++ b/framework/web/PageCache.php
@@ -101,4 +101,4 @@ class PageCache extends ActionFilter
 	{
 		$this->view->endCache();
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/web/Pagination.php b/framework/web/Pagination.php
index 1d41c0c..764dbb4 100644
--- a/framework/web/Pagination.php
+++ b/framework/web/Pagination.php
@@ -205,4 +205,4 @@ class Pagination extends \yii\base\Object
 	{
 		return $this->pageSize < 1 ? -1 : $this->pageSize;
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/web/Sort.php b/framework/web/Sort.php
index e5c2451..99084c1 100644
--- a/framework/web/Sort.php
+++ b/framework/web/Sort.php
@@ -333,4 +333,4 @@ class Sort extends \yii\base\Object
 			return false;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/web/UserEvent.php b/framework/web/UserEvent.php
index 7a5d23d..4e39380 100644
--- a/framework/web/UserEvent.php
+++ b/framework/web/UserEvent.php
@@ -31,4 +31,4 @@ class UserEvent extends Event
 	 * This property is only meaningful for [[User::EVENT_BEFORE_LOGIN]] and [[User::EVENT_BEFORE_LOGOUT]] events.
 	 */
 	public $isValid = true;
-}
\ No newline at end of file
+}
diff --git a/framework/widgets/ActiveField.php b/framework/widgets/ActiveField.php
index da17012..336966f 100644
--- a/framework/widgets/ActiveField.php
+++ b/framework/widgets/ActiveField.php
@@ -541,4 +541,4 @@ class ActiveField extends Component
 			. '</div>'
 		);
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/widgets/Block.php b/framework/widgets/Block.php
index d6f7317..fdd210f 100644
--- a/framework/widgets/Block.php
+++ b/framework/widgets/Block.php
@@ -46,4 +46,4 @@ class Block extends Widget
 		}
 		$this->view->blocks[$this->id] = $block;
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/widgets/FragmentCache.php b/framework/widgets/FragmentCache.php
index 637d115..5b37f6e 100644
--- a/framework/widgets/FragmentCache.php
+++ b/framework/widgets/FragmentCache.php
@@ -171,4 +171,4 @@ class FragmentCache extends Widget
 		}
 		return $this->cache->buildKey($factors);
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/MysqlTestCase.php b/tests/unit/MysqlTestCase.php
index e1a1f7e..c7ef970 100644
--- a/tests/unit/MysqlTestCase.php
+++ b/tests/unit/MysqlTestCase.php
@@ -33,4 +33,4 @@ class MysqlTestCase extends TestCase
 		}
 		return $db;
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/TestCase.php b/tests/unit/TestCase.php
index 458c6f3..dccd3af 100644
--- a/tests/unit/TestCase.php
+++ b/tests/unit/TestCase.php
@@ -13,4 +13,4 @@ class TestCase extends \yii\test\TestCase
 		}
 		return isset(self::$params[$name]) ? self::$params[$name] : null;
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/data/ar/ActiveRecord.php b/tests/unit/data/ar/ActiveRecord.php
index 95346de..f1194ea 100644
--- a/tests/unit/data/ar/ActiveRecord.php
+++ b/tests/unit/data/ar/ActiveRecord.php
@@ -23,4 +23,4 @@ class ActiveRecord extends \yii\db\ActiveRecord
 	{
 		return self::$db;
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/data/ar/Customer.php b/tests/unit/data/ar/Customer.php
index a090b7f..9b3eab6 100644
--- a/tests/unit/data/ar/Customer.php
+++ b/tests/unit/data/ar/Customer.php
@@ -24,4 +24,4 @@ class Customer extends ActiveRecord
 	{
 		return $query->andWhere('status=1');
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/data/ar/Item.php b/tests/unit/data/ar/Item.php
index 279893f..5d23378 100644
--- a/tests/unit/data/ar/Item.php
+++ b/tests/unit/data/ar/Item.php
@@ -8,4 +8,4 @@ class Item extends ActiveRecord
 	{
 		return 'tbl_item';
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/data/ar/Order.php b/tests/unit/data/ar/Order.php
index 38257d6..f9dd715 100644
--- a/tests/unit/data/ar/Order.php
+++ b/tests/unit/data/ar/Order.php
@@ -43,4 +43,4 @@ class Order extends ActiveRecord
 			return false;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/data/ar/OrderItem.php b/tests/unit/data/ar/OrderItem.php
index f879749..607133e 100644
--- a/tests/unit/data/ar/OrderItem.php
+++ b/tests/unit/data/ar/OrderItem.php
@@ -18,4 +18,4 @@ class OrderItem extends ActiveRecord
 	{
 		return $this->hasOne('Item', array('id' => 'item_id'));
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/data/base/Singer.php b/tests/unit/data/base/Singer.php
index 3305b98..f1b91e1 100644
--- a/tests/unit/data/base/Singer.php
+++ b/tests/unit/data/base/Singer.php
@@ -18,4 +18,4 @@ class Singer extends Model
 			array('underscore_style', 'yii\validators\CaptchaValidator'),
 		);
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/framework/base/ComponentTest.php b/tests/unit/framework/base/ComponentTest.php
index 74b6e9a..7c860e3 100644
--- a/tests/unit/framework/base/ComponentTest.php
+++ b/tests/unit/framework/base/ComponentTest.php
@@ -387,4 +387,4 @@ class NewComponent2 extends Component
 		$this->b = $b;
 		$this->c = $c;
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/framework/base/ObjectTest.php b/tests/unit/framework/base/ObjectTest.php
index b47b178..14856e2 100644
--- a/tests/unit/framework/base/ObjectTest.php
+++ b/tests/unit/framework/base/ObjectTest.php
@@ -181,4 +181,4 @@ class NewObject extends Object
 	{
 		return $this->_items;
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/framework/caching/ApcCacheTest.php b/tests/unit/framework/caching/ApcCacheTest.php
index 604efde..859f6a6 100644
--- a/tests/unit/framework/caching/ApcCacheTest.php
+++ b/tests/unit/framework/caching/ApcCacheTest.php
@@ -26,4 +26,4 @@ class ApcCacheTest extends CacheTest
 		}
 		return $this->_cacheInstance;
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/framework/caching/DbCacheTest.php b/tests/unit/framework/caching/DbCacheTest.php
index 594e946..a41667c 100644
--- a/tests/unit/framework/caching/DbCacheTest.php
+++ b/tests/unit/framework/caching/DbCacheTest.php
@@ -67,4 +67,4 @@ class DbCacheTest extends CacheTest
 		}
 		return $this->_cacheInstance;
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/framework/caching/FileCacheTest.php b/tests/unit/framework/caching/FileCacheTest.php
index 1f6debd..37d3222 100644
--- a/tests/unit/framework/caching/FileCacheTest.php
+++ b/tests/unit/framework/caching/FileCacheTest.php
@@ -22,4 +22,4 @@ class FileCacheTest extends CacheTest
 		}
 		return $this->_cacheInstance;
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/framework/caching/MemCacheTest.php b/tests/unit/framework/caching/MemCacheTest.php
index e4804d9..40dba12 100644
--- a/tests/unit/framework/caching/MemCacheTest.php
+++ b/tests/unit/framework/caching/MemCacheTest.php
@@ -24,4 +24,4 @@ class MemCacheTest extends CacheTest
 		}
 		return $this->_cacheInstance;
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/framework/caching/MemCachedTest.php b/tests/unit/framework/caching/MemCachedTest.php
index 59396df..c9e437c 100644
--- a/tests/unit/framework/caching/MemCachedTest.php
+++ b/tests/unit/framework/caching/MemCachedTest.php
@@ -26,4 +26,4 @@ class MemCachedTest extends CacheTest
 		}
 		return $this->_cacheInstance;
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/framework/caching/WinCacheTest.php b/tests/unit/framework/caching/WinCacheTest.php
index b78d57b..c9470bd 100644
--- a/tests/unit/framework/caching/WinCacheTest.php
+++ b/tests/unit/framework/caching/WinCacheTest.php
@@ -28,4 +28,4 @@ class WinCacheTest extends CacheTest
 		}
 		return $this->_cacheInstance;
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/framework/caching/XCacheTest.php b/tests/unit/framework/caching/XCacheTest.php
index e1ed844..b5e41a6 100644
--- a/tests/unit/framework/caching/XCacheTest.php
+++ b/tests/unit/framework/caching/XCacheTest.php
@@ -24,4 +24,4 @@ class XCacheTest extends CacheTest
 		}
 		return $this->_cacheInstance;
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/framework/caching/ZendDataCacheTest.php b/tests/unit/framework/caching/ZendDataCacheTest.php
index 91dfbb5..86c06c8 100644
--- a/tests/unit/framework/caching/ZendDataCacheTest.php
+++ b/tests/unit/framework/caching/ZendDataCacheTest.php
@@ -24,4 +24,4 @@ class ZendDataCacheTest extends CacheTest
 		}
 		return $this->_cacheInstance;
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/framework/db/ActiveRecordTest.php b/tests/unit/framework/db/ActiveRecordTest.php
index 3b8c2b5..f0ea968 100644
--- a/tests/unit/framework/db/ActiveRecordTest.php
+++ b/tests/unit/framework/db/ActiveRecordTest.php
@@ -356,4 +356,4 @@ class ActiveRecordTest extends \yiiunit\MysqlTestCase
 		$customers = Customer::find()->all();
 		$this->assertEquals(0, count($customers));
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/framework/db/CommandTest.php b/tests/unit/framework/db/CommandTest.php
index d505f6d..2576e78 100644
--- a/tests/unit/framework/db/CommandTest.php
+++ b/tests/unit/framework/db/CommandTest.php
@@ -289,4 +289,4 @@ class CommandTest extends \yiiunit\MysqlTestCase
 	{
 
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/framework/db/QueryTest.php b/tests/unit/framework/db/QueryTest.php
index 2c4359f..1c730cd 100644
--- a/tests/unit/framework/db/QueryTest.php
+++ b/tests/unit/framework/db/QueryTest.php
@@ -113,4 +113,4 @@ class QueryTest extends \yiiunit\MysqlTestCase
 	{
 
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/framework/helpers/JsonTest.php b/tests/unit/framework/helpers/JsonTest.php
index 0e06eb3..6a78cd1 100644
--- a/tests/unit/framework/helpers/JsonTest.php
+++ b/tests/unit/framework/helpers/JsonTest.php
@@ -57,4 +57,4 @@ class JsonTest extends \yii\test\TestCase
 		$this->setExpectedException('yii\base\InvalidParamException');
 		Json::decode($json);
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/framework/helpers/StringHelperTest.php b/tests/unit/framework/helpers/StringHelperTest.php
index 4e1266f..c37aafd 100644
--- a/tests/unit/framework/helpers/StringHelperTest.php
+++ b/tests/unit/framework/helpers/StringHelperTest.php
@@ -70,4 +70,4 @@ class StringHelperTest extends \yii\test\TestCase
 		$this->assertEquals('PostTag', StringHelper::id2camel('post-tag'));
 		$this->assertEquals('PostTag', StringHelper::id2camel('post_tag', '_'));
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/framework/helpers/VarDumperTest.php b/tests/unit/framework/helpers/VarDumperTest.php
index 8757588..a797121 100644
--- a/tests/unit/framework/helpers/VarDumperTest.php
+++ b/tests/unit/framework/helpers/VarDumperTest.php
@@ -9,4 +9,4 @@ class VarDumperTest extends \yii\test\TestCase
 		$obj = new \StdClass();
 		VarDumper::dump($obj);
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/unit/framework/validators/EmailValidatorTest.php b/tests/unit/framework/validators/EmailValidatorTest.php
index fbc2f53..512eb5c 100644
--- a/tests/unit/framework/validators/EmailValidatorTest.php
+++ b/tests/unit/framework/validators/EmailValidatorTest.php
@@ -25,4 +25,4 @@ class EmailValidatorTest extends TestCase
 		$this->assertTrue($validator->validateValue('sam@rmcreative.ru'));
 		$this->assertFalse($validator->validateValue('test@example.com'));
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/web/app/protected/config/main.php b/tests/web/app/protected/config/main.php
index eed6d54..d5be5de 100644
--- a/tests/web/app/protected/config/main.php
+++ b/tests/web/app/protected/config/main.php
@@ -1,3 +1,3 @@
 <?php
 
-return array();
\ No newline at end of file
+return array();
diff --git a/tests/web/app/protected/controllers/SiteController.php b/tests/web/app/protected/controllers/SiteController.php
index 050bf90..0cc92ae 100644
--- a/tests/web/app/protected/controllers/SiteController.php
+++ b/tests/web/app/protected/controllers/SiteController.php
@@ -27,4 +27,4 @@ class DefaultController extends \yii\web\Controller
 		echo Html::endForm();
 		print_r($_POST);
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/web/app/protected/views/site/index.php b/tests/web/app/protected/views/site/index.php
index 5decb56..cc86af6 100644
--- a/tests/web/app/protected/views/site/index.php
+++ b/tests/web/app/protected/views/site/index.php
@@ -5,4 +5,4 @@
  * Date: 3/16/13
  * Time: 10:41 AM
  * To change this template use File | Settings | File Templates.
- */
\ No newline at end of file
+ */

From 9841d6c639e87b80c6b2a90a528deeff808ac33a Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sun, 5 May 2013 15:11:53 -0400
Subject: [PATCH 038/152] Fixes issue #124.

---
 framework/base/Application.php |  9 +++++++++
 framework/web/AccessRule.php   |  2 +-
 framework/web/User.php         | 17 +++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/framework/base/Application.php b/framework/base/Application.php
index 6dca5cf..5b92f76 100644
--- a/framework/base/Application.php
+++ b/framework/base/Application.php
@@ -306,6 +306,15 @@ class Application extends Module
 	}
 
 	/**
+	 * @return null|Component
+	 * @todo
+	 */
+	public function getAuthManager()
+	{
+		return $this->getComponent('auth');
+	}
+
+	/**
 	 * Registers the core application components.
 	 * @see setComponents
 	 */
diff --git a/framework/web/AccessRule.php b/framework/web/AccessRule.php
index 3f8c057..1bcb896 100644
--- a/framework/web/AccessRule.php
+++ b/framework/web/AccessRule.php
@@ -144,7 +144,7 @@ class AccessRule extends Component
 				return true;
 			} elseif ($role === '@' && !$user->getIsGuest()) {
 				return true;
-			} elseif ($user->hasAccess($role)) {
+			} elseif ($user->checkAccess($role)) {
 				return true;
 			}
 		}
diff --git a/framework/web/User.php b/framework/web/User.php
index b8bf7cd..2fbea91 100644
--- a/framework/web/User.php
+++ b/framework/web/User.php
@@ -447,4 +447,21 @@ class User extends Component
 			}
 		}
 	}
+
+	/**
+	 * Checks whether the user has access to the specified operation.
+	 * @param $operator
+	 * @param array $params
+	 * @return bool
+	 * @todo
+	 */
+	public function checkAccess($operation, $params = array())
+	{
+		$auth = Yii::$app->getAuthManager();
+		if ($auth !== null) {
+			return $auth->checkAccess($this->getId(), $operation, $params);
+		} else {
+			return true;
+		}
+	}
 }

From 0766fbccb5b2b40b4eb414e97faa00a915ccd206 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sun, 5 May 2013 17:16:10 -0400
Subject: [PATCH 039/152] Fixes issue #128.

---
 framework/helpers/base/SecurityHelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/helpers/base/SecurityHelper.php b/framework/helpers/base/SecurityHelper.php
index d220bf4..3f69fee 100644
--- a/framework/helpers/base/SecurityHelper.php
+++ b/framework/helpers/base/SecurityHelper.php
@@ -217,7 +217,7 @@ class SecurityHelper
 			throw new InvalidParamException('Password must be a string and cannot be empty.');
 		}
 
-		if (!preg_match('/^\$2[axy]\$(\d\d)\$[\./0-9A-Za-z]{22}/', $hash, $matches) || $matches[1] < 4 || $matches[1] > 30) {
+		if (!preg_match('/^\$2[axy]\$(\d\d)\$[\.\/0-9A-Za-z]{22}/', $hash, $matches) || $matches[1] < 4 || $matches[1] > 30) {
 			throw new InvalidParamException('Hash is invalid.');
 		}
 

From 14699b5ec3992a849d1b16d54a9f971dd65cf066 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sun, 5 May 2013 18:32:32 -0400
Subject: [PATCH 040/152] reorganized app code. removed app template from
 framework folder.

---
 app/assets/.gitignore                              |    1 -
 app/css/bootstrap-responsive.css                   | 1109 ----
 app/css/bootstrap-responsive.min.css               |    9 -
 app/css/bootstrap.css                              | 6158 --------------------
 app/css/bootstrap.min.css                          |    9 -
 app/css/site.css                                   |   78 -
 app/img/glyphicons-halflings-white.png             |  Bin 8777 -> 0 bytes
 app/img/glyphicons-halflings.png                   |  Bin 12799 -> 0 bytes
 app/index.php                                      |    9 -
 app/js/bootstrap.js                                | 2276 --------
 app/js/bootstrap.min.js                            |    6 -
 app/protected/.htaccess                            |    1 -
 app/protected/config/assets.php                    |   19 -
 app/protected/config/main.php                      |   21 -
 app/protected/controllers/SiteController.php       |   49 -
 app/protected/models/ContactForm.php               |   63 -
 app/protected/models/LoginForm.php                 |   58 -
 app/protected/models/User.php                      |   61 -
 app/protected/runtime/.gitignore                   |    1 -
 app/protected/views/layouts/main.php               |   57 -
 app/protected/views/site/about.php                 |   15 -
 app/protected/views/site/contact.php               |   33 -
 app/protected/views/site/index.php                 |   47 -
 app/protected/views/site/login.php                 |   21 -
 apps/bootstrap/assets/.gitignore                   |    1 +
 apps/bootstrap/css/bootstrap-responsive.css        | 1109 ++++
 apps/bootstrap/css/bootstrap-responsive.min.css    |    9 +
 apps/bootstrap/css/bootstrap.css                   | 6158 ++++++++++++++++++++
 apps/bootstrap/css/bootstrap.min.css               |    9 +
 apps/bootstrap/css/site.css                        |   78 +
 apps/bootstrap/img/glyphicons-halflings-white.png  |  Bin 0 -> 8777 bytes
 apps/bootstrap/img/glyphicons-halflings.png        |  Bin 0 -> 12799 bytes
 apps/bootstrap/index.php                           |    9 +
 apps/bootstrap/js/bootstrap.js                     | 2276 ++++++++
 apps/bootstrap/js/bootstrap.min.js                 |    6 +
 apps/bootstrap/protected/.htaccess                 |    1 +
 apps/bootstrap/protected/config/assets.php         |   19 +
 apps/bootstrap/protected/config/main.php           |   21 +
 .../protected/controllers/SiteController.php       |   49 +
 apps/bootstrap/protected/models/ContactForm.php    |   63 +
 apps/bootstrap/protected/models/LoginForm.php      |   58 +
 apps/bootstrap/protected/models/User.php           |   61 +
 apps/bootstrap/protected/runtime/.gitignore        |    1 +
 apps/bootstrap/protected/views/layouts/main.php    |   57 +
 apps/bootstrap/protected/views/site/about.php      |   15 +
 apps/bootstrap/protected/views/site/contact.php    |   33 +
 apps/bootstrap/protected/views/site/index.php      |   47 +
 apps/bootstrap/protected/views/site/login.php      |   21 +
 framework/console/webapp/config.php                |   17 -
 framework/console/webapp/default/index.php         |   10 -
 .../webapp/default/protected/config/main.php       |   20 -
 .../protected/controllers/SiteController.php       |   15 -
 .../default/protected/views/layouts/main.php       |   17 -
 .../webapp/default/protected/views/site/index.php  |    1 -
 readme.md                                          |    3 +-
 55 files changed, 10103 insertions(+), 10182 deletions(-)
 delete mode 100644 app/assets/.gitignore
 delete mode 100644 app/css/bootstrap-responsive.css
 delete mode 100644 app/css/bootstrap-responsive.min.css
 delete mode 100644 app/css/bootstrap.css
 delete mode 100644 app/css/bootstrap.min.css
 delete mode 100644 app/css/site.css
 delete mode 100644 app/img/glyphicons-halflings-white.png
 delete mode 100644 app/img/glyphicons-halflings.png
 delete mode 100644 app/index.php
 delete mode 100644 app/js/bootstrap.js
 delete mode 100644 app/js/bootstrap.min.js
 delete mode 100644 app/protected/.htaccess
 delete mode 100644 app/protected/config/assets.php
 delete mode 100644 app/protected/config/main.php
 delete mode 100644 app/protected/controllers/SiteController.php
 delete mode 100644 app/protected/models/ContactForm.php
 delete mode 100644 app/protected/models/LoginForm.php
 delete mode 100644 app/protected/models/User.php
 delete mode 100644 app/protected/runtime/.gitignore
 delete mode 100644 app/protected/views/layouts/main.php
 delete mode 100644 app/protected/views/site/about.php
 delete mode 100644 app/protected/views/site/contact.php
 delete mode 100644 app/protected/views/site/index.php
 delete mode 100644 app/protected/views/site/login.php
 create mode 100644 apps/bootstrap/assets/.gitignore
 create mode 100644 apps/bootstrap/css/bootstrap-responsive.css
 create mode 100644 apps/bootstrap/css/bootstrap-responsive.min.css
 create mode 100644 apps/bootstrap/css/bootstrap.css
 create mode 100644 apps/bootstrap/css/bootstrap.min.css
 create mode 100644 apps/bootstrap/css/site.css
 create mode 100644 apps/bootstrap/img/glyphicons-halflings-white.png
 create mode 100644 apps/bootstrap/img/glyphicons-halflings.png
 create mode 100644 apps/bootstrap/index.php
 create mode 100644 apps/bootstrap/js/bootstrap.js
 create mode 100644 apps/bootstrap/js/bootstrap.min.js
 create mode 100644 apps/bootstrap/protected/.htaccess
 create mode 100644 apps/bootstrap/protected/config/assets.php
 create mode 100644 apps/bootstrap/protected/config/main.php
 create mode 100644 apps/bootstrap/protected/controllers/SiteController.php
 create mode 100644 apps/bootstrap/protected/models/ContactForm.php
 create mode 100644 apps/bootstrap/protected/models/LoginForm.php
 create mode 100644 apps/bootstrap/protected/models/User.php
 create mode 100644 apps/bootstrap/protected/runtime/.gitignore
 create mode 100644 apps/bootstrap/protected/views/layouts/main.php
 create mode 100644 apps/bootstrap/protected/views/site/about.php
 create mode 100644 apps/bootstrap/protected/views/site/contact.php
 create mode 100644 apps/bootstrap/protected/views/site/index.php
 create mode 100644 apps/bootstrap/protected/views/site/login.php
 delete mode 100644 framework/console/webapp/config.php
 delete mode 100644 framework/console/webapp/default/index.php
 delete mode 100644 framework/console/webapp/default/protected/config/main.php
 delete mode 100644 framework/console/webapp/default/protected/controllers/SiteController.php
 delete mode 100644 framework/console/webapp/default/protected/views/layouts/main.php
 delete mode 100644 framework/console/webapp/default/protected/views/site/index.php

diff --git a/app/assets/.gitignore b/app/assets/.gitignore
deleted file mode 100644
index 72e8ffc..0000000
--- a/app/assets/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*
diff --git a/app/css/bootstrap-responsive.css b/app/css/bootstrap-responsive.css
deleted file mode 100644
index fcd72f7..0000000
--- a/app/css/bootstrap-responsive.css
+++ /dev/null
@@ -1,1109 +0,0 @@
-/*!
- * Bootstrap Responsive v2.3.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */
-
-.clearfix {
-  *zoom: 1;
-}
-
-.clearfix:before,
-.clearfix:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.clearfix:after {
-  clear: both;
-}
-
-.hide-text {
-  font: 0/0 a;
-  color: transparent;
-  text-shadow: none;
-  background-color: transparent;
-  border: 0;
-}
-
-.input-block-level {
-  display: block;
-  width: 100%;
-  min-height: 30px;
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-}
-
-@-ms-viewport {
-  width: device-width;
-}
-
-.hidden {
-  display: none;
-  visibility: hidden;
-}
-
-.visible-phone {
-  display: none !important;
-}
-
-.visible-tablet {
-  display: none !important;
-}
-
-.hidden-desktop {
-  display: none !important;
-}
-
-.visible-desktop {
-  display: inherit !important;
-}
-
-@media (min-width: 768px) and (max-width: 979px) {
-  .hidden-desktop {
-    display: inherit !important;
-  }
-  .visible-desktop {
-    display: none !important ;
-  }
-  .visible-tablet {
-    display: inherit !important;
-  }
-  .hidden-tablet {
-    display: none !important;
-  }
-}
-
-@media (max-width: 767px) {
-  .hidden-desktop {
-    display: inherit !important;
-  }
-  .visible-desktop {
-    display: none !important;
-  }
-  .visible-phone {
-    display: inherit !important;
-  }
-  .hidden-phone {
-    display: none !important;
-  }
-}
-
-.visible-print {
-  display: none !important;
-}
-
-@media print {
-  .visible-print {
-    display: inherit !important;
-  }
-  .hidden-print {
-    display: none !important;
-  }
-}
-
-@media (min-width: 1200px) {
-  .row {
-    margin-left: -30px;
-    *zoom: 1;
-  }
-  .row:before,
-  .row:after {
-    display: table;
-    line-height: 0;
-    content: "";
-  }
-  .row:after {
-    clear: both;
-  }
-  [class*="span"] {
-    float: left;
-    min-height: 1px;
-    margin-left: 30px;
-  }
-  .container,
-  .navbar-static-top .container,
-  .navbar-fixed-top .container,
-  .navbar-fixed-bottom .container {
-    width: 1170px;
-  }
-  .span12 {
-    width: 1170px;
-  }
-  .span11 {
-    width: 1070px;
-  }
-  .span10 {
-    width: 970px;
-  }
-  .span9 {
-    width: 870px;
-  }
-  .span8 {
-    width: 770px;
-  }
-  .span7 {
-    width: 670px;
-  }
-  .span6 {
-    width: 570px;
-  }
-  .span5 {
-    width: 470px;
-  }
-  .span4 {
-    width: 370px;
-  }
-  .span3 {
-    width: 270px;
-  }
-  .span2 {
-    width: 170px;
-  }
-  .span1 {
-    width: 70px;
-  }
-  .offset12 {
-    margin-left: 1230px;
-  }
-  .offset11 {
-    margin-left: 1130px;
-  }
-  .offset10 {
-    margin-left: 1030px;
-  }
-  .offset9 {
-    margin-left: 930px;
-  }
-  .offset8 {
-    margin-left: 830px;
-  }
-  .offset7 {
-    margin-left: 730px;
-  }
-  .offset6 {
-    margin-left: 630px;
-  }
-  .offset5 {
-    margin-left: 530px;
-  }
-  .offset4 {
-    margin-left: 430px;
-  }
-  .offset3 {
-    margin-left: 330px;
-  }
-  .offset2 {
-    margin-left: 230px;
-  }
-  .offset1 {
-    margin-left: 130px;
-  }
-  .row-fluid {
-    width: 100%;
-    *zoom: 1;
-  }
-  .row-fluid:before,
-  .row-fluid:after {
-    display: table;
-    line-height: 0;
-    content: "";
-  }
-  .row-fluid:after {
-    clear: both;
-  }
-  .row-fluid [class*="span"] {
-    display: block;
-    float: left;
-    width: 100%;
-    min-height: 30px;
-    margin-left: 2.564102564102564%;
-    *margin-left: 2.5109110747408616%;
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-            box-sizing: border-box;
-  }
-  .row-fluid [class*="span"]:first-child {
-    margin-left: 0;
-  }
-  .row-fluid .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 2.564102564102564%;
-  }
-  .row-fluid .span12 {
-    width: 100%;
-    *width: 99.94680851063829%;
-  }
-  .row-fluid .span11 {
-    width: 91.45299145299145%;
-    *width: 91.39979996362975%;
-  }
-  .row-fluid .span10 {
-    width: 82.90598290598291%;
-    *width: 82.8527914166212%;
-  }
-  .row-fluid .span9 {
-    width: 74.35897435897436%;
-    *width: 74.30578286961266%;
-  }
-  .row-fluid .span8 {
-    width: 65.81196581196582%;
-    *width: 65.75877432260411%;
-  }
-  .row-fluid .span7 {
-    width: 57.26495726495726%;
-    *width: 57.21176577559556%;
-  }
-  .row-fluid .span6 {
-    width: 48.717948717948715%;
-    *width: 48.664757228587014%;
-  }
-  .row-fluid .span5 {
-    width: 40.17094017094017%;
-    *width: 40.11774868157847%;
-  }
-  .row-fluid .span4 {
-    width: 31.623931623931625%;
-    *width: 31.570740134569924%;
-  }
-  .row-fluid .span3 {
-    width: 23.076923076923077%;
-    *width: 23.023731587561375%;
-  }
-  .row-fluid .span2 {
-    width: 14.52991452991453%;
-    *width: 14.476723040552828%;
-  }
-  .row-fluid .span1 {
-    width: 5.982905982905983%;
-    *width: 5.929714493544281%;
-  }
-  .row-fluid .offset12 {
-    margin-left: 105.12820512820512%;
-    *margin-left: 105.02182214948171%;
-  }
-  .row-fluid .offset12:first-child {
-    margin-left: 102.56410256410257%;
-    *margin-left: 102.45771958537915%;
-  }
-  .row-fluid .offset11 {
-    margin-left: 96.58119658119658%;
-    *margin-left: 96.47481360247316%;
-  }
-  .row-fluid .offset11:first-child {
-    margin-left: 94.01709401709402%;
-    *margin-left: 93.91071103837061%;
-  }
-  .row-fluid .offset10 {
-    margin-left: 88.03418803418803%;
-    *margin-left: 87.92780505546462%;
-  }
-  .row-fluid .offset10:first-child {
-    margin-left: 85.47008547008548%;
-    *margin-left: 85.36370249136206%;
-  }
-  .row-fluid .offset9 {
-    margin-left: 79.48717948717949%;
-    *margin-left: 79.38079650845607%;
-  }
-  .row-fluid .offset9:first-child {
-    margin-left: 76.92307692307693%;
-    *margin-left: 76.81669394435352%;
-  }
-  .row-fluid .offset8 {
-    margin-left: 70.94017094017094%;
-    *margin-left: 70.83378796144753%;
-  }
-  .row-fluid .offset8:first-child {
-    margin-left: 68.37606837606839%;
-    *margin-left: 68.26968539734497%;
-  }
-  .row-fluid .offset7 {
-    margin-left: 62.393162393162385%;
-    *margin-left: 62.28677941443899%;
-  }
-  .row-fluid .offset7:first-child {
-    margin-left: 59.82905982905982%;
-    *margin-left: 59.72267685033642%;
-  }
-  .row-fluid .offset6 {
-    margin-left: 53.84615384615384%;
-    *margin-left: 53.739770867430444%;
-  }
-  .row-fluid .offset6:first-child {
-    margin-left: 51.28205128205128%;
-    *margin-left: 51.175668303327875%;
-  }
-  .row-fluid .offset5 {
-    margin-left: 45.299145299145295%;
-    *margin-left: 45.1927623204219%;
-  }
-  .row-fluid .offset5:first-child {
-    margin-left: 42.73504273504273%;
-    *margin-left: 42.62865975631933%;
-  }
-  .row-fluid .offset4 {
-    margin-left: 36.75213675213675%;
-    *margin-left: 36.645753773413354%;
-  }
-  .row-fluid .offset4:first-child {
-    margin-left: 34.18803418803419%;
-    *margin-left: 34.081651209310785%;
-  }
-  .row-fluid .offset3 {
-    margin-left: 28.205128205128204%;
-    *margin-left: 28.0987452264048%;
-  }
-  .row-fluid .offset3:first-child {
-    margin-left: 25.641025641025642%;
-    *margin-left: 25.53464266230224%;
-  }
-  .row-fluid .offset2 {
-    margin-left: 19.65811965811966%;
-    *margin-left: 19.551736679396257%;
-  }
-  .row-fluid .offset2:first-child {
-    margin-left: 17.094017094017094%;
-    *margin-left: 16.98763411529369%;
-  }
-  .row-fluid .offset1 {
-    margin-left: 11.11111111111111%;
-    *margin-left: 11.004728132387708%;
-  }
-  .row-fluid .offset1:first-child {
-    margin-left: 8.547008547008547%;
-    *margin-left: 8.440625568285142%;
-  }
-  input,
-  textarea,
-  .uneditable-input {
-    margin-left: 0;
-  }
-  .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 30px;
-  }
-  input.span12,
-  textarea.span12,
-  .uneditable-input.span12 {
-    width: 1156px;
-  }
-  input.span11,
-  textarea.span11,
-  .uneditable-input.span11 {
-    width: 1056px;
-  }
-  input.span10,
-  textarea.span10,
-  .uneditable-input.span10 {
-    width: 956px;
-  }
-  input.span9,
-  textarea.span9,
-  .uneditable-input.span9 {
-    width: 856px;
-  }
-  input.span8,
-  textarea.span8,
-  .uneditable-input.span8 {
-    width: 756px;
-  }
-  input.span7,
-  textarea.span7,
-  .uneditable-input.span7 {
-    width: 656px;
-  }
-  input.span6,
-  textarea.span6,
-  .uneditable-input.span6 {
-    width: 556px;
-  }
-  input.span5,
-  textarea.span5,
-  .uneditable-input.span5 {
-    width: 456px;
-  }
-  input.span4,
-  textarea.span4,
-  .uneditable-input.span4 {
-    width: 356px;
-  }
-  input.span3,
-  textarea.span3,
-  .uneditable-input.span3 {
-    width: 256px;
-  }
-  input.span2,
-  textarea.span2,
-  .uneditable-input.span2 {
-    width: 156px;
-  }
-  input.span1,
-  textarea.span1,
-  .uneditable-input.span1 {
-    width: 56px;
-  }
-  .thumbnails {
-    margin-left: -30px;
-  }
-  .thumbnails > li {
-    margin-left: 30px;
-  }
-  .row-fluid .thumbnails {
-    margin-left: 0;
-  }
-}
-
-@media (min-width: 768px) and (max-width: 979px) {
-  .row {
-    margin-left: -20px;
-    *zoom: 1;
-  }
-  .row:before,
-  .row:after {
-    display: table;
-    line-height: 0;
-    content: "";
-  }
-  .row:after {
-    clear: both;
-  }
-  [class*="span"] {
-    float: left;
-    min-height: 1px;
-    margin-left: 20px;
-  }
-  .container,
-  .navbar-static-top .container,
-  .navbar-fixed-top .container,
-  .navbar-fixed-bottom .container {
-    width: 724px;
-  }
-  .span12 {
-    width: 724px;
-  }
-  .span11 {
-    width: 662px;
-  }
-  .span10 {
-    width: 600px;
-  }
-  .span9 {
-    width: 538px;
-  }
-  .span8 {
-    width: 476px;
-  }
-  .span7 {
-    width: 414px;
-  }
-  .span6 {
-    width: 352px;
-  }
-  .span5 {
-    width: 290px;
-  }
-  .span4 {
-    width: 228px;
-  }
-  .span3 {
-    width: 166px;
-  }
-  .span2 {
-    width: 104px;
-  }
-  .span1 {
-    width: 42px;
-  }
-  .offset12 {
-    margin-left: 764px;
-  }
-  .offset11 {
-    margin-left: 702px;
-  }
-  .offset10 {
-    margin-left: 640px;
-  }
-  .offset9 {
-    margin-left: 578px;
-  }
-  .offset8 {
-    margin-left: 516px;
-  }
-  .offset7 {
-    margin-left: 454px;
-  }
-  .offset6 {
-    margin-left: 392px;
-  }
-  .offset5 {
-    margin-left: 330px;
-  }
-  .offset4 {
-    margin-left: 268px;
-  }
-  .offset3 {
-    margin-left: 206px;
-  }
-  .offset2 {
-    margin-left: 144px;
-  }
-  .offset1 {
-    margin-left: 82px;
-  }
-  .row-fluid {
-    width: 100%;
-    *zoom: 1;
-  }
-  .row-fluid:before,
-  .row-fluid:after {
-    display: table;
-    line-height: 0;
-    content: "";
-  }
-  .row-fluid:after {
-    clear: both;
-  }
-  .row-fluid [class*="span"] {
-    display: block;
-    float: left;
-    width: 100%;
-    min-height: 30px;
-    margin-left: 2.7624309392265194%;
-    *margin-left: 2.709239449864817%;
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-            box-sizing: border-box;
-  }
-  .row-fluid [class*="span"]:first-child {
-    margin-left: 0;
-  }
-  .row-fluid .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 2.7624309392265194%;
-  }
-  .row-fluid .span12 {
-    width: 100%;
-    *width: 99.94680851063829%;
-  }
-  .row-fluid .span11 {
-    width: 91.43646408839778%;
-    *width: 91.38327259903608%;
-  }
-  .row-fluid .span10 {
-    width: 82.87292817679558%;
-    *width: 82.81973668743387%;
-  }
-  .row-fluid .span9 {
-    width: 74.30939226519337%;
-    *width: 74.25620077583166%;
-  }
-  .row-fluid .span8 {
-    width: 65.74585635359117%;
-    *width: 65.69266486422946%;
-  }
-  .row-fluid .span7 {
-    width: 57.18232044198895%;
-    *width: 57.12912895262725%;
-  }
-  .row-fluid .span6 {
-    width: 48.61878453038674%;
-    *width: 48.56559304102504%;
-  }
-  .row-fluid .span5 {
-    width: 40.05524861878453%;
-    *width: 40.00205712942283%;
-  }
-  .row-fluid .span4 {
-    width: 31.491712707182323%;
-    *width: 31.43852121782062%;
-  }
-  .row-fluid .span3 {
-    width: 22.92817679558011%;
-    *width: 22.87498530621841%;
-  }
-  .row-fluid .span2 {
-    width: 14.3646408839779%;
-    *width: 14.311449394616199%;
-  }
-  .row-fluid .span1 {
-    width: 5.801104972375691%;
-    *width: 5.747913483013988%;
-  }
-  .row-fluid .offset12 {
-    margin-left: 105.52486187845304%;
-    *margin-left: 105.41847889972962%;
-  }
-  .row-fluid .offset12:first-child {
-    margin-left: 102.76243093922652%;
-    *margin-left: 102.6560479605031%;
-  }
-  .row-fluid .offset11 {
-    margin-left: 96.96132596685082%;
-    *margin-left: 96.8549429881274%;
-  }
-  .row-fluid .offset11:first-child {
-    margin-left: 94.1988950276243%;
-    *margin-left: 94.09251204890089%;
-  }
-  .row-fluid .offset10 {
-    margin-left: 88.39779005524862%;
-    *margin-left: 88.2914070765252%;
-  }
-  .row-fluid .offset10:first-child {
-    margin-left: 85.6353591160221%;
-    *margin-left: 85.52897613729868%;
-  }
-  .row-fluid .offset9 {
-    margin-left: 79.8342541436464%;
-    *margin-left: 79.72787116492299%;
-  }
-  .row-fluid .offset9:first-child {
-    margin-left: 77.07182320441989%;
-    *margin-left: 76.96544022569647%;
-  }
-  .row-fluid .offset8 {
-    margin-left: 71.2707182320442%;
-    *margin-left: 71.16433525332079%;
-  }
-  .row-fluid .offset8:first-child {
-    margin-left: 68.50828729281768%;
-    *margin-left: 68.40190431409427%;
-  }
-  .row-fluid .offset7 {
-    margin-left: 62.70718232044199%;
-    *margin-left: 62.600799341718584%;
-  }
-  .row-fluid .offset7:first-child {
-    margin-left: 59.94475138121547%;
-    *margin-left: 59.838368402492065%;
-  }
-  .row-fluid .offset6 {
-    margin-left: 54.14364640883978%;
-    *margin-left: 54.037263430116376%;
-  }
-  .row-fluid .offset6:first-child {
-    margin-left: 51.38121546961326%;
-    *margin-left: 51.27483249088986%;
-  }
-  .row-fluid .offset5 {
-    margin-left: 45.58011049723757%;
-    *margin-left: 45.47372751851417%;
-  }
-  .row-fluid .offset5:first-child {
-    margin-left: 42.81767955801105%;
-    *margin-left: 42.71129657928765%;
-  }
-  .row-fluid .offset4 {
-    margin-left: 37.01657458563536%;
-    *margin-left: 36.91019160691196%;
-  }
-  .row-fluid .offset4:first-child {
-    margin-left: 34.25414364640884%;
-    *margin-left: 34.14776066768544%;
-  }
-  .row-fluid .offset3 {
-    margin-left: 28.45303867403315%;
-    *margin-left: 28.346655695309746%;
-  }
-  .row-fluid .offset3:first-child {
-    margin-left: 25.69060773480663%;
-    *margin-left: 25.584224756083227%;
-  }
-  .row-fluid .offset2 {
-    margin-left: 19.88950276243094%;
-    *margin-left: 19.783119783707537%;
-  }
-  .row-fluid .offset2:first-child {
-    margin-left: 17.12707182320442%;
-    *margin-left: 17.02068884448102%;
-  }
-  .row-fluid .offset1 {
-    margin-left: 11.32596685082873%;
-    *margin-left: 11.219583872105325%;
-  }
-  .row-fluid .offset1:first-child {
-    margin-left: 8.56353591160221%;
-    *margin-left: 8.457152932878806%;
-  }
-  input,
-  textarea,
-  .uneditable-input {
-    margin-left: 0;
-  }
-  .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 20px;
-  }
-  input.span12,
-  textarea.span12,
-  .uneditable-input.span12 {
-    width: 710px;
-  }
-  input.span11,
-  textarea.span11,
-  .uneditable-input.span11 {
-    width: 648px;
-  }
-  input.span10,
-  textarea.span10,
-  .uneditable-input.span10 {
-    width: 586px;
-  }
-  input.span9,
-  textarea.span9,
-  .uneditable-input.span9 {
-    width: 524px;
-  }
-  input.span8,
-  textarea.span8,
-  .uneditable-input.span8 {
-    width: 462px;
-  }
-  input.span7,
-  textarea.span7,
-  .uneditable-input.span7 {
-    width: 400px;
-  }
-  input.span6,
-  textarea.span6,
-  .uneditable-input.span6 {
-    width: 338px;
-  }
-  input.span5,
-  textarea.span5,
-  .uneditable-input.span5 {
-    width: 276px;
-  }
-  input.span4,
-  textarea.span4,
-  .uneditable-input.span4 {
-    width: 214px;
-  }
-  input.span3,
-  textarea.span3,
-  .uneditable-input.span3 {
-    width: 152px;
-  }
-  input.span2,
-  textarea.span2,
-  .uneditable-input.span2 {
-    width: 90px;
-  }
-  input.span1,
-  textarea.span1,
-  .uneditable-input.span1 {
-    width: 28px;
-  }
-}
-
-@media (max-width: 767px) {
-  body {
-    padding-right: 20px;
-    padding-left: 20px;
-  }
-  .navbar-fixed-top,
-  .navbar-fixed-bottom,
-  .navbar-static-top {
-    margin-right: -20px;
-    margin-left: -20px;
-  }
-  .container-fluid {
-    padding: 0;
-  }
-  .dl-horizontal dt {
-    float: none;
-    width: auto;
-    clear: none;
-    text-align: left;
-  }
-  .dl-horizontal dd {
-    margin-left: 0;
-  }
-  .container {
-    width: auto;
-  }
-  .row-fluid {
-    width: 100%;
-  }
-  .row,
-  .thumbnails {
-    margin-left: 0;
-  }
-  .thumbnails > li {
-    float: none;
-    margin-left: 0;
-  }
-  [class*="span"],
-  .uneditable-input[class*="span"],
-  .row-fluid [class*="span"] {
-    display: block;
-    float: none;
-    width: 100%;
-    margin-left: 0;
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-            box-sizing: border-box;
-  }
-  .span12,
-  .row-fluid .span12 {
-    width: 100%;
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-            box-sizing: border-box;
-  }
-  .row-fluid [class*="offset"]:first-child {
-    margin-left: 0;
-  }
-  .input-large,
-  .input-xlarge,
-  .input-xxlarge,
-  input[class*="span"],
-  select[class*="span"],
-  textarea[class*="span"],
-  .uneditable-input {
-    display: block;
-    width: 100%;
-    min-height: 30px;
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-            box-sizing: border-box;
-  }
-  .input-prepend input,
-  .input-append input,
-  .input-prepend input[class*="span"],
-  .input-append input[class*="span"] {
-    display: inline-block;
-    width: auto;
-  }
-  .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 0;
-  }
-  .modal {
-    position: fixed;
-    top: 20px;
-    right: 20px;
-    left: 20px;
-    width: auto;
-    margin: 0;
-  }
-  .modal.fade {
-    top: -100px;
-  }
-  .modal.fade.in {
-    top: 20px;
-  }
-}
-
-@media (max-width: 480px) {
-  .nav-collapse {
-    -webkit-transform: translate3d(0, 0, 0);
-  }
-  .page-header h1 small {
-    display: block;
-    line-height: 20px;
-  }
-  input[type="checkbox"],
-  input[type="radio"] {
-    border: 1px solid #ccc;
-  }
-  .form-horizontal .control-label {
-    float: none;
-    width: auto;
-    padding-top: 0;
-    text-align: left;
-  }
-  .form-horizontal .controls {
-    margin-left: 0;
-  }
-  .form-horizontal .control-list {
-    padding-top: 0;
-  }
-  .form-horizontal .form-actions {
-    padding-right: 10px;
-    padding-left: 10px;
-  }
-  .media .pull-left,
-  .media .pull-right {
-    display: block;
-    float: none;
-    margin-bottom: 10px;
-  }
-  .media-object {
-    margin-right: 0;
-    margin-left: 0;
-  }
-  .modal {
-    top: 10px;
-    right: 10px;
-    left: 10px;
-  }
-  .modal-header .close {
-    padding: 10px;
-    margin: -10px;
-  }
-  .carousel-caption {
-    position: static;
-  }
-}
-
-@media (max-width: 979px) {
-  body {
-    padding-top: 0;
-  }
-  .navbar-fixed-top,
-  .navbar-fixed-bottom {
-    position: static;
-  }
-  .navbar-fixed-top {
-    margin-bottom: 20px;
-  }
-  .navbar-fixed-bottom {
-    margin-top: 20px;
-  }
-  .navbar-fixed-top .navbar-inner,
-  .navbar-fixed-bottom .navbar-inner {
-    padding: 5px;
-  }
-  .navbar .container {
-    width: auto;
-    padding: 0;
-  }
-  .navbar .brand {
-    padding-right: 10px;
-    padding-left: 10px;
-    margin: 0 0 0 -5px;
-  }
-  .nav-collapse {
-    clear: both;
-  }
-  .nav-collapse .nav {
-    float: none;
-    margin: 0 0 10px;
-  }
-  .nav-collapse .nav > li {
-    float: none;
-  }
-  .nav-collapse .nav > li > a {
-    margin-bottom: 2px;
-  }
-  .nav-collapse .nav > .divider-vertical {
-    display: none;
-  }
-  .nav-collapse .nav .nav-header {
-    color: #777777;
-    text-shadow: none;
-  }
-  .nav-collapse .nav > li > a,
-  .nav-collapse .dropdown-menu a {
-    padding: 9px 15px;
-    font-weight: bold;
-    color: #777777;
-    -webkit-border-radius: 3px;
-       -moz-border-radius: 3px;
-            border-radius: 3px;
-  }
-  .nav-collapse .btn {
-    padding: 4px 10px 4px;
-    font-weight: normal;
-    -webkit-border-radius: 4px;
-       -moz-border-radius: 4px;
-            border-radius: 4px;
-  }
-  .nav-collapse .dropdown-menu li + li a {
-    margin-bottom: 2px;
-  }
-  .nav-collapse .nav > li > a:hover,
-  .nav-collapse .nav > li > a:focus,
-  .nav-collapse .dropdown-menu a:hover,
-  .nav-collapse .dropdown-menu a:focus {
-    background-color: #f2f2f2;
-  }
-  .navbar-inverse .nav-collapse .nav > li > a,
-  .navbar-inverse .nav-collapse .dropdown-menu a {
-    color: #999999;
-  }
-  .navbar-inverse .nav-collapse .nav > li > a:hover,
-  .navbar-inverse .nav-collapse .nav > li > a:focus,
-  .navbar-inverse .nav-collapse .dropdown-menu a:hover,
-  .navbar-inverse .nav-collapse .dropdown-menu a:focus {
-    background-color: #111111;
-  }
-  .nav-collapse.in .btn-group {
-    padding: 0;
-    margin-top: 5px;
-  }
-  .nav-collapse .dropdown-menu {
-    position: static;
-    top: auto;
-    left: auto;
-    display: none;
-    float: none;
-    max-width: none;
-    padding: 0;
-    margin: 0 15px;
-    background-color: transparent;
-    border: none;
-    -webkit-border-radius: 0;
-       -moz-border-radius: 0;
-            border-radius: 0;
-    -webkit-box-shadow: none;
-       -moz-box-shadow: none;
-            box-shadow: none;
-  }
-  .nav-collapse .open > .dropdown-menu {
-    display: block;
-  }
-  .nav-collapse .dropdown-menu:before,
-  .nav-collapse .dropdown-menu:after {
-    display: none;
-  }
-  .nav-collapse .dropdown-menu .divider {
-    display: none;
-  }
-  .nav-collapse .nav > li > .dropdown-menu:before,
-  .nav-collapse .nav > li > .dropdown-menu:after {
-    display: none;
-  }
-  .nav-collapse .navbar-form,
-  .nav-collapse .navbar-search {
-    float: none;
-    padding: 10px 15px;
-    margin: 10px 0;
-    border-top: 1px solid #f2f2f2;
-    border-bottom: 1px solid #f2f2f2;
-    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-       -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-            box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-  }
-  .navbar-inverse .nav-collapse .navbar-form,
-  .navbar-inverse .nav-collapse .navbar-search {
-    border-top-color: #111111;
-    border-bottom-color: #111111;
-  }
-  .navbar .nav-collapse .nav.pull-right {
-    float: none;
-    margin-left: 0;
-  }
-  .nav-collapse,
-  .nav-collapse.collapse {
-    height: 0;
-    overflow: hidden;
-  }
-  .navbar .btn-navbar {
-    display: block;
-  }
-  .navbar-static .navbar-inner {
-    padding-right: 10px;
-    padding-left: 10px;
-  }
-}
-
-@media (min-width: 980px) {
-  .nav-collapse.collapse {
-    height: auto !important;
-    overflow: visible !important;
-  }
-}
diff --git a/app/css/bootstrap-responsive.min.css b/app/css/bootstrap-responsive.min.css
deleted file mode 100644
index d1b7f4b..0000000
--- a/app/css/bootstrap-responsive.min.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * Bootstrap Responsive v2.3.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}@-ms-viewport{width:device-width}.hidden{display:none;visibility:hidden}.visible-phone{display:none!important}.visible-tablet{display:none!important}.hidden-desktop{display:none!important}.visible-desktop{display:inherit!important}@media(min-width:768px) and (max-width:979px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-tablet{display:inherit!important}.hidden-tablet{display:none!important}}@media(max-width:767px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-phone{display:inherit!important}.hidden-phone{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:inherit!important}.hidden-print{display:none!important}}@media(min-width:1200px){.row{margin-left:-30px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:30px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:1170px}.span12{width:1170px}.span11{width:1070px}.span10{width:970px}.span9{width:870px}.span8{width:770px}.span7{width:670px}.span6{width:570px}.span5{width:470px}.span4{width:370px}.span3{width:270px}.span2{width:170px}.span1{width:70px}.offset12{margin-left:1230px}.offset11{margin-left:1130px}.offset10{margin-left:1030px}.offset9{margin-left:930px}.offset8{margin-left:830px}.offset7{margin-left:730px}.offset6{margin-left:630px}.offset5{margin-left:530px}.offset4{margin-left:430px}.offset3{margin-left:330px}.offset2{margin-left:230px}.offset1{margin-left:130px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.564102564102564%;*margin-left:2.5109110747408616%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.564102564102564%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.45299145299145%;*width:91.39979996362975%}.row-fluid .span10{width:82.90598290598291%;*width:82.8527914166212%}.row-fluid .span9{width:74.35897435897436%;*width:74.30578286961266%}.row-fluid .span8{width:65.81196581196582%;*width:65.75877432260411%}.row-fluid .span7{width:57.26495726495726%;*width:57.21176577559556%}.row-fluid .span6{width:48.717948717948715%;*width:48.664757228587014%}.row-fluid .span5{width:40.17094017094017%;*width:40.11774868157847%}.row-fluid .span4{width:31.623931623931625%;*width:31.570740134569924%}.row-fluid .span3{width:23.076923076923077%;*width:23.023731587561375%}.row-fluid .span2{width:14.52991452991453%;*width:14.476723040552828%}.row-fluid .span1{width:5.982905982905983%;*width:5.929714493544281%}.row-fluid .offset12{margin-left:105.12820512820512%;*margin-left:105.02182214948171%}.row-fluid .offset12:first-child{margin-left:102.56410256410257%;*margin-left:102.45771958537915%}.row-fluid .offset11{margin-left:96.58119658119658%;*margin-left:96.47481360247316%}.row-fluid .offset11:first-child{margin-left:94.01709401709402%;*margin-left:93.91071103837061%}.row-fluid .offset10{margin-left:88.03418803418803%;*margin-left:87.92780505546462%}.row-fluid .offset10:first-child{margin-left:85.47008547008548%;*margin-left:85.36370249136206%}.row-fluid .offset9{margin-left:79.48717948717949%;*margin-left:79.38079650845607%}.row-fluid .offset9:first-child{margin-left:76.92307692307693%;*margin-left:76.81669394435352%}.row-fluid .offset8{margin-left:70.94017094017094%;*margin-left:70.83378796144753%}.row-fluid .offset8:first-child{margin-left:68.37606837606839%;*margin-left:68.26968539734497%}.row-fluid .offset7{margin-left:62.393162393162385%;*margin-left:62.28677941443899%}.row-fluid .offset7:first-child{margin-left:59.82905982905982%;*margin-left:59.72267685033642%}.row-fluid .offset6{margin-left:53.84615384615384%;*margin-left:53.739770867430444%}.row-fluid .offset6:first-child{margin-left:51.28205128205128%;*margin-left:51.175668303327875%}.row-fluid .offset5{margin-left:45.299145299145295%;*margin-left:45.1927623204219%}.row-fluid .offset5:first-child{margin-left:42.73504273504273%;*margin-left:42.62865975631933%}.row-fluid .offset4{margin-left:36.75213675213675%;*margin-left:36.645753773413354%}.row-fluid .offset4:first-child{margin-left:34.18803418803419%;*margin-left:34.081651209310785%}.row-fluid .offset3{margin-left:28.205128205128204%;*margin-left:28.0987452264048%}.row-fluid .offset3:first-child{margin-left:25.641025641025642%;*margin-left:25.53464266230224%}.row-fluid .offset2{margin-left:19.65811965811966%;*margin-left:19.551736679396257%}.row-fluid .offset2:first-child{margin-left:17.094017094017094%;*margin-left:16.98763411529369%}.row-fluid .offset1{margin-left:11.11111111111111%;*margin-left:11.004728132387708%}.row-fluid .offset1:first-child{margin-left:8.547008547008547%;*margin-left:8.440625568285142%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:30px}input.span12,textarea.span12,.uneditable-input.span12{width:1156px}input.span11,textarea.span11,.uneditable-input.span11{width:1056px}input.span10,textarea.span10,.uneditable-input.span10{width:956px}input.span9,textarea.span9,.uneditable-input.span9{width:856px}input.span8,textarea.span8,.uneditable-input.span8{width:756px}input.span7,textarea.span7,.uneditable-input.span7{width:656px}input.span6,textarea.span6,.uneditable-input.span6{width:556px}input.span5,textarea.span5,.uneditable-input.span5{width:456px}input.span4,textarea.span4,.uneditable-input.span4{width:356px}input.span3,textarea.span3,.uneditable-input.span3{width:256px}input.span2,textarea.span2,.uneditable-input.span2{width:156px}input.span1,textarea.span1,.uneditable-input.span1{width:56px}.thumbnails{margin-left:-30px}.thumbnails>li{margin-left:30px}.row-fluid .thumbnails{margin-left:0}}@media(min-width:768px) and (max-width:979px){.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:724px}.span12{width:724px}.span11{width:662px}.span10{width:600px}.span9{width:538px}.span8{width:476px}.span7{width:414px}.span6{width:352px}.span5{width:290px}.span4{width:228px}.span3{width:166px}.span2{width:104px}.span1{width:42px}.offset12{margin-left:764px}.offset11{margin-left:702px}.offset10{margin-left:640px}.offset9{margin-left:578px}.offset8{margin-left:516px}.offset7{margin-left:454px}.offset6{margin-left:392px}.offset5{margin-left:330px}.offset4{margin-left:268px}.offset3{margin-left:206px}.offset2{margin-left:144px}.offset1{margin-left:82px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.7624309392265194%;*margin-left:2.709239449864817%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.7624309392265194%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.43646408839778%;*width:91.38327259903608%}.row-fluid .span10{width:82.87292817679558%;*width:82.81973668743387%}.row-fluid .span9{width:74.30939226519337%;*width:74.25620077583166%}.row-fluid .span8{width:65.74585635359117%;*width:65.69266486422946%}.row-fluid .span7{width:57.18232044198895%;*width:57.12912895262725%}.row-fluid .span6{width:48.61878453038674%;*width:48.56559304102504%}.row-fluid .span5{width:40.05524861878453%;*width:40.00205712942283%}.row-fluid .span4{width:31.491712707182323%;*width:31.43852121782062%}.row-fluid .span3{width:22.92817679558011%;*width:22.87498530621841%}.row-fluid .span2{width:14.3646408839779%;*width:14.311449394616199%}.row-fluid .span1{width:5.801104972375691%;*width:5.747913483013988%}.row-fluid .offset12{margin-left:105.52486187845304%;*margin-left:105.41847889972962%}.row-fluid .offset12:first-child{margin-left:102.76243093922652%;*margin-left:102.6560479605031%}.row-fluid .offset11{margin-left:96.96132596685082%;*margin-left:96.8549429881274%}.row-fluid .offset11:first-child{margin-left:94.1988950276243%;*margin-left:94.09251204890089%}.row-fluid .offset10{margin-left:88.39779005524862%;*margin-left:88.2914070765252%}.row-fluid .offset10:first-child{margin-left:85.6353591160221%;*margin-left:85.52897613729868%}.row-fluid .offset9{margin-left:79.8342541436464%;*margin-left:79.72787116492299%}.row-fluid .offset9:first-child{margin-left:77.07182320441989%;*margin-left:76.96544022569647%}.row-fluid .offset8{margin-left:71.2707182320442%;*margin-left:71.16433525332079%}.row-fluid .offset8:first-child{margin-left:68.50828729281768%;*margin-left:68.40190431409427%}.row-fluid .offset7{margin-left:62.70718232044199%;*margin-left:62.600799341718584%}.row-fluid .offset7:first-child{margin-left:59.94475138121547%;*margin-left:59.838368402492065%}.row-fluid .offset6{margin-left:54.14364640883978%;*margin-left:54.037263430116376%}.row-fluid .offset6:first-child{margin-left:51.38121546961326%;*margin-left:51.27483249088986%}.row-fluid .offset5{margin-left:45.58011049723757%;*margin-left:45.47372751851417%}.row-fluid .offset5:first-child{margin-left:42.81767955801105%;*margin-left:42.71129657928765%}.row-fluid .offset4{margin-left:37.01657458563536%;*margin-left:36.91019160691196%}.row-fluid .offset4:first-child{margin-left:34.25414364640884%;*margin-left:34.14776066768544%}.row-fluid .offset3{margin-left:28.45303867403315%;*margin-left:28.346655695309746%}.row-fluid .offset3:first-child{margin-left:25.69060773480663%;*margin-left:25.584224756083227%}.row-fluid .offset2{margin-left:19.88950276243094%;*margin-left:19.783119783707537%}.row-fluid .offset2:first-child{margin-left:17.12707182320442%;*margin-left:17.02068884448102%}.row-fluid .offset1{margin-left:11.32596685082873%;*margin-left:11.219583872105325%}.row-fluid .offset1:first-child{margin-left:8.56353591160221%;*margin-left:8.457152932878806%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:710px}input.span11,textarea.span11,.uneditable-input.span11{width:648px}input.span10,textarea.span10,.uneditable-input.span10{width:586px}input.span9,textarea.span9,.uneditable-input.span9{width:524px}input.span8,textarea.span8,.uneditable-input.span8{width:462px}input.span7,textarea.span7,.uneditable-input.span7{width:400px}input.span6,textarea.span6,.uneditable-input.span6{width:338px}input.span5,textarea.span5,.uneditable-input.span5{width:276px}input.span4,textarea.span4,.uneditable-input.span4{width:214px}input.span3,textarea.span3,.uneditable-input.span3{width:152px}input.span2,textarea.span2,.uneditable-input.span2{width:90px}input.span1,textarea.span1,.uneditable-input.span1{width:28px}}@media(max-width:767px){body{padding-right:20px;padding-left:20px}.navbar-fixed-top,.navbar-fixed-bottom,.navbar-static-top{margin-right:-20px;margin-left:-20px}.container-fluid{padding:0}.dl-horizontal dt{float:none;width:auto;clear:none;text-align:left}.dl-horizontal dd{margin-left:0}.container{width:auto}.row-fluid{width:100%}.row,.thumbnails{margin-left:0}.thumbnails>li{float:none;margin-left:0}[class*="span"],.uneditable-input[class*="span"],.row-fluid [class*="span"]{display:block;float:none;width:100%;margin-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.span12,.row-fluid .span12{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="offset"]:first-child{margin-left:0}.input-large,.input-xlarge,.input-xxlarge,input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.input-prepend input,.input-append input,.input-prepend input[class*="span"],.input-append input[class*="span"]{display:inline-block;width:auto}.controls-row [class*="span"]+[class*="span"]{margin-left:0}.modal{position:fixed;top:20px;right:20px;left:20px;width:auto;margin:0}.modal.fade{top:-100px}.modal.fade.in{top:20px}}@media(max-width:480px){.nav-collapse{-webkit-transform:translate3d(0,0,0)}.page-header h1 small{display:block;line-height:20px}input[type="checkbox"],input[type="radio"]{border:1px solid #ccc}.form-horizontal .control-label{float:none;width:auto;padding-top:0;text-align:left}.form-horizontal .controls{margin-left:0}.form-horizontal .control-list{padding-top:0}.form-horizontal .form-actions{padding-right:10px;padding-left:10px}.media .pull-left,.media .pull-right{display:block;float:none;margin-bottom:10px}.media-object{margin-right:0;margin-left:0}.modal{top:10px;right:10px;left:10px}.modal-header .close{padding:10px;margin:-10px}.carousel-caption{position:static}}@media(max-width:979px){body{padding-top:0}.navbar-fixed-top,.navbar-fixed-bottom{position:static}.navbar-fixed-top{margin-bottom:20px}.navbar-fixed-bottom{margin-top:20px}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding:5px}.navbar .container{width:auto;padding:0}.navbar .brand{padding-right:10px;padding-left:10px;margin:0 0 0 -5px}.nav-collapse{clear:both}.nav-collapse .nav{float:none;margin:0 0 10px}.nav-collapse .nav>li{float:none}.nav-collapse .nav>li>a{margin-bottom:2px}.nav-collapse .nav>.divider-vertical{display:none}.nav-collapse .nav .nav-header{color:#777;text-shadow:none}.nav-collapse .nav>li>a,.nav-collapse .dropdown-menu a{padding:9px 15px;font-weight:bold;color:#777;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.nav-collapse .btn{padding:4px 10px 4px;font-weight:normal;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.nav-collapse .dropdown-menu li+li a{margin-bottom:2px}.nav-collapse .nav>li>a:hover,.nav-collapse .nav>li>a:focus,.nav-collapse .dropdown-menu a:hover,.nav-collapse .dropdown-menu a:focus{background-color:#f2f2f2}.navbar-inverse .nav-collapse .nav>li>a,.navbar-inverse .nav-collapse .dropdown-menu a{color:#999}.navbar-inverse .nav-collapse .nav>li>a:hover,.navbar-inverse .nav-collapse .nav>li>a:focus,.navbar-inverse .nav-collapse .dropdown-menu a:hover,.navbar-inverse .nav-collapse .dropdown-menu a:focus{background-color:#111}.nav-collapse.in .btn-group{padding:0;margin-top:5px}.nav-collapse .dropdown-menu{position:static;top:auto;left:auto;display:none;float:none;max-width:none;padding:0;margin:0 15px;background-color:transparent;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.nav-collapse .open>.dropdown-menu{display:block}.nav-collapse .dropdown-menu:before,.nav-collapse .dropdown-menu:after{display:none}.nav-collapse .dropdown-menu .divider{display:none}.nav-collapse .nav>li>.dropdown-menu:before,.nav-collapse .nav>li>.dropdown-menu:after{display:none}.nav-collapse .navbar-form,.nav-collapse .navbar-search{float:none;padding:10px 15px;margin:10px 0;border-top:1px solid #f2f2f2;border-bottom:1px solid #f2f2f2;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}.navbar-inverse .nav-collapse .navbar-form,.navbar-inverse .nav-collapse .navbar-search{border-top-color:#111;border-bottom-color:#111}.navbar .nav-collapse .nav.pull-right{float:none;margin-left:0}.nav-collapse,.nav-collapse.collapse{height:0;overflow:hidden}.navbar .btn-navbar{display:block}.navbar-static .navbar-inner{padding-right:10px;padding-left:10px}}@media(min-width:980px){.nav-collapse.collapse{height:auto!important;overflow:visible!important}}
diff --git a/app/css/bootstrap.css b/app/css/bootstrap.css
deleted file mode 100644
index 2f56af3..0000000
--- a/app/css/bootstrap.css
+++ /dev/null
@@ -1,6158 +0,0 @@
-/*!
- * Bootstrap v2.3.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */
-
-.clearfix {
-  *zoom: 1;
-}
-
-.clearfix:before,
-.clearfix:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.clearfix:after {
-  clear: both;
-}
-
-.hide-text {
-  font: 0/0 a;
-  color: transparent;
-  text-shadow: none;
-  background-color: transparent;
-  border: 0;
-}
-
-.input-block-level {
-  display: block;
-  width: 100%;
-  min-height: 30px;
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-}
-
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-nav,
-section {
-  display: block;
-}
-
-audio,
-canvas,
-video {
-  display: inline-block;
-  *display: inline;
-  *zoom: 1;
-}
-
-audio:not([controls]) {
-  display: none;
-}
-
-html {
-  font-size: 100%;
-  -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-}
-
-a:focus {
-  outline: thin dotted #333;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-
-a:hover,
-a:active {
-  outline: 0;
-}
-
-sub,
-sup {
-  position: relative;
-  font-size: 75%;
-  line-height: 0;
-  vertical-align: baseline;
-}
-
-sup {
-  top: -0.5em;
-}
-
-sub {
-  bottom: -0.25em;
-}
-
-img {
-  width: auto\9;
-  height: auto;
-  max-width: 100%;
-  vertical-align: middle;
-  border: 0;
-  -ms-interpolation-mode: bicubic;
-}
-
-#map_canvas img,
-.google-maps img {
-  max-width: none;
-}
-
-button,
-input,
-select,
-textarea {
-  margin: 0;
-  font-size: 100%;
-  vertical-align: middle;
-}
-
-button,
-input {
-  *overflow: visible;
-  line-height: normal;
-}
-
-button::-moz-focus-inner,
-input::-moz-focus-inner {
-  padding: 0;
-  border: 0;
-}
-
-button,
-html input[type="button"],
-input[type="reset"],
-input[type="submit"] {
-  cursor: pointer;
-  -webkit-appearance: button;
-}
-
-label,
-select,
-button,
-input[type="button"],
-input[type="reset"],
-input[type="submit"],
-input[type="radio"],
-input[type="checkbox"] {
-  cursor: pointer;
-}
-
-input[type="search"] {
-  -webkit-box-sizing: content-box;
-     -moz-box-sizing: content-box;
-          box-sizing: content-box;
-  -webkit-appearance: textfield;
-}
-
-input[type="search"]::-webkit-search-decoration,
-input[type="search"]::-webkit-search-cancel-button {
-  -webkit-appearance: none;
-}
-
-textarea {
-  overflow: auto;
-  vertical-align: top;
-}
-
-@media print {
-  * {
-    color: #000 !important;
-    text-shadow: none !important;
-    background: transparent !important;
-    box-shadow: none !important;
-  }
-  a,
-  a:visited {
-    text-decoration: underline;
-  }
-  a[href]:after {
-    content: " (" attr(href) ")";
-  }
-  abbr[title]:after {
-    content: " (" attr(title) ")";
-  }
-  .ir a:after,
-  a[href^="javascript:"]:after,
-  a[href^="#"]:after {
-    content: "";
-  }
-  pre,
-  blockquote {
-    border: 1px solid #999;
-    page-break-inside: avoid;
-  }
-  thead {
-    display: table-header-group;
-  }
-  tr,
-  img {
-    page-break-inside: avoid;
-  }
-  img {
-    max-width: 100% !important;
-  }
-  @page  {
-    margin: 0.5cm;
-  }
-  p,
-  h2,
-  h3 {
-    orphans: 3;
-    widows: 3;
-  }
-  h2,
-  h3 {
-    page-break-after: avoid;
-  }
-}
-
-body {
-  margin: 0;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 14px;
-  line-height: 20px;
-  color: #333333;
-  background-color: #ffffff;
-}
-
-a {
-  color: #0088cc;
-  text-decoration: none;
-}
-
-a:hover,
-a:focus {
-  color: #005580;
-  text-decoration: underline;
-}
-
-.img-rounded {
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-}
-
-.img-polaroid {
-  padding: 4px;
-  background-color: #fff;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-     -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-          box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-}
-
-.img-circle {
-  -webkit-border-radius: 500px;
-     -moz-border-radius: 500px;
-          border-radius: 500px;
-}
-
-.row {
-  margin-left: -20px;
-  *zoom: 1;
-}
-
-.row:before,
-.row:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.row:after {
-  clear: both;
-}
-
-[class*="span"] {
-  float: left;
-  min-height: 1px;
-  margin-left: 20px;
-}
-
-.container,
-.navbar-static-top .container,
-.navbar-fixed-top .container,
-.navbar-fixed-bottom .container {
-  width: 940px;
-}
-
-.span12 {
-  width: 940px;
-}
-
-.span11 {
-  width: 860px;
-}
-
-.span10 {
-  width: 780px;
-}
-
-.span9 {
-  width: 700px;
-}
-
-.span8 {
-  width: 620px;
-}
-
-.span7 {
-  width: 540px;
-}
-
-.span6 {
-  width: 460px;
-}
-
-.span5 {
-  width: 380px;
-}
-
-.span4 {
-  width: 300px;
-}
-
-.span3 {
-  width: 220px;
-}
-
-.span2 {
-  width: 140px;
-}
-
-.span1 {
-  width: 60px;
-}
-
-.offset12 {
-  margin-left: 980px;
-}
-
-.offset11 {
-  margin-left: 900px;
-}
-
-.offset10 {
-  margin-left: 820px;
-}
-
-.offset9 {
-  margin-left: 740px;
-}
-
-.offset8 {
-  margin-left: 660px;
-}
-
-.offset7 {
-  margin-left: 580px;
-}
-
-.offset6 {
-  margin-left: 500px;
-}
-
-.offset5 {
-  margin-left: 420px;
-}
-
-.offset4 {
-  margin-left: 340px;
-}
-
-.offset3 {
-  margin-left: 260px;
-}
-
-.offset2 {
-  margin-left: 180px;
-}
-
-.offset1 {
-  margin-left: 100px;
-}
-
-.row-fluid {
-  width: 100%;
-  *zoom: 1;
-}
-
-.row-fluid:before,
-.row-fluid:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.row-fluid:after {
-  clear: both;
-}
-
-.row-fluid [class*="span"] {
-  display: block;
-  float: left;
-  width: 100%;
-  min-height: 30px;
-  margin-left: 2.127659574468085%;
-  *margin-left: 2.074468085106383%;
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-}
-
-.row-fluid [class*="span"]:first-child {
-  margin-left: 0;
-}
-
-.row-fluid .controls-row [class*="span"] + [class*="span"] {
-  margin-left: 2.127659574468085%;
-}
-
-.row-fluid .span12 {
-  width: 100%;
-  *width: 99.94680851063829%;
-}
-
-.row-fluid .span11 {
-  width: 91.48936170212765%;
-  *width: 91.43617021276594%;
-}
-
-.row-fluid .span10 {
-  width: 82.97872340425532%;
-  *width: 82.92553191489361%;
-}
-
-.row-fluid .span9 {
-  width: 74.46808510638297%;
-  *width: 74.41489361702126%;
-}
-
-.row-fluid .span8 {
-  width: 65.95744680851064%;
-  *width: 65.90425531914893%;
-}
-
-.row-fluid .span7 {
-  width: 57.44680851063829%;
-  *width: 57.39361702127659%;
-}
-
-.row-fluid .span6 {
-  width: 48.93617021276595%;
-  *width: 48.88297872340425%;
-}
-
-.row-fluid .span5 {
-  width: 40.42553191489362%;
-  *width: 40.37234042553192%;
-}
-
-.row-fluid .span4 {
-  width: 31.914893617021278%;
-  *width: 31.861702127659576%;
-}
-
-.row-fluid .span3 {
-  width: 23.404255319148934%;
-  *width: 23.351063829787233%;
-}
-
-.row-fluid .span2 {
-  width: 14.893617021276595%;
-  *width: 14.840425531914894%;
-}
-
-.row-fluid .span1 {
-  width: 6.382978723404255%;
-  *width: 6.329787234042553%;
-}
-
-.row-fluid .offset12 {
-  margin-left: 104.25531914893617%;
-  *margin-left: 104.14893617021275%;
-}
-
-.row-fluid .offset12:first-child {
-  margin-left: 102.12765957446808%;
-  *margin-left: 102.02127659574467%;
-}
-
-.row-fluid .offset11 {
-  margin-left: 95.74468085106382%;
-  *margin-left: 95.6382978723404%;
-}
-
-.row-fluid .offset11:first-child {
-  margin-left: 93.61702127659574%;
-  *margin-left: 93.51063829787232%;
-}
-
-.row-fluid .offset10 {
-  margin-left: 87.23404255319149%;
-  *margin-left: 87.12765957446807%;
-}
-
-.row-fluid .offset10:first-child {
-  margin-left: 85.1063829787234%;
-  *margin-left: 84.99999999999999%;
-}
-
-.row-fluid .offset9 {
-  margin-left: 78.72340425531914%;
-  *margin-left: 78.61702127659572%;
-}
-
-.row-fluid .offset9:first-child {
-  margin-left: 76.59574468085106%;
-  *margin-left: 76.48936170212764%;
-}
-
-.row-fluid .offset8 {
-  margin-left: 70.2127659574468%;
-  *margin-left: 70.10638297872339%;
-}
-
-.row-fluid .offset8:first-child {
-  margin-left: 68.08510638297872%;
-  *margin-left: 67.9787234042553%;
-}
-
-.row-fluid .offset7 {
-  margin-left: 61.70212765957446%;
-  *margin-left: 61.59574468085106%;
-}
-
-.row-fluid .offset7:first-child {
-  margin-left: 59.574468085106375%;
-  *margin-left: 59.46808510638297%;
-}
-
-.row-fluid .offset6 {
-  margin-left: 53.191489361702125%;
-  *margin-left: 53.085106382978715%;
-}
-
-.row-fluid .offset6:first-child {
-  margin-left: 51.063829787234035%;
-  *margin-left: 50.95744680851063%;
-}
-
-.row-fluid .offset5 {
-  margin-left: 44.68085106382979%;
-  *margin-left: 44.57446808510638%;
-}
-
-.row-fluid .offset5:first-child {
-  margin-left: 42.5531914893617%;
-  *margin-left: 42.4468085106383%;
-}
-
-.row-fluid .offset4 {
-  margin-left: 36.170212765957444%;
-  *margin-left: 36.06382978723405%;
-}
-
-.row-fluid .offset4:first-child {
-  margin-left: 34.04255319148936%;
-  *margin-left: 33.93617021276596%;
-}
-
-.row-fluid .offset3 {
-  margin-left: 27.659574468085104%;
-  *margin-left: 27.5531914893617%;
-}
-
-.row-fluid .offset3:first-child {
-  margin-left: 25.53191489361702%;
-  *margin-left: 25.425531914893618%;
-}
-
-.row-fluid .offset2 {
-  margin-left: 19.148936170212764%;
-  *margin-left: 19.04255319148936%;
-}
-
-.row-fluid .offset2:first-child {
-  margin-left: 17.02127659574468%;
-  *margin-left: 16.914893617021278%;
-}
-
-.row-fluid .offset1 {
-  margin-left: 10.638297872340425%;
-  *margin-left: 10.53191489361702%;
-}
-
-.row-fluid .offset1:first-child {
-  margin-left: 8.51063829787234%;
-  *margin-left: 8.404255319148938%;
-}
-
-[class*="span"].hide,
-.row-fluid [class*="span"].hide {
-  display: none;
-}
-
-[class*="span"].pull-right,
-.row-fluid [class*="span"].pull-right {
-  float: right;
-}
-
-.container {
-  margin-right: auto;
-  margin-left: auto;
-  *zoom: 1;
-}
-
-.container:before,
-.container:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.container:after {
-  clear: both;
-}
-
-.container-fluid {
-  padding-right: 20px;
-  padding-left: 20px;
-  *zoom: 1;
-}
-
-.container-fluid:before,
-.container-fluid:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.container-fluid:after {
-  clear: both;
-}
-
-p {
-  margin: 0 0 10px;
-}
-
-.lead {
-  margin-bottom: 20px;
-  font-size: 21px;
-  font-weight: 200;
-  line-height: 30px;
-}
-
-small {
-  font-size: 85%;
-}
-
-strong {
-  font-weight: bold;
-}
-
-em {
-  font-style: italic;
-}
-
-cite {
-  font-style: normal;
-}
-
-.muted {
-  color: #999999;
-}
-
-a.muted:hover,
-a.muted:focus {
-  color: #808080;
-}
-
-.text-warning {
-  color: #c09853;
-}
-
-a.text-warning:hover,
-a.text-warning:focus {
-  color: #a47e3c;
-}
-
-.text-error {
-  color: #b94a48;
-}
-
-a.text-error:hover,
-a.text-error:focus {
-  color: #953b39;
-}
-
-.text-info {
-  color: #3a87ad;
-}
-
-a.text-info:hover,
-a.text-info:focus {
-  color: #2d6987;
-}
-
-.text-success {
-  color: #468847;
-}
-
-a.text-success:hover,
-a.text-success:focus {
-  color: #356635;
-}
-
-.text-left {
-  text-align: left;
-}
-
-.text-right {
-  text-align: right;
-}
-
-.text-center {
-  text-align: center;
-}
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  margin: 10px 0;
-  font-family: inherit;
-  font-weight: bold;
-  line-height: 20px;
-  color: inherit;
-  text-rendering: optimizelegibility;
-}
-
-h1 small,
-h2 small,
-h3 small,
-h4 small,
-h5 small,
-h6 small {
-  font-weight: normal;
-  line-height: 1;
-  color: #999999;
-}
-
-h1,
-h2,
-h3 {
-  line-height: 40px;
-}
-
-h1 {
-  font-size: 38.5px;
-}
-
-h2 {
-  font-size: 31.5px;
-}
-
-h3 {
-  font-size: 24.5px;
-}
-
-h4 {
-  font-size: 17.5px;
-}
-
-h5 {
-  font-size: 14px;
-}
-
-h6 {
-  font-size: 11.9px;
-}
-
-h1 small {
-  font-size: 24.5px;
-}
-
-h2 small {
-  font-size: 17.5px;
-}
-
-h3 small {
-  font-size: 14px;
-}
-
-h4 small {
-  font-size: 14px;
-}
-
-.page-header {
-  padding-bottom: 9px;
-  margin: 20px 0 30px;
-  border-bottom: 1px solid #eeeeee;
-}
-
-ul,
-ol {
-  padding: 0;
-  margin: 0 0 10px 25px;
-}
-
-ul ul,
-ul ol,
-ol ol,
-ol ul {
-  margin-bottom: 0;
-}
-
-li {
-  line-height: 20px;
-}
-
-ul.unstyled,
-ol.unstyled {
-  margin-left: 0;
-  list-style: none;
-}
-
-ul.inline,
-ol.inline {
-  margin-left: 0;
-  list-style: none;
-}
-
-ul.inline > li,
-ol.inline > li {
-  display: inline-block;
-  *display: inline;
-  padding-right: 5px;
-  padding-left: 5px;
-  *zoom: 1;
-}
-
-dl {
-  margin-bottom: 20px;
-}
-
-dt,
-dd {
-  line-height: 20px;
-}
-
-dt {
-  font-weight: bold;
-}
-
-dd {
-  margin-left: 10px;
-}
-
-.dl-horizontal {
-  *zoom: 1;
-}
-
-.dl-horizontal:before,
-.dl-horizontal:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.dl-horizontal:after {
-  clear: both;
-}
-
-.dl-horizontal dt {
-  float: left;
-  width: 160px;
-  overflow: hidden;
-  clear: left;
-  text-align: right;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.dl-horizontal dd {
-  margin-left: 180px;
-}
-
-hr {
-  margin: 20px 0;
-  border: 0;
-  border-top: 1px solid #eeeeee;
-  border-bottom: 1px solid #ffffff;
-}
-
-abbr[title],
-abbr[data-original-title] {
-  cursor: help;
-  border-bottom: 1px dotted #999999;
-}
-
-abbr.initialism {
-  font-size: 90%;
-  text-transform: uppercase;
-}
-
-blockquote {
-  padding: 0 0 0 15px;
-  margin: 0 0 20px;
-  border-left: 5px solid #eeeeee;
-}
-
-blockquote p {
-  margin-bottom: 0;
-  font-size: 17.5px;
-  font-weight: 300;
-  line-height: 1.25;
-}
-
-blockquote small {
-  display: block;
-  line-height: 20px;
-  color: #999999;
-}
-
-blockquote small:before {
-  content: '\2014 \00A0';
-}
-
-blockquote.pull-right {
-  float: right;
-  padding-right: 15px;
-  padding-left: 0;
-  border-right: 5px solid #eeeeee;
-  border-left: 0;
-}
-
-blockquote.pull-right p,
-blockquote.pull-right small {
-  text-align: right;
-}
-
-blockquote.pull-right small:before {
-  content: '';
-}
-
-blockquote.pull-right small:after {
-  content: '\00A0 \2014';
-}
-
-q:before,
-q:after,
-blockquote:before,
-blockquote:after {
-  content: "";
-}
-
-address {
-  display: block;
-  margin-bottom: 20px;
-  font-style: normal;
-  line-height: 20px;
-}
-
-code,
-pre {
-  padding: 0 3px 2px;
-  font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
-  font-size: 12px;
-  color: #333333;
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-          border-radius: 3px;
-}
-
-code {
-  padding: 2px 4px;
-  color: #d14;
-  white-space: nowrap;
-  background-color: #f7f7f9;
-  border: 1px solid #e1e1e8;
-}
-
-pre {
-  display: block;
-  padding: 9.5px;
-  margin: 0 0 10px;
-  font-size: 13px;
-  line-height: 20px;
-  word-break: break-all;
-  word-wrap: break-word;
-  white-space: pre;
-  white-space: pre-wrap;
-  background-color: #f5f5f5;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-pre.prettyprint {
-  margin-bottom: 20px;
-}
-
-pre code {
-  padding: 0;
-  color: inherit;
-  white-space: pre;
-  white-space: pre-wrap;
-  background-color: transparent;
-  border: 0;
-}
-
-.pre-scrollable {
-  max-height: 340px;
-  overflow-y: scroll;
-}
-
-form {
-  margin: 0 0 20px;
-}
-
-fieldset {
-  padding: 0;
-  margin: 0;
-  border: 0;
-}
-
-legend {
-  display: block;
-  width: 100%;
-  padding: 0;
-  margin-bottom: 20px;
-  font-size: 21px;
-  line-height: 40px;
-  color: #333333;
-  border: 0;
-  border-bottom: 1px solid #e5e5e5;
-}
-
-legend small {
-  font-size: 15px;
-  color: #999999;
-}
-
-label,
-input,
-button,
-select,
-textarea {
-  font-size: 14px;
-  font-weight: normal;
-  line-height: 20px;
-}
-
-input,
-button,
-select,
-textarea {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-
-label {
-  display: block;
-  margin-bottom: 5px;
-}
-
-select,
-textarea,
-input[type="text"],
-input[type="password"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="date"],
-input[type="month"],
-input[type="time"],
-input[type="week"],
-input[type="number"],
-input[type="email"],
-input[type="url"],
-input[type="search"],
-input[type="tel"],
-input[type="color"],
-.uneditable-input {
-  display: inline-block;
-  height: 20px;
-  padding: 4px 6px;
-  margin-bottom: 10px;
-  font-size: 14px;
-  line-height: 20px;
-  color: #555555;
-  vertical-align: middle;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-input,
-textarea,
-.uneditable-input {
-  width: 206px;
-}
-
-textarea {
-  height: auto;
-}
-
-textarea,
-input[type="text"],
-input[type="password"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="date"],
-input[type="month"],
-input[type="time"],
-input[type="week"],
-input[type="number"],
-input[type="email"],
-input[type="url"],
-input[type="search"],
-input[type="tel"],
-input[type="color"],
-.uneditable-input {
-  background-color: #ffffff;
-  border: 1px solid #cccccc;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
-     -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
-       -o-transition: border linear 0.2s, box-shadow linear 0.2s;
-          transition: border linear 0.2s, box-shadow linear 0.2s;
-}
-
-textarea:focus,
-input[type="text"]:focus,
-input[type="password"]:focus,
-input[type="datetime"]:focus,
-input[type="datetime-local"]:focus,
-input[type="date"]:focus,
-input[type="month"]:focus,
-input[type="time"]:focus,
-input[type="week"]:focus,
-input[type="number"]:focus,
-input[type="email"]:focus,
-input[type="url"]:focus,
-input[type="search"]:focus,
-input[type="tel"]:focus,
-input[type="color"]:focus,
-.uneditable-input:focus {
-  border-color: rgba(82, 168, 236, 0.8);
-  outline: 0;
-  outline: thin dotted \9;
-  /* IE6-9 */
-
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-}
-
-input[type="radio"],
-input[type="checkbox"] {
-  margin: 4px 0 0;
-  margin-top: 1px \9;
-  *margin-top: 0;
-  line-height: normal;
-}
-
-input[type="file"],
-input[type="image"],
-input[type="submit"],
-input[type="reset"],
-input[type="button"],
-input[type="radio"],
-input[type="checkbox"] {
-  width: auto;
-}
-
-select,
-input[type="file"] {
-  height: 30px;
-  /* In IE7, the height of the select element cannot be changed by height, only font-size */
-
-  *margin-top: 4px;
-  /* For IE7, add top margin to align select with labels */
-
-  line-height: 30px;
-}
-
-select {
-  width: 220px;
-  background-color: #ffffff;
-  border: 1px solid #cccccc;
-}
-
-select[multiple],
-select[size] {
-  height: auto;
-}
-
-select:focus,
-input[type="file"]:focus,
-input[type="radio"]:focus,
-input[type="checkbox"]:focus {
-  outline: thin dotted #333;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-
-.uneditable-input,
-.uneditable-textarea {
-  color: #999999;
-  cursor: not-allowed;
-  background-color: #fcfcfc;
-  border-color: #cccccc;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-}
-
-.uneditable-input {
-  overflow: hidden;
-  white-space: nowrap;
-}
-
-.uneditable-textarea {
-  width: auto;
-  height: auto;
-}
-
-input:-moz-placeholder,
-textarea:-moz-placeholder {
-  color: #999999;
-}
-
-input:-ms-input-placeholder,
-textarea:-ms-input-placeholder {
-  color: #999999;
-}
-
-input::-webkit-input-placeholder,
-textarea::-webkit-input-placeholder {
-  color: #999999;
-}
-
-.radio,
-.checkbox {
-  min-height: 20px;
-  padding-left: 20px;
-}
-
-.radio input[type="radio"],
-.checkbox input[type="checkbox"] {
-  float: left;
-  margin-left: -20px;
-}
-
-.controls > .radio:first-child,
-.controls > .checkbox:first-child {
-  padding-top: 5px;
-}
-
-.radio.inline,
-.checkbox.inline {
-  display: inline-block;
-  padding-top: 5px;
-  margin-bottom: 0;
-  vertical-align: middle;
-}
-
-.radio.inline + .radio.inline,
-.checkbox.inline + .checkbox.inline {
-  margin-left: 10px;
-}
-
-.input-mini {
-  width: 60px;
-}
-
-.input-small {
-  width: 90px;
-}
-
-.input-medium {
-  width: 150px;
-}
-
-.input-large {
-  width: 210px;
-}
-
-.input-xlarge {
-  width: 270px;
-}
-
-.input-xxlarge {
-  width: 530px;
-}
-
-input[class*="span"],
-select[class*="span"],
-textarea[class*="span"],
-.uneditable-input[class*="span"],
-.row-fluid input[class*="span"],
-.row-fluid select[class*="span"],
-.row-fluid textarea[class*="span"],
-.row-fluid .uneditable-input[class*="span"] {
-  float: none;
-  margin-left: 0;
-}
-
-.input-append input[class*="span"],
-.input-append .uneditable-input[class*="span"],
-.input-prepend input[class*="span"],
-.input-prepend .uneditable-input[class*="span"],
-.row-fluid input[class*="span"],
-.row-fluid select[class*="span"],
-.row-fluid textarea[class*="span"],
-.row-fluid .uneditable-input[class*="span"],
-.row-fluid .input-prepend [class*="span"],
-.row-fluid .input-append [class*="span"] {
-  display: inline-block;
-}
-
-input,
-textarea,
-.uneditable-input {
-  margin-left: 0;
-}
-
-.controls-row [class*="span"] + [class*="span"] {
-  margin-left: 20px;
-}
-
-input.span12,
-textarea.span12,
-.uneditable-input.span12 {
-  width: 926px;
-}
-
-input.span11,
-textarea.span11,
-.uneditable-input.span11 {
-  width: 846px;
-}
-
-input.span10,
-textarea.span10,
-.uneditable-input.span10 {
-  width: 766px;
-}
-
-input.span9,
-textarea.span9,
-.uneditable-input.span9 {
-  width: 686px;
-}
-
-input.span8,
-textarea.span8,
-.uneditable-input.span8 {
-  width: 606px;
-}
-
-input.span7,
-textarea.span7,
-.uneditable-input.span7 {
-  width: 526px;
-}
-
-input.span6,
-textarea.span6,
-.uneditable-input.span6 {
-  width: 446px;
-}
-
-input.span5,
-textarea.span5,
-.uneditable-input.span5 {
-  width: 366px;
-}
-
-input.span4,
-textarea.span4,
-.uneditable-input.span4 {
-  width: 286px;
-}
-
-input.span3,
-textarea.span3,
-.uneditable-input.span3 {
-  width: 206px;
-}
-
-input.span2,
-textarea.span2,
-.uneditable-input.span2 {
-  width: 126px;
-}
-
-input.span1,
-textarea.span1,
-.uneditable-input.span1 {
-  width: 46px;
-}
-
-.controls-row {
-  *zoom: 1;
-}
-
-.controls-row:before,
-.controls-row:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.controls-row:after {
-  clear: both;
-}
-
-.controls-row [class*="span"],
-.row-fluid .controls-row [class*="span"] {
-  float: left;
-}
-
-.controls-row .checkbox[class*="span"],
-.controls-row .radio[class*="span"] {
-  padding-top: 5px;
-}
-
-input[disabled],
-select[disabled],
-textarea[disabled],
-input[readonly],
-select[readonly],
-textarea[readonly] {
-  cursor: not-allowed;
-  background-color: #eeeeee;
-}
-
-input[type="radio"][disabled],
-input[type="checkbox"][disabled],
-input[type="radio"][readonly],
-input[type="checkbox"][readonly] {
-  background-color: transparent;
-}
-
-.control-group.warning .control-label,
-.control-group.warning .help-block,
-.control-group.warning .help-inline {
-  color: #c09853;
-}
-
-.control-group.warning .checkbox,
-.control-group.warning .radio,
-.control-group.warning input,
-.control-group.warning select,
-.control-group.warning textarea {
-  color: #c09853;
-}
-
-.control-group.warning input,
-.control-group.warning select,
-.control-group.warning textarea {
-  border-color: #c09853;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-
-.control-group.warning input:focus,
-.control-group.warning select:focus,
-.control-group.warning textarea:focus {
-  border-color: #a47e3c;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
-}
-
-.control-group.warning .input-prepend .add-on,
-.control-group.warning .input-append .add-on {
-  color: #c09853;
-  background-color: #fcf8e3;
-  border-color: #c09853;
-}
-
-.control-group.error .control-label,
-.control-group.error .help-block,
-.control-group.error .help-inline {
-  color: #b94a48;
-}
-
-.control-group.error .checkbox,
-.control-group.error .radio,
-.control-group.error input,
-.control-group.error select,
-.control-group.error textarea {
-  color: #b94a48;
-}
-
-.control-group.error input,
-.control-group.error select,
-.control-group.error textarea {
-  border-color: #b94a48;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-
-.control-group.error input:focus,
-.control-group.error select:focus,
-.control-group.error textarea:focus {
-  border-color: #953b39;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
-}
-
-.control-group.error .input-prepend .add-on,
-.control-group.error .input-append .add-on {
-  color: #b94a48;
-  background-color: #f2dede;
-  border-color: #b94a48;
-}
-
-.control-group.success .control-label,
-.control-group.success .help-block,
-.control-group.success .help-inline {
-  color: #468847;
-}
-
-.control-group.success .checkbox,
-.control-group.success .radio,
-.control-group.success input,
-.control-group.success select,
-.control-group.success textarea {
-  color: #468847;
-}
-
-.control-group.success input,
-.control-group.success select,
-.control-group.success textarea {
-  border-color: #468847;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-
-.control-group.success input:focus,
-.control-group.success select:focus,
-.control-group.success textarea:focus {
-  border-color: #356635;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-}
-
-.control-group.success .input-prepend .add-on,
-.control-group.success .input-append .add-on {
-  color: #468847;
-  background-color: #dff0d8;
-  border-color: #468847;
-}
-
-.control-group.info .control-label,
-.control-group.info .help-block,
-.control-group.info .help-inline {
-  color: #3a87ad;
-}
-
-.control-group.info .checkbox,
-.control-group.info .radio,
-.control-group.info input,
-.control-group.info select,
-.control-group.info textarea {
-  color: #3a87ad;
-}
-
-.control-group.info input,
-.control-group.info select,
-.control-group.info textarea {
-  border-color: #3a87ad;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-
-.control-group.info input:focus,
-.control-group.info select:focus,
-.control-group.info textarea:focus {
-  border-color: #2d6987;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
-}
-
-.control-group.info .input-prepend .add-on,
-.control-group.info .input-append .add-on {
-  color: #3a87ad;
-  background-color: #d9edf7;
-  border-color: #3a87ad;
-}
-
-input:focus:invalid,
-textarea:focus:invalid,
-select:focus:invalid {
-  color: #b94a48;
-  border-color: #ee5f5b;
-}
-
-input:focus:invalid:focus,
-textarea:focus:invalid:focus,
-select:focus:invalid:focus {
-  border-color: #e9322d;
-  -webkit-box-shadow: 0 0 6px #f8b9b7;
-     -moz-box-shadow: 0 0 6px #f8b9b7;
-          box-shadow: 0 0 6px #f8b9b7;
-}
-
-.form-actions {
-  padding: 19px 20px 20px;
-  margin-top: 20px;
-  margin-bottom: 20px;
-  background-color: #f5f5f5;
-  border-top: 1px solid #e5e5e5;
-  *zoom: 1;
-}
-
-.form-actions:before,
-.form-actions:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.form-actions:after {
-  clear: both;
-}
-
-.help-block,
-.help-inline {
-  color: #595959;
-}
-
-.help-block {
-  display: block;
-  margin-bottom: 10px;
-}
-
-.help-inline {
-  display: inline-block;
-  *display: inline;
-  padding-left: 5px;
-  vertical-align: middle;
-  *zoom: 1;
-}
-
-.input-append,
-.input-prepend {
-  display: inline-block;
-  margin-bottom: 10px;
-  font-size: 0;
-  white-space: nowrap;
-  vertical-align: middle;
-}
-
-.input-append input,
-.input-prepend input,
-.input-append select,
-.input-prepend select,
-.input-append .uneditable-input,
-.input-prepend .uneditable-input,
-.input-append .dropdown-menu,
-.input-prepend .dropdown-menu,
-.input-append .popover,
-.input-prepend .popover {
-  font-size: 14px;
-}
-
-.input-append input,
-.input-prepend input,
-.input-append select,
-.input-prepend select,
-.input-append .uneditable-input,
-.input-prepend .uneditable-input {
-  position: relative;
-  margin-bottom: 0;
-  *margin-left: 0;
-  vertical-align: top;
-  -webkit-border-radius: 0 4px 4px 0;
-     -moz-border-radius: 0 4px 4px 0;
-          border-radius: 0 4px 4px 0;
-}
-
-.input-append input:focus,
-.input-prepend input:focus,
-.input-append select:focus,
-.input-prepend select:focus,
-.input-append .uneditable-input:focus,
-.input-prepend .uneditable-input:focus {
-  z-index: 2;
-}
-
-.input-append .add-on,
-.input-prepend .add-on {
-  display: inline-block;
-  width: auto;
-  height: 20px;
-  min-width: 16px;
-  padding: 4px 5px;
-  font-size: 14px;
-  font-weight: normal;
-  line-height: 20px;
-  text-align: center;
-  text-shadow: 0 1px 0 #ffffff;
-  background-color: #eeeeee;
-  border: 1px solid #ccc;
-}
-
-.input-append .add-on,
-.input-prepend .add-on,
-.input-append .btn,
-.input-prepend .btn,
-.input-append .btn-group > .dropdown-toggle,
-.input-prepend .btn-group > .dropdown-toggle {
-  vertical-align: top;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.input-append .active,
-.input-prepend .active {
-  background-color: #a9dba9;
-  border-color: #46a546;
-}
-
-.input-prepend .add-on,
-.input-prepend .btn {
-  margin-right: -1px;
-}
-
-.input-prepend .add-on:first-child,
-.input-prepend .btn:first-child {
-  -webkit-border-radius: 4px 0 0 4px;
-     -moz-border-radius: 4px 0 0 4px;
-          border-radius: 4px 0 0 4px;
-}
-
-.input-append input,
-.input-append select,
-.input-append .uneditable-input {
-  -webkit-border-radius: 4px 0 0 4px;
-     -moz-border-radius: 4px 0 0 4px;
-          border-radius: 4px 0 0 4px;
-}
-
-.input-append input + .btn-group .btn:last-child,
-.input-append select + .btn-group .btn:last-child,
-.input-append .uneditable-input + .btn-group .btn:last-child {
-  -webkit-border-radius: 0 4px 4px 0;
-     -moz-border-radius: 0 4px 4px 0;
-          border-radius: 0 4px 4px 0;
-}
-
-.input-append .add-on,
-.input-append .btn,
-.input-append .btn-group {
-  margin-left: -1px;
-}
-
-.input-append .add-on:last-child,
-.input-append .btn:last-child,
-.input-append .btn-group:last-child > .dropdown-toggle {
-  -webkit-border-radius: 0 4px 4px 0;
-     -moz-border-radius: 0 4px 4px 0;
-          border-radius: 0 4px 4px 0;
-}
-
-.input-prepend.input-append input,
-.input-prepend.input-append select,
-.input-prepend.input-append .uneditable-input {
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.input-prepend.input-append input + .btn-group .btn,
-.input-prepend.input-append select + .btn-group .btn,
-.input-prepend.input-append .uneditable-input + .btn-group .btn {
-  -webkit-border-radius: 0 4px 4px 0;
-     -moz-border-radius: 0 4px 4px 0;
-          border-radius: 0 4px 4px 0;
-}
-
-.input-prepend.input-append .add-on:first-child,
-.input-prepend.input-append .btn:first-child {
-  margin-right: -1px;
-  -webkit-border-radius: 4px 0 0 4px;
-     -moz-border-radius: 4px 0 0 4px;
-          border-radius: 4px 0 0 4px;
-}
-
-.input-prepend.input-append .add-on:last-child,
-.input-prepend.input-append .btn:last-child {
-  margin-left: -1px;
-  -webkit-border-radius: 0 4px 4px 0;
-     -moz-border-radius: 0 4px 4px 0;
-          border-radius: 0 4px 4px 0;
-}
-
-.input-prepend.input-append .btn-group:first-child {
-  margin-left: 0;
-}
-
-input.search-query {
-  padding-right: 14px;
-  padding-right: 4px \9;
-  padding-left: 14px;
-  padding-left: 4px \9;
-  /* IE7-8 doesn't have border-radius, so don't indent the padding */
-
-  margin-bottom: 0;
-  -webkit-border-radius: 15px;
-     -moz-border-radius: 15px;
-          border-radius: 15px;
-}
-
-/* Allow for input prepend/append in search forms */
-
-.form-search .input-append .search-query,
-.form-search .input-prepend .search-query {
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.form-search .input-append .search-query {
-  -webkit-border-radius: 14px 0 0 14px;
-     -moz-border-radius: 14px 0 0 14px;
-          border-radius: 14px 0 0 14px;
-}
-
-.form-search .input-append .btn {
-  -webkit-border-radius: 0 14px 14px 0;
-     -moz-border-radius: 0 14px 14px 0;
-          border-radius: 0 14px 14px 0;
-}
-
-.form-search .input-prepend .search-query {
-  -webkit-border-radius: 0 14px 14px 0;
-     -moz-border-radius: 0 14px 14px 0;
-          border-radius: 0 14px 14px 0;
-}
-
-.form-search .input-prepend .btn {
-  -webkit-border-radius: 14px 0 0 14px;
-     -moz-border-radius: 14px 0 0 14px;
-          border-radius: 14px 0 0 14px;
-}
-
-.form-search input,
-.form-inline input,
-.form-horizontal input,
-.form-search textarea,
-.form-inline textarea,
-.form-horizontal textarea,
-.form-search select,
-.form-inline select,
-.form-horizontal select,
-.form-search .help-inline,
-.form-inline .help-inline,
-.form-horizontal .help-inline,
-.form-search .uneditable-input,
-.form-inline .uneditable-input,
-.form-horizontal .uneditable-input,
-.form-search .input-prepend,
-.form-inline .input-prepend,
-.form-horizontal .input-prepend,
-.form-search .input-append,
-.form-inline .input-append,
-.form-horizontal .input-append {
-  display: inline-block;
-  *display: inline;
-  margin-bottom: 0;
-  vertical-align: middle;
-  *zoom: 1;
-}
-
-.form-search .hide,
-.form-inline .hide,
-.form-horizontal .hide {
-  display: none;
-}
-
-.form-search label,
-.form-inline label,
-.form-search .btn-group,
-.form-inline .btn-group {
-  display: inline-block;
-}
-
-.form-search .input-append,
-.form-inline .input-append,
-.form-search .input-prepend,
-.form-inline .input-prepend {
-  margin-bottom: 0;
-}
-
-.form-search .radio,
-.form-search .checkbox,
-.form-inline .radio,
-.form-inline .checkbox {
-  padding-left: 0;
-  margin-bottom: 0;
-  vertical-align: middle;
-}
-
-.form-search .radio input[type="radio"],
-.form-search .checkbox input[type="checkbox"],
-.form-inline .radio input[type="radio"],
-.form-inline .checkbox input[type="checkbox"] {
-  float: left;
-  margin-right: 3px;
-  margin-left: 0;
-}
-
-.control-group {
-  margin-bottom: 10px;
-}
-
-legend + .control-group {
-  margin-top: 20px;
-  -webkit-margin-top-collapse: separate;
-}
-
-.form-horizontal .control-group {
-  margin-bottom: 20px;
-  *zoom: 1;
-}
-
-.form-horizontal .control-group:before,
-.form-horizontal .control-group:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.form-horizontal .control-group:after {
-  clear: both;
-}
-
-.form-horizontal .control-label {
-  float: left;
-  width: 160px;
-  padding-top: 5px;
-  text-align: right;
-}
-
-.form-horizontal .controls {
-  *display: inline-block;
-  *padding-left: 20px;
-  margin-left: 180px;
-  *margin-left: 0;
-}
-
-.form-horizontal .controls:first-child {
-  *padding-left: 180px;
-}
-
-.form-horizontal .help-block {
-  margin-bottom: 0;
-}
-
-.form-horizontal input + .help-block,
-.form-horizontal select + .help-block,
-.form-horizontal textarea + .help-block,
-.form-horizontal .uneditable-input + .help-block,
-.form-horizontal .input-prepend + .help-block,
-.form-horizontal .input-append + .help-block {
-  margin-top: 10px;
-}
-
-.form-horizontal .form-actions {
-  padding-left: 180px;
-}
-
-table {
-  max-width: 100%;
-  background-color: transparent;
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-.table {
-  width: 100%;
-  margin-bottom: 20px;
-}
-
-.table th,
-.table td {
-  padding: 8px;
-  line-height: 20px;
-  text-align: left;
-  vertical-align: top;
-  border-top: 1px solid #dddddd;
-}
-
-.table th {
-  font-weight: bold;
-}
-
-.table thead th {
-  vertical-align: bottom;
-}
-
-.table caption + thead tr:first-child th,
-.table caption + thead tr:first-child td,
-.table colgroup + thead tr:first-child th,
-.table colgroup + thead tr:first-child td,
-.table thead:first-child tr:first-child th,
-.table thead:first-child tr:first-child td {
-  border-top: 0;
-}
-
-.table tbody + tbody {
-  border-top: 2px solid #dddddd;
-}
-
-.table .table {
-  background-color: #ffffff;
-}
-
-.table-condensed th,
-.table-condensed td {
-  padding: 4px 5px;
-}
-
-.table-bordered {
-  border: 1px solid #dddddd;
-  border-collapse: separate;
-  *border-collapse: collapse;
-  border-left: 0;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-.table-bordered th,
-.table-bordered td {
-  border-left: 1px solid #dddddd;
-}
-
-.table-bordered caption + thead tr:first-child th,
-.table-bordered caption + tbody tr:first-child th,
-.table-bordered caption + tbody tr:first-child td,
-.table-bordered colgroup + thead tr:first-child th,
-.table-bordered colgroup + tbody tr:first-child th,
-.table-bordered colgroup + tbody tr:first-child td,
-.table-bordered thead:first-child tr:first-child th,
-.table-bordered tbody:first-child tr:first-child th,
-.table-bordered tbody:first-child tr:first-child td {
-  border-top: 0;
-}
-
-.table-bordered thead:first-child tr:first-child > th:first-child,
-.table-bordered tbody:first-child tr:first-child > td:first-child,
-.table-bordered tbody:first-child tr:first-child > th:first-child {
-  -webkit-border-top-left-radius: 4px;
-          border-top-left-radius: 4px;
-  -moz-border-radius-topleft: 4px;
-}
-
-.table-bordered thead:first-child tr:first-child > th:last-child,
-.table-bordered tbody:first-child tr:first-child > td:last-child,
-.table-bordered tbody:first-child tr:first-child > th:last-child {
-  -webkit-border-top-right-radius: 4px;
-          border-top-right-radius: 4px;
-  -moz-border-radius-topright: 4px;
-}
-
-.table-bordered thead:last-child tr:last-child > th:first-child,
-.table-bordered tbody:last-child tr:last-child > td:first-child,
-.table-bordered tbody:last-child tr:last-child > th:first-child,
-.table-bordered tfoot:last-child tr:last-child > td:first-child,
-.table-bordered tfoot:last-child tr:last-child > th:first-child {
-  -webkit-border-bottom-left-radius: 4px;
-          border-bottom-left-radius: 4px;
-  -moz-border-radius-bottomleft: 4px;
-}
-
-.table-bordered thead:last-child tr:last-child > th:last-child,
-.table-bordered tbody:last-child tr:last-child > td:last-child,
-.table-bordered tbody:last-child tr:last-child > th:last-child,
-.table-bordered tfoot:last-child tr:last-child > td:last-child,
-.table-bordered tfoot:last-child tr:last-child > th:last-child {
-  -webkit-border-bottom-right-radius: 4px;
-          border-bottom-right-radius: 4px;
-  -moz-border-radius-bottomright: 4px;
-}
-
-.table-bordered tfoot + tbody:last-child tr:last-child td:first-child {
-  -webkit-border-bottom-left-radius: 0;
-          border-bottom-left-radius: 0;
-  -moz-border-radius-bottomleft: 0;
-}
-
-.table-bordered tfoot + tbody:last-child tr:last-child td:last-child {
-  -webkit-border-bottom-right-radius: 0;
-          border-bottom-right-radius: 0;
-  -moz-border-radius-bottomright: 0;
-}
-
-.table-bordered caption + thead tr:first-child th:first-child,
-.table-bordered caption + tbody tr:first-child td:first-child,
-.table-bordered colgroup + thead tr:first-child th:first-child,
-.table-bordered colgroup + tbody tr:first-child td:first-child {
-  -webkit-border-top-left-radius: 4px;
-          border-top-left-radius: 4px;
-  -moz-border-radius-topleft: 4px;
-}
-
-.table-bordered caption + thead tr:first-child th:last-child,
-.table-bordered caption + tbody tr:first-child td:last-child,
-.table-bordered colgroup + thead tr:first-child th:last-child,
-.table-bordered colgroup + tbody tr:first-child td:last-child {
-  -webkit-border-top-right-radius: 4px;
-          border-top-right-radius: 4px;
-  -moz-border-radius-topright: 4px;
-}
-
-.table-striped tbody > tr:nth-child(odd) > td,
-.table-striped tbody > tr:nth-child(odd) > th {
-  background-color: #f9f9f9;
-}
-
-.table-hover tbody tr:hover > td,
-.table-hover tbody tr:hover > th {
-  background-color: #f5f5f5;
-}
-
-table td[class*="span"],
-table th[class*="span"],
-.row-fluid table td[class*="span"],
-.row-fluid table th[class*="span"] {
-  display: table-cell;
-  float: none;
-  margin-left: 0;
-}
-
-.table td.span1,
-.table th.span1 {
-  float: none;
-  width: 44px;
-  margin-left: 0;
-}
-
-.table td.span2,
-.table th.span2 {
-  float: none;
-  width: 124px;
-  margin-left: 0;
-}
-
-.table td.span3,
-.table th.span3 {
-  float: none;
-  width: 204px;
-  margin-left: 0;
-}
-
-.table td.span4,
-.table th.span4 {
-  float: none;
-  width: 284px;
-  margin-left: 0;
-}
-
-.table td.span5,
-.table th.span5 {
-  float: none;
-  width: 364px;
-  margin-left: 0;
-}
-
-.table td.span6,
-.table th.span6 {
-  float: none;
-  width: 444px;
-  margin-left: 0;
-}
-
-.table td.span7,
-.table th.span7 {
-  float: none;
-  width: 524px;
-  margin-left: 0;
-}
-
-.table td.span8,
-.table th.span8 {
-  float: none;
-  width: 604px;
-  margin-left: 0;
-}
-
-.table td.span9,
-.table th.span9 {
-  float: none;
-  width: 684px;
-  margin-left: 0;
-}
-
-.table td.span10,
-.table th.span10 {
-  float: none;
-  width: 764px;
-  margin-left: 0;
-}
-
-.table td.span11,
-.table th.span11 {
-  float: none;
-  width: 844px;
-  margin-left: 0;
-}
-
-.table td.span12,
-.table th.span12 {
-  float: none;
-  width: 924px;
-  margin-left: 0;
-}
-
-.table tbody tr.success > td {
-  background-color: #dff0d8;
-}
-
-.table tbody tr.error > td {
-  background-color: #f2dede;
-}
-
-.table tbody tr.warning > td {
-  background-color: #fcf8e3;
-}
-
-.table tbody tr.info > td {
-  background-color: #d9edf7;
-}
-
-.table-hover tbody tr.success:hover > td {
-  background-color: #d0e9c6;
-}
-
-.table-hover tbody tr.error:hover > td {
-  background-color: #ebcccc;
-}
-
-.table-hover tbody tr.warning:hover > td {
-  background-color: #faf2cc;
-}
-
-.table-hover tbody tr.info:hover > td {
-  background-color: #c4e3f3;
-}
-
-[class^="icon-"],
-[class*=" icon-"] {
-  display: inline-block;
-  width: 14px;
-  height: 14px;
-  margin-top: 1px;
-  *margin-right: .3em;
-  line-height: 14px;
-  vertical-align: text-top;
-  background-image: url("../img/glyphicons-halflings.png");
-  background-position: 14px 14px;
-  background-repeat: no-repeat;
-}
-
-/* White icons with optional class, or on hover/focus/active states of certain elements */
-
-.icon-white,
-.nav-pills > .active > a > [class^="icon-"],
-.nav-pills > .active > a > [class*=" icon-"],
-.nav-list > .active > a > [class^="icon-"],
-.nav-list > .active > a > [class*=" icon-"],
-.navbar-inverse .nav > .active > a > [class^="icon-"],
-.navbar-inverse .nav > .active > a > [class*=" icon-"],
-.dropdown-menu > li > a:hover > [class^="icon-"],
-.dropdown-menu > li > a:focus > [class^="icon-"],
-.dropdown-menu > li > a:hover > [class*=" icon-"],
-.dropdown-menu > li > a:focus > [class*=" icon-"],
-.dropdown-menu > .active > a > [class^="icon-"],
-.dropdown-menu > .active > a > [class*=" icon-"],
-.dropdown-submenu:hover > a > [class^="icon-"],
-.dropdown-submenu:focus > a > [class^="icon-"],
-.dropdown-submenu:hover > a > [class*=" icon-"],
-.dropdown-submenu:focus > a > [class*=" icon-"] {
-  background-image: url("../img/glyphicons-halflings-white.png");
-}
-
-.icon-glass {
-  background-position: 0      0;
-}
-
-.icon-music {
-  background-position: -24px 0;
-}
-
-.icon-search {
-  background-position: -48px 0;
-}
-
-.icon-envelope {
-  background-position: -72px 0;
-}
-
-.icon-heart {
-  background-position: -96px 0;
-}
-
-.icon-star {
-  background-position: -120px 0;
-}
-
-.icon-star-empty {
-  background-position: -144px 0;
-}
-
-.icon-user {
-  background-position: -168px 0;
-}
-
-.icon-film {
-  background-position: -192px 0;
-}
-
-.icon-th-large {
-  background-position: -216px 0;
-}
-
-.icon-th {
-  background-position: -240px 0;
-}
-
-.icon-th-list {
-  background-position: -264px 0;
-}
-
-.icon-ok {
-  background-position: -288px 0;
-}
-
-.icon-remove {
-  background-position: -312px 0;
-}
-
-.icon-zoom-in {
-  background-position: -336px 0;
-}
-
-.icon-zoom-out {
-  background-position: -360px 0;
-}
-
-.icon-off {
-  background-position: -384px 0;
-}
-
-.icon-signal {
-  background-position: -408px 0;
-}
-
-.icon-cog {
-  background-position: -432px 0;
-}
-
-.icon-trash {
-  background-position: -456px 0;
-}
-
-.icon-home {
-  background-position: 0 -24px;
-}
-
-.icon-file {
-  background-position: -24px -24px;
-}
-
-.icon-time {
-  background-position: -48px -24px;
-}
-
-.icon-road {
-  background-position: -72px -24px;
-}
-
-.icon-download-alt {
-  background-position: -96px -24px;
-}
-
-.icon-download {
-  background-position: -120px -24px;
-}
-
-.icon-upload {
-  background-position: -144px -24px;
-}
-
-.icon-inbox {
-  background-position: -168px -24px;
-}
-
-.icon-play-circle {
-  background-position: -192px -24px;
-}
-
-.icon-repeat {
-  background-position: -216px -24px;
-}
-
-.icon-refresh {
-  background-position: -240px -24px;
-}
-
-.icon-list-alt {
-  background-position: -264px -24px;
-}
-
-.icon-lock {
-  background-position: -287px -24px;
-}
-
-.icon-flag {
-  background-position: -312px -24px;
-}
-
-.icon-headphones {
-  background-position: -336px -24px;
-}
-
-.icon-volume-off {
-  background-position: -360px -24px;
-}
-
-.icon-volume-down {
-  background-position: -384px -24px;
-}
-
-.icon-volume-up {
-  background-position: -408px -24px;
-}
-
-.icon-qrcode {
-  background-position: -432px -24px;
-}
-
-.icon-barcode {
-  background-position: -456px -24px;
-}
-
-.icon-tag {
-  background-position: 0 -48px;
-}
-
-.icon-tags {
-  background-position: -25px -48px;
-}
-
-.icon-book {
-  background-position: -48px -48px;
-}
-
-.icon-bookmark {
-  background-position: -72px -48px;
-}
-
-.icon-print {
-  background-position: -96px -48px;
-}
-
-.icon-camera {
-  background-position: -120px -48px;
-}
-
-.icon-font {
-  background-position: -144px -48px;
-}
-
-.icon-bold {
-  background-position: -167px -48px;
-}
-
-.icon-italic {
-  background-position: -192px -48px;
-}
-
-.icon-text-height {
-  background-position: -216px -48px;
-}
-
-.icon-text-width {
-  background-position: -240px -48px;
-}
-
-.icon-align-left {
-  background-position: -264px -48px;
-}
-
-.icon-align-center {
-  background-position: -288px -48px;
-}
-
-.icon-align-right {
-  background-position: -312px -48px;
-}
-
-.icon-align-justify {
-  background-position: -336px -48px;
-}
-
-.icon-list {
-  background-position: -360px -48px;
-}
-
-.icon-indent-left {
-  background-position: -384px -48px;
-}
-
-.icon-indent-right {
-  background-position: -408px -48px;
-}
-
-.icon-facetime-video {
-  background-position: -432px -48px;
-}
-
-.icon-picture {
-  background-position: -456px -48px;
-}
-
-.icon-pencil {
-  background-position: 0 -72px;
-}
-
-.icon-map-marker {
-  background-position: -24px -72px;
-}
-
-.icon-adjust {
-  background-position: -48px -72px;
-}
-
-.icon-tint {
-  background-position: -72px -72px;
-}
-
-.icon-edit {
-  background-position: -96px -72px;
-}
-
-.icon-share {
-  background-position: -120px -72px;
-}
-
-.icon-check {
-  background-position: -144px -72px;
-}
-
-.icon-move {
-  background-position: -168px -72px;
-}
-
-.icon-step-backward {
-  background-position: -192px -72px;
-}
-
-.icon-fast-backward {
-  background-position: -216px -72px;
-}
-
-.icon-backward {
-  background-position: -240px -72px;
-}
-
-.icon-play {
-  background-position: -264px -72px;
-}
-
-.icon-pause {
-  background-position: -288px -72px;
-}
-
-.icon-stop {
-  background-position: -312px -72px;
-}
-
-.icon-forward {
-  background-position: -336px -72px;
-}
-
-.icon-fast-forward {
-  background-position: -360px -72px;
-}
-
-.icon-step-forward {
-  background-position: -384px -72px;
-}
-
-.icon-eject {
-  background-position: -408px -72px;
-}
-
-.icon-chevron-left {
-  background-position: -432px -72px;
-}
-
-.icon-chevron-right {
-  background-position: -456px -72px;
-}
-
-.icon-plus-sign {
-  background-position: 0 -96px;
-}
-
-.icon-minus-sign {
-  background-position: -24px -96px;
-}
-
-.icon-remove-sign {
-  background-position: -48px -96px;
-}
-
-.icon-ok-sign {
-  background-position: -72px -96px;
-}
-
-.icon-question-sign {
-  background-position: -96px -96px;
-}
-
-.icon-info-sign {
-  background-position: -120px -96px;
-}
-
-.icon-screenshot {
-  background-position: -144px -96px;
-}
-
-.icon-remove-circle {
-  background-position: -168px -96px;
-}
-
-.icon-ok-circle {
-  background-position: -192px -96px;
-}
-
-.icon-ban-circle {
-  background-position: -216px -96px;
-}
-
-.icon-arrow-left {
-  background-position: -240px -96px;
-}
-
-.icon-arrow-right {
-  background-position: -264px -96px;
-}
-
-.icon-arrow-up {
-  background-position: -289px -96px;
-}
-
-.icon-arrow-down {
-  background-position: -312px -96px;
-}
-
-.icon-share-alt {
-  background-position: -336px -96px;
-}
-
-.icon-resize-full {
-  background-position: -360px -96px;
-}
-
-.icon-resize-small {
-  background-position: -384px -96px;
-}
-
-.icon-plus {
-  background-position: -408px -96px;
-}
-
-.icon-minus {
-  background-position: -433px -96px;
-}
-
-.icon-asterisk {
-  background-position: -456px -96px;
-}
-
-.icon-exclamation-sign {
-  background-position: 0 -120px;
-}
-
-.icon-gift {
-  background-position: -24px -120px;
-}
-
-.icon-leaf {
-  background-position: -48px -120px;
-}
-
-.icon-fire {
-  background-position: -72px -120px;
-}
-
-.icon-eye-open {
-  background-position: -96px -120px;
-}
-
-.icon-eye-close {
-  background-position: -120px -120px;
-}
-
-.icon-warning-sign {
-  background-position: -144px -120px;
-}
-
-.icon-plane {
-  background-position: -168px -120px;
-}
-
-.icon-calendar {
-  background-position: -192px -120px;
-}
-
-.icon-random {
-  width: 16px;
-  background-position: -216px -120px;
-}
-
-.icon-comment {
-  background-position: -240px -120px;
-}
-
-.icon-magnet {
-  background-position: -264px -120px;
-}
-
-.icon-chevron-up {
-  background-position: -288px -120px;
-}
-
-.icon-chevron-down {
-  background-position: -313px -119px;
-}
-
-.icon-retweet {
-  background-position: -336px -120px;
-}
-
-.icon-shopping-cart {
-  background-position: -360px -120px;
-}
-
-.icon-folder-close {
-  width: 16px;
-  background-position: -384px -120px;
-}
-
-.icon-folder-open {
-  width: 16px;
-  background-position: -408px -120px;
-}
-
-.icon-resize-vertical {
-  background-position: -432px -119px;
-}
-
-.icon-resize-horizontal {
-  background-position: -456px -118px;
-}
-
-.icon-hdd {
-  background-position: 0 -144px;
-}
-
-.icon-bullhorn {
-  background-position: -24px -144px;
-}
-
-.icon-bell {
-  background-position: -48px -144px;
-}
-
-.icon-certificate {
-  background-position: -72px -144px;
-}
-
-.icon-thumbs-up {
-  background-position: -96px -144px;
-}
-
-.icon-thumbs-down {
-  background-position: -120px -144px;
-}
-
-.icon-hand-right {
-  background-position: -144px -144px;
-}
-
-.icon-hand-left {
-  background-position: -168px -144px;
-}
-
-.icon-hand-up {
-  background-position: -192px -144px;
-}
-
-.icon-hand-down {
-  background-position: -216px -144px;
-}
-
-.icon-circle-arrow-right {
-  background-position: -240px -144px;
-}
-
-.icon-circle-arrow-left {
-  background-position: -264px -144px;
-}
-
-.icon-circle-arrow-up {
-  background-position: -288px -144px;
-}
-
-.icon-circle-arrow-down {
-  background-position: -312px -144px;
-}
-
-.icon-globe {
-  background-position: -336px -144px;
-}
-
-.icon-wrench {
-  background-position: -360px -144px;
-}
-
-.icon-tasks {
-  background-position: -384px -144px;
-}
-
-.icon-filter {
-  background-position: -408px -144px;
-}
-
-.icon-briefcase {
-  background-position: -432px -144px;
-}
-
-.icon-fullscreen {
-  background-position: -456px -144px;
-}
-
-.dropup,
-.dropdown {
-  position: relative;
-}
-
-.dropdown-toggle {
-  *margin-bottom: -3px;
-}
-
-.dropdown-toggle:active,
-.open .dropdown-toggle {
-  outline: 0;
-}
-
-.caret {
-  display: inline-block;
-  width: 0;
-  height: 0;
-  vertical-align: top;
-  border-top: 4px solid #000000;
-  border-right: 4px solid transparent;
-  border-left: 4px solid transparent;
-  content: "";
-}
-
-.dropdown .caret {
-  margin-top: 8px;
-  margin-left: 2px;
-}
-
-.dropdown-menu {
-  position: absolute;
-  top: 100%;
-  left: 0;
-  z-index: 1000;
-  display: none;
-  float: left;
-  min-width: 160px;
-  padding: 5px 0;
-  margin: 2px 0 0;
-  list-style: none;
-  background-color: #ffffff;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-  *border-right-width: 2px;
-  *border-bottom-width: 2px;
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-  -webkit-background-clip: padding-box;
-     -moz-background-clip: padding;
-          background-clip: padding-box;
-}
-
-.dropdown-menu.pull-right {
-  right: 0;
-  left: auto;
-}
-
-.dropdown-menu .divider {
-  *width: 100%;
-  height: 1px;
-  margin: 9px 1px;
-  *margin: -5px 0 5px;
-  overflow: hidden;
-  background-color: #e5e5e5;
-  border-bottom: 1px solid #ffffff;
-}
-
-.dropdown-menu > li > a {
-  display: block;
-  padding: 3px 20px;
-  clear: both;
-  font-weight: normal;
-  line-height: 20px;
-  color: #333333;
-  white-space: nowrap;
-}
-
-.dropdown-menu > li > a:hover,
-.dropdown-menu > li > a:focus,
-.dropdown-submenu:hover > a,
-.dropdown-submenu:focus > a {
-  color: #ffffff;
-  text-decoration: none;
-  background-color: #0081c2;
-  background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
-  background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
-  background-image: -o-linear-gradient(top, #0088cc, #0077b3);
-  background-image: linear-gradient(to bottom, #0088cc, #0077b3);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
-}
-
-.dropdown-menu > .active > a,
-.dropdown-menu > .active > a:hover,
-.dropdown-menu > .active > a:focus {
-  color: #ffffff;
-  text-decoration: none;
-  background-color: #0081c2;
-  background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
-  background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
-  background-image: -o-linear-gradient(top, #0088cc, #0077b3);
-  background-image: linear-gradient(to bottom, #0088cc, #0077b3);
-  background-repeat: repeat-x;
-  outline: 0;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
-}
-
-.dropdown-menu > .disabled > a,
-.dropdown-menu > .disabled > a:hover,
-.dropdown-menu > .disabled > a:focus {
-  color: #999999;
-}
-
-.dropdown-menu > .disabled > a:hover,
-.dropdown-menu > .disabled > a:focus {
-  text-decoration: none;
-  cursor: default;
-  background-color: transparent;
-  background-image: none;
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-}
-
-.open {
-  *z-index: 1000;
-}
-
-.open > .dropdown-menu {
-  display: block;
-}
-
-.pull-right > .dropdown-menu {
-  right: 0;
-  left: auto;
-}
-
-.dropup .caret,
-.navbar-fixed-bottom .dropdown .caret {
-  border-top: 0;
-  border-bottom: 4px solid #000000;
-  content: "";
-}
-
-.dropup .dropdown-menu,
-.navbar-fixed-bottom .dropdown .dropdown-menu {
-  top: auto;
-  bottom: 100%;
-  margin-bottom: 1px;
-}
-
-.dropdown-submenu {
-  position: relative;
-}
-
-.dropdown-submenu > .dropdown-menu {
-  top: 0;
-  left: 100%;
-  margin-top: -6px;
-  margin-left: -1px;
-  -webkit-border-radius: 0 6px 6px 6px;
-     -moz-border-radius: 0 6px 6px 6px;
-          border-radius: 0 6px 6px 6px;
-}
-
-.dropdown-submenu:hover > .dropdown-menu {
-  display: block;
-}
-
-.dropup .dropdown-submenu > .dropdown-menu {
-  top: auto;
-  bottom: 0;
-  margin-top: 0;
-  margin-bottom: -2px;
-  -webkit-border-radius: 5px 5px 5px 0;
-     -moz-border-radius: 5px 5px 5px 0;
-          border-radius: 5px 5px 5px 0;
-}
-
-.dropdown-submenu > a:after {
-  display: block;
-  float: right;
-  width: 0;
-  height: 0;
-  margin-top: 5px;
-  margin-right: -10px;
-  border-color: transparent;
-  border-left-color: #cccccc;
-  border-style: solid;
-  border-width: 5px 0 5px 5px;
-  content: " ";
-}
-
-.dropdown-submenu:hover > a:after {
-  border-left-color: #ffffff;
-}
-
-.dropdown-submenu.pull-left {
-  float: none;
-}
-
-.dropdown-submenu.pull-left > .dropdown-menu {
-  left: -100%;
-  margin-left: 10px;
-  -webkit-border-radius: 6px 0 6px 6px;
-     -moz-border-radius: 6px 0 6px 6px;
-          border-radius: 6px 0 6px 6px;
-}
-
-.dropdown .dropdown-menu .nav-header {
-  padding-right: 20px;
-  padding-left: 20px;
-}
-
-.typeahead {
-  z-index: 1051;
-  margin-top: 2px;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-.well {
-  min-height: 20px;
-  padding: 19px;
-  margin-bottom: 20px;
-  background-color: #f5f5f5;
-  border: 1px solid #e3e3e3;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-}
-
-.well blockquote {
-  border-color: #ddd;
-  border-color: rgba(0, 0, 0, 0.15);
-}
-
-.well-large {
-  padding: 24px;
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-}
-
-.well-small {
-  padding: 9px;
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-          border-radius: 3px;
-}
-
-.fade {
-  opacity: 0;
-  -webkit-transition: opacity 0.15s linear;
-     -moz-transition: opacity 0.15s linear;
-       -o-transition: opacity 0.15s linear;
-          transition: opacity 0.15s linear;
-}
-
-.fade.in {
-  opacity: 1;
-}
-
-.collapse {
-  position: relative;
-  height: 0;
-  overflow: hidden;
-  -webkit-transition: height 0.35s ease;
-     -moz-transition: height 0.35s ease;
-       -o-transition: height 0.35s ease;
-          transition: height 0.35s ease;
-}
-
-.collapse.in {
-  height: auto;
-}
-
-.close {
-  float: right;
-  font-size: 20px;
-  font-weight: bold;
-  line-height: 20px;
-  color: #000000;
-  text-shadow: 0 1px 0 #ffffff;
-  opacity: 0.2;
-  filter: alpha(opacity=20);
-}
-
-.close:hover,
-.close:focus {
-  color: #000000;
-  text-decoration: none;
-  cursor: pointer;
-  opacity: 0.4;
-  filter: alpha(opacity=40);
-}
-
-button.close {
-  padding: 0;
-  cursor: pointer;
-  background: transparent;
-  border: 0;
-  -webkit-appearance: none;
-}
-
-.btn {
-  display: inline-block;
-  *display: inline;
-  padding: 4px 12px;
-  margin-bottom: 0;
-  *margin-left: .3em;
-  font-size: 14px;
-  line-height: 20px;
-  color: #333333;
-  text-align: center;
-  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
-  vertical-align: middle;
-  cursor: pointer;
-  background-color: #f5f5f5;
-  *background-color: #e6e6e6;
-  background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
-  background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
-  background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
-  background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
-  background-repeat: repeat-x;
-  border: 1px solid #cccccc;
-  *border: 0;
-  border-color: #e6e6e6 #e6e6e6 #bfbfbf;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  border-bottom-color: #b3b3b3;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-  *zoom: 1;
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-.btn:hover,
-.btn:focus,
-.btn:active,
-.btn.active,
-.btn.disabled,
-.btn[disabled] {
-  color: #333333;
-  background-color: #e6e6e6;
-  *background-color: #d9d9d9;
-}
-
-.btn:active,
-.btn.active {
-  background-color: #cccccc \9;
-}
-
-.btn:first-child {
-  *margin-left: 0;
-}
-
-.btn:hover,
-.btn:focus {
-  color: #333333;
-  text-decoration: none;
-  background-position: 0 -15px;
-  -webkit-transition: background-position 0.1s linear;
-     -moz-transition: background-position 0.1s linear;
-       -o-transition: background-position 0.1s linear;
-          transition: background-position 0.1s linear;
-}
-
-.btn:focus {
-  outline: thin dotted #333;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-
-.btn.active,
-.btn:active {
-  background-image: none;
-  outline: 0;
-  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-.btn.disabled,
-.btn[disabled] {
-  cursor: default;
-  background-image: none;
-  opacity: 0.65;
-  filter: alpha(opacity=65);
-  -webkit-box-shadow: none;
-     -moz-box-shadow: none;
-          box-shadow: none;
-}
-
-.btn-large {
-  padding: 11px 19px;
-  font-size: 17.5px;
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-}
-
-.btn-large [class^="icon-"],
-.btn-large [class*=" icon-"] {
-  margin-top: 4px;
-}
-
-.btn-small {
-  padding: 2px 10px;
-  font-size: 11.9px;
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-          border-radius: 3px;
-}
-
-.btn-small [class^="icon-"],
-.btn-small [class*=" icon-"] {
-  margin-top: 0;
-}
-
-.btn-mini [class^="icon-"],
-.btn-mini [class*=" icon-"] {
-  margin-top: -1px;
-}
-
-.btn-mini {
-  padding: 0 6px;
-  font-size: 10.5px;
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-          border-radius: 3px;
-}
-
-.btn-block {
-  display: block;
-  width: 100%;
-  padding-right: 0;
-  padding-left: 0;
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-}
-
-.btn-block + .btn-block {
-  margin-top: 5px;
-}
-
-input[type="submit"].btn-block,
-input[type="reset"].btn-block,
-input[type="button"].btn-block {
-  width: 100%;
-}
-
-.btn-primary.active,
-.btn-warning.active,
-.btn-danger.active,
-.btn-success.active,
-.btn-info.active,
-.btn-inverse.active {
-  color: rgba(255, 255, 255, 0.75);
-}
-
-.btn-primary {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #006dcc;
-  *background-color: #0044cc;
-  background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
-  background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
-  background-image: -o-linear-gradient(top, #0088cc, #0044cc);
-  background-image: linear-gradient(to bottom, #0088cc, #0044cc);
-  background-repeat: repeat-x;
-  border-color: #0044cc #0044cc #002a80;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-}
-
-.btn-primary:hover,
-.btn-primary:focus,
-.btn-primary:active,
-.btn-primary.active,
-.btn-primary.disabled,
-.btn-primary[disabled] {
-  color: #ffffff;
-  background-color: #0044cc;
-  *background-color: #003bb3;
-}
-
-.btn-primary:active,
-.btn-primary.active {
-  background-color: #003399 \9;
-}
-
-.btn-warning {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #faa732;
-  *background-color: #f89406;
-  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
-  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
-  background-image: -o-linear-gradient(top, #fbb450, #f89406);
-  background-image: linear-gradient(to bottom, #fbb450, #f89406);
-  background-repeat: repeat-x;
-  border-color: #f89406 #f89406 #ad6704;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-}
-
-.btn-warning:hover,
-.btn-warning:focus,
-.btn-warning:active,
-.btn-warning.active,
-.btn-warning.disabled,
-.btn-warning[disabled] {
-  color: #ffffff;
-  background-color: #f89406;
-  *background-color: #df8505;
-}
-
-.btn-warning:active,
-.btn-warning.active {
-  background-color: #c67605 \9;
-}
-
-.btn-danger {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #da4f49;
-  *background-color: #bd362f;
-  background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));
-  background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f);
-  background-image: -o-linear-gradient(top, #ee5f5b, #bd362f);
-  background-image: linear-gradient(to bottom, #ee5f5b, #bd362f);
-  background-repeat: repeat-x;
-  border-color: #bd362f #bd362f #802420;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-}
-
-.btn-danger:hover,
-.btn-danger:focus,
-.btn-danger:active,
-.btn-danger.active,
-.btn-danger.disabled,
-.btn-danger[disabled] {
-  color: #ffffff;
-  background-color: #bd362f;
-  *background-color: #a9302a;
-}
-
-.btn-danger:active,
-.btn-danger.active {
-  background-color: #942a25 \9;
-}
-
-.btn-success {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #5bb75b;
-  *background-color: #51a351;
-  background-image: -moz-linear-gradient(top, #62c462, #51a351);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));
-  background-image: -webkit-linear-gradient(top, #62c462, #51a351);
-  background-image: -o-linear-gradient(top, #62c462, #51a351);
-  background-image: linear-gradient(to bottom, #62c462, #51a351);
-  background-repeat: repeat-x;
-  border-color: #51a351 #51a351 #387038;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-}
-
-.btn-success:hover,
-.btn-success:focus,
-.btn-success:active,
-.btn-success.active,
-.btn-success.disabled,
-.btn-success[disabled] {
-  color: #ffffff;
-  background-color: #51a351;
-  *background-color: #499249;
-}
-
-.btn-success:active,
-.btn-success.active {
-  background-color: #408140 \9;
-}
-
-.btn-info {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #49afcd;
-  *background-color: #2f96b4;
-  background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));
-  background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4);
-  background-image: -o-linear-gradient(top, #5bc0de, #2f96b4);
-  background-image: linear-gradient(to bottom, #5bc0de, #2f96b4);
-  background-repeat: repeat-x;
-  border-color: #2f96b4 #2f96b4 #1f6377;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-}
-
-.btn-info:hover,
-.btn-info:focus,
-.btn-info:active,
-.btn-info.active,
-.btn-info.disabled,
-.btn-info[disabled] {
-  color: #ffffff;
-  background-color: #2f96b4;
-  *background-color: #2a85a0;
-}
-
-.btn-info:active,
-.btn-info.active {
-  background-color: #24748c \9;
-}
-
-.btn-inverse {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #363636;
-  *background-color: #222222;
-  background-image: -moz-linear-gradient(top, #444444, #222222);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222));
-  background-image: -webkit-linear-gradient(top, #444444, #222222);
-  background-image: -o-linear-gradient(top, #444444, #222222);
-  background-image: linear-gradient(to bottom, #444444, #222222);
-  background-repeat: repeat-x;
-  border-color: #222222 #222222 #000000;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-}
-
-.btn-inverse:hover,
-.btn-inverse:focus,
-.btn-inverse:active,
-.btn-inverse.active,
-.btn-inverse.disabled,
-.btn-inverse[disabled] {
-  color: #ffffff;
-  background-color: #222222;
-  *background-color: #151515;
-}
-
-.btn-inverse:active,
-.btn-inverse.active {
-  background-color: #080808 \9;
-}
-
-button.btn,
-input[type="submit"].btn {
-  *padding-top: 3px;
-  *padding-bottom: 3px;
-}
-
-button.btn::-moz-focus-inner,
-input[type="submit"].btn::-moz-focus-inner {
-  padding: 0;
-  border: 0;
-}
-
-button.btn.btn-large,
-input[type="submit"].btn.btn-large {
-  *padding-top: 7px;
-  *padding-bottom: 7px;
-}
-
-button.btn.btn-small,
-input[type="submit"].btn.btn-small {
-  *padding-top: 3px;
-  *padding-bottom: 3px;
-}
-
-button.btn.btn-mini,
-input[type="submit"].btn.btn-mini {
-  *padding-top: 1px;
-  *padding-bottom: 1px;
-}
-
-.btn-link,
-.btn-link:active,
-.btn-link[disabled] {
-  background-color: transparent;
-  background-image: none;
-  -webkit-box-shadow: none;
-     -moz-box-shadow: none;
-          box-shadow: none;
-}
-
-.btn-link {
-  color: #0088cc;
-  cursor: pointer;
-  border-color: transparent;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.btn-link:hover,
-.btn-link:focus {
-  color: #005580;
-  text-decoration: underline;
-  background-color: transparent;
-}
-
-.btn-link[disabled]:hover,
-.btn-link[disabled]:focus {
-  color: #333333;
-  text-decoration: none;
-}
-
-.btn-group {
-  position: relative;
-  display: inline-block;
-  *display: inline;
-  *margin-left: .3em;
-  font-size: 0;
-  white-space: nowrap;
-  vertical-align: middle;
-  *zoom: 1;
-}
-
-.btn-group:first-child {
-  *margin-left: 0;
-}
-
-.btn-group + .btn-group {
-  margin-left: 5px;
-}
-
-.btn-toolbar {
-  margin-top: 10px;
-  margin-bottom: 10px;
-  font-size: 0;
-}
-
-.btn-toolbar > .btn + .btn,
-.btn-toolbar > .btn-group + .btn,
-.btn-toolbar > .btn + .btn-group {
-  margin-left: 5px;
-}
-
-.btn-group > .btn {
-  position: relative;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.btn-group > .btn + .btn {
-  margin-left: -1px;
-}
-
-.btn-group > .btn,
-.btn-group > .dropdown-menu,
-.btn-group > .popover {
-  font-size: 14px;
-}
-
-.btn-group > .btn-mini {
-  font-size: 10.5px;
-}
-
-.btn-group > .btn-small {
-  font-size: 11.9px;
-}
-
-.btn-group > .btn-large {
-  font-size: 17.5px;
-}
-
-.btn-group > .btn:first-child {
-  margin-left: 0;
-  -webkit-border-bottom-left-radius: 4px;
-          border-bottom-left-radius: 4px;
-  -webkit-border-top-left-radius: 4px;
-          border-top-left-radius: 4px;
-  -moz-border-radius-bottomleft: 4px;
-  -moz-border-radius-topleft: 4px;
-}
-
-.btn-group > .btn:last-child,
-.btn-group > .dropdown-toggle {
-  -webkit-border-top-right-radius: 4px;
-          border-top-right-radius: 4px;
-  -webkit-border-bottom-right-radius: 4px;
-          border-bottom-right-radius: 4px;
-  -moz-border-radius-topright: 4px;
-  -moz-border-radius-bottomright: 4px;
-}
-
-.btn-group > .btn.large:first-child {
-  margin-left: 0;
-  -webkit-border-bottom-left-radius: 6px;
-          border-bottom-left-radius: 6px;
-  -webkit-border-top-left-radius: 6px;
-          border-top-left-radius: 6px;
-  -moz-border-radius-bottomleft: 6px;
-  -moz-border-radius-topleft: 6px;
-}
-
-.btn-group > .btn.large:last-child,
-.btn-group > .large.dropdown-toggle {
-  -webkit-border-top-right-radius: 6px;
-          border-top-right-radius: 6px;
-  -webkit-border-bottom-right-radius: 6px;
-          border-bottom-right-radius: 6px;
-  -moz-border-radius-topright: 6px;
-  -moz-border-radius-bottomright: 6px;
-}
-
-.btn-group > .btn:hover,
-.btn-group > .btn:focus,
-.btn-group > .btn:active,
-.btn-group > .btn.active {
-  z-index: 2;
-}
-
-.btn-group .dropdown-toggle:active,
-.btn-group.open .dropdown-toggle {
-  outline: 0;
-}
-
-.btn-group > .btn + .dropdown-toggle {
-  *padding-top: 5px;
-  padding-right: 8px;
-  *padding-bottom: 5px;
-  padding-left: 8px;
-  -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-.btn-group > .btn-mini + .dropdown-toggle {
-  *padding-top: 2px;
-  padding-right: 5px;
-  *padding-bottom: 2px;
-  padding-left: 5px;
-}
-
-.btn-group > .btn-small + .dropdown-toggle {
-  *padding-top: 5px;
-  *padding-bottom: 4px;
-}
-
-.btn-group > .btn-large + .dropdown-toggle {
-  *padding-top: 7px;
-  padding-right: 12px;
-  *padding-bottom: 7px;
-  padding-left: 12px;
-}
-
-.btn-group.open .dropdown-toggle {
-  background-image: none;
-  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-.btn-group.open .btn.dropdown-toggle {
-  background-color: #e6e6e6;
-}
-
-.btn-group.open .btn-primary.dropdown-toggle {
-  background-color: #0044cc;
-}
-
-.btn-group.open .btn-warning.dropdown-toggle {
-  background-color: #f89406;
-}
-
-.btn-group.open .btn-danger.dropdown-toggle {
-  background-color: #bd362f;
-}
-
-.btn-group.open .btn-success.dropdown-toggle {
-  background-color: #51a351;
-}
-
-.btn-group.open .btn-info.dropdown-toggle {
-  background-color: #2f96b4;
-}
-
-.btn-group.open .btn-inverse.dropdown-toggle {
-  background-color: #222222;
-}
-
-.btn .caret {
-  margin-top: 8px;
-  margin-left: 0;
-}
-
-.btn-large .caret {
-  margin-top: 6px;
-}
-
-.btn-large .caret {
-  border-top-width: 5px;
-  border-right-width: 5px;
-  border-left-width: 5px;
-}
-
-.btn-mini .caret,
-.btn-small .caret {
-  margin-top: 8px;
-}
-
-.dropup .btn-large .caret {
-  border-bottom-width: 5px;
-}
-
-.btn-primary .caret,
-.btn-warning .caret,
-.btn-danger .caret,
-.btn-info .caret,
-.btn-success .caret,
-.btn-inverse .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
-}
-
-.btn-group-vertical {
-  display: inline-block;
-  *display: inline;
-  /* IE7 inline-block hack */
-
-  *zoom: 1;
-}
-
-.btn-group-vertical > .btn {
-  display: block;
-  float: none;
-  max-width: 100%;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.btn-group-vertical > .btn + .btn {
-  margin-top: -1px;
-  margin-left: 0;
-}
-
-.btn-group-vertical > .btn:first-child {
-  -webkit-border-radius: 4px 4px 0 0;
-     -moz-border-radius: 4px 4px 0 0;
-          border-radius: 4px 4px 0 0;
-}
-
-.btn-group-vertical > .btn:last-child {
-  -webkit-border-radius: 0 0 4px 4px;
-     -moz-border-radius: 0 0 4px 4px;
-          border-radius: 0 0 4px 4px;
-}
-
-.btn-group-vertical > .btn-large:first-child {
-  -webkit-border-radius: 6px 6px 0 0;
-     -moz-border-radius: 6px 6px 0 0;
-          border-radius: 6px 6px 0 0;
-}
-
-.btn-group-vertical > .btn-large:last-child {
-  -webkit-border-radius: 0 0 6px 6px;
-     -moz-border-radius: 0 0 6px 6px;
-          border-radius: 0 0 6px 6px;
-}
-
-.alert {
-  padding: 8px 35px 8px 14px;
-  margin-bottom: 20px;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-  background-color: #fcf8e3;
-  border: 1px solid #fbeed5;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-.alert,
-.alert h4 {
-  color: #c09853;
-}
-
-.alert h4 {
-  margin: 0;
-}
-
-.alert .close {
-  position: relative;
-  top: -2px;
-  right: -21px;
-  line-height: 20px;
-}
-
-.alert-success {
-  color: #468847;
-  background-color: #dff0d8;
-  border-color: #d6e9c6;
-}
-
-.alert-success h4 {
-  color: #468847;
-}
-
-.alert-danger,
-.alert-error {
-  color: #b94a48;
-  background-color: #f2dede;
-  border-color: #eed3d7;
-}
-
-.alert-danger h4,
-.alert-error h4 {
-  color: #b94a48;
-}
-
-.alert-info {
-  color: #3a87ad;
-  background-color: #d9edf7;
-  border-color: #bce8f1;
-}
-
-.alert-info h4 {
-  color: #3a87ad;
-}
-
-.alert-block {
-  padding-top: 14px;
-  padding-bottom: 14px;
-}
-
-.alert-block > p,
-.alert-block > ul {
-  margin-bottom: 0;
-}
-
-.alert-block p + p {
-  margin-top: 5px;
-}
-
-.nav {
-  margin-bottom: 20px;
-  margin-left: 0;
-  list-style: none;
-}
-
-.nav > li > a {
-  display: block;
-}
-
-.nav > li > a:hover,
-.nav > li > a:focus {
-  text-decoration: none;
-  background-color: #eeeeee;
-}
-
-.nav > li > a > img {
-  max-width: none;
-}
-
-.nav > .pull-right {
-  float: right;
-}
-
-.nav-header {
-  display: block;
-  padding: 3px 15px;
-  font-size: 11px;
-  font-weight: bold;
-  line-height: 20px;
-  color: #999999;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-  text-transform: uppercase;
-}
-
-.nav li + .nav-header {
-  margin-top: 9px;
-}
-
-.nav-list {
-  padding-right: 15px;
-  padding-left: 15px;
-  margin-bottom: 0;
-}
-
-.nav-list > li > a,
-.nav-list .nav-header {
-  margin-right: -15px;
-  margin-left: -15px;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-}
-
-.nav-list > li > a {
-  padding: 3px 15px;
-}
-
-.nav-list > .active > a,
-.nav-list > .active > a:hover,
-.nav-list > .active > a:focus {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
-  background-color: #0088cc;
-}
-
-.nav-list [class^="icon-"],
-.nav-list [class*=" icon-"] {
-  margin-right: 2px;
-}
-
-.nav-list .divider {
-  *width: 100%;
-  height: 1px;
-  margin: 9px 1px;
-  *margin: -5px 0 5px;
-  overflow: hidden;
-  background-color: #e5e5e5;
-  border-bottom: 1px solid #ffffff;
-}
-
-.nav-tabs,
-.nav-pills {
-  *zoom: 1;
-}
-
-.nav-tabs:before,
-.nav-pills:before,
-.nav-tabs:after,
-.nav-pills:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.nav-tabs:after,
-.nav-pills:after {
-  clear: both;
-}
-
-.nav-tabs > li,
-.nav-pills > li {
-  float: left;
-}
-
-.nav-tabs > li > a,
-.nav-pills > li > a {
-  padding-right: 12px;
-  padding-left: 12px;
-  margin-right: 2px;
-  line-height: 14px;
-}
-
-.nav-tabs {
-  border-bottom: 1px solid #ddd;
-}
-
-.nav-tabs > li {
-  margin-bottom: -1px;
-}
-
-.nav-tabs > li > a {
-  padding-top: 8px;
-  padding-bottom: 8px;
-  line-height: 20px;
-  border: 1px solid transparent;
-  -webkit-border-radius: 4px 4px 0 0;
-     -moz-border-radius: 4px 4px 0 0;
-          border-radius: 4px 4px 0 0;
-}
-
-.nav-tabs > li > a:hover,
-.nav-tabs > li > a:focus {
-  border-color: #eeeeee #eeeeee #dddddd;
-}
-
-.nav-tabs > .active > a,
-.nav-tabs > .active > a:hover,
-.nav-tabs > .active > a:focus {
-  color: #555555;
-  cursor: default;
-  background-color: #ffffff;
-  border: 1px solid #ddd;
-  border-bottom-color: transparent;
-}
-
-.nav-pills > li > a {
-  padding-top: 8px;
-  padding-bottom: 8px;
-  margin-top: 2px;
-  margin-bottom: 2px;
-  -webkit-border-radius: 5px;
-     -moz-border-radius: 5px;
-          border-radius: 5px;
-}
-
-.nav-pills > .active > a,
-.nav-pills > .active > a:hover,
-.nav-pills > .active > a:focus {
-  color: #ffffff;
-  background-color: #0088cc;
-}
-
-.nav-stacked > li {
-  float: none;
-}
-
-.nav-stacked > li > a {
-  margin-right: 0;
-}
-
-.nav-tabs.nav-stacked {
-  border-bottom: 0;
-}
-
-.nav-tabs.nav-stacked > li > a {
-  border: 1px solid #ddd;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.nav-tabs.nav-stacked > li:first-child > a {
-  -webkit-border-top-right-radius: 4px;
-          border-top-right-radius: 4px;
-  -webkit-border-top-left-radius: 4px;
-          border-top-left-radius: 4px;
-  -moz-border-radius-topright: 4px;
-  -moz-border-radius-topleft: 4px;
-}
-
-.nav-tabs.nav-stacked > li:last-child > a {
-  -webkit-border-bottom-right-radius: 4px;
-          border-bottom-right-radius: 4px;
-  -webkit-border-bottom-left-radius: 4px;
-          border-bottom-left-radius: 4px;
-  -moz-border-radius-bottomright: 4px;
-  -moz-border-radius-bottomleft: 4px;
-}
-
-.nav-tabs.nav-stacked > li > a:hover,
-.nav-tabs.nav-stacked > li > a:focus {
-  z-index: 2;
-  border-color: #ddd;
-}
-
-.nav-pills.nav-stacked > li > a {
-  margin-bottom: 3px;
-}
-
-.nav-pills.nav-stacked > li:last-child > a {
-  margin-bottom: 1px;
-}
-
-.nav-tabs .dropdown-menu {
-  -webkit-border-radius: 0 0 6px 6px;
-     -moz-border-radius: 0 0 6px 6px;
-          border-radius: 0 0 6px 6px;
-}
-
-.nav-pills .dropdown-menu {
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-}
-
-.nav .dropdown-toggle .caret {
-  margin-top: 6px;
-  border-top-color: #0088cc;
-  border-bottom-color: #0088cc;
-}
-
-.nav .dropdown-toggle:hover .caret,
-.nav .dropdown-toggle:focus .caret {
-  border-top-color: #005580;
-  border-bottom-color: #005580;
-}
-
-/* move down carets for tabs */
-
-.nav-tabs .dropdown-toggle .caret {
-  margin-top: 8px;
-}
-
-.nav .active .dropdown-toggle .caret {
-  border-top-color: #fff;
-  border-bottom-color: #fff;
-}
-
-.nav-tabs .active .dropdown-toggle .caret {
-  border-top-color: #555555;
-  border-bottom-color: #555555;
-}
-
-.nav > .dropdown.active > a:hover,
-.nav > .dropdown.active > a:focus {
-  cursor: pointer;
-}
-
-.nav-tabs .open .dropdown-toggle,
-.nav-pills .open .dropdown-toggle,
-.nav > li.dropdown.open.active > a:hover,
-.nav > li.dropdown.open.active > a:focus {
-  color: #ffffff;
-  background-color: #999999;
-  border-color: #999999;
-}
-
-.nav li.dropdown.open .caret,
-.nav li.dropdown.open.active .caret,
-.nav li.dropdown.open a:hover .caret,
-.nav li.dropdown.open a:focus .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
-  opacity: 1;
-  filter: alpha(opacity=100);
-}
-
-.tabs-stacked .open > a:hover,
-.tabs-stacked .open > a:focus {
-  border-color: #999999;
-}
-
-.tabbable {
-  *zoom: 1;
-}
-
-.tabbable:before,
-.tabbable:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.tabbable:after {
-  clear: both;
-}
-
-.tab-content {
-  overflow: auto;
-}
-
-.tabs-below > .nav-tabs,
-.tabs-right > .nav-tabs,
-.tabs-left > .nav-tabs {
-  border-bottom: 0;
-}
-
-.tab-content > .tab-pane,
-.pill-content > .pill-pane {
-  display: none;
-}
-
-.tab-content > .active,
-.pill-content > .active {
-  display: block;
-}
-
-.tabs-below > .nav-tabs {
-  border-top: 1px solid #ddd;
-}
-
-.tabs-below > .nav-tabs > li {
-  margin-top: -1px;
-  margin-bottom: 0;
-}
-
-.tabs-below > .nav-tabs > li > a {
-  -webkit-border-radius: 0 0 4px 4px;
-     -moz-border-radius: 0 0 4px 4px;
-          border-radius: 0 0 4px 4px;
-}
-
-.tabs-below > .nav-tabs > li > a:hover,
-.tabs-below > .nav-tabs > li > a:focus {
-  border-top-color: #ddd;
-  border-bottom-color: transparent;
-}
-
-.tabs-below > .nav-tabs > .active > a,
-.tabs-below > .nav-tabs > .active > a:hover,
-.tabs-below > .nav-tabs > .active > a:focus {
-  border-color: transparent #ddd #ddd #ddd;
-}
-
-.tabs-left > .nav-tabs > li,
-.tabs-right > .nav-tabs > li {
-  float: none;
-}
-
-.tabs-left > .nav-tabs > li > a,
-.tabs-right > .nav-tabs > li > a {
-  min-width: 74px;
-  margin-right: 0;
-  margin-bottom: 3px;
-}
-
-.tabs-left > .nav-tabs {
-  float: left;
-  margin-right: 19px;
-  border-right: 1px solid #ddd;
-}
-
-.tabs-left > .nav-tabs > li > a {
-  margin-right: -1px;
-  -webkit-border-radius: 4px 0 0 4px;
-     -moz-border-radius: 4px 0 0 4px;
-          border-radius: 4px 0 0 4px;
-}
-
-.tabs-left > .nav-tabs > li > a:hover,
-.tabs-left > .nav-tabs > li > a:focus {
-  border-color: #eeeeee #dddddd #eeeeee #eeeeee;
-}
-
-.tabs-left > .nav-tabs .active > a,
-.tabs-left > .nav-tabs .active > a:hover,
-.tabs-left > .nav-tabs .active > a:focus {
-  border-color: #ddd transparent #ddd #ddd;
-  *border-right-color: #ffffff;
-}
-
-.tabs-right > .nav-tabs {
-  float: right;
-  margin-left: 19px;
-  border-left: 1px solid #ddd;
-}
-
-.tabs-right > .nav-tabs > li > a {
-  margin-left: -1px;
-  -webkit-border-radius: 0 4px 4px 0;
-     -moz-border-radius: 0 4px 4px 0;
-          border-radius: 0 4px 4px 0;
-}
-
-.tabs-right > .nav-tabs > li > a:hover,
-.tabs-right > .nav-tabs > li > a:focus {
-  border-color: #eeeeee #eeeeee #eeeeee #dddddd;
-}
-
-.tabs-right > .nav-tabs .active > a,
-.tabs-right > .nav-tabs .active > a:hover,
-.tabs-right > .nav-tabs .active > a:focus {
-  border-color: #ddd #ddd #ddd transparent;
-  *border-left-color: #ffffff;
-}
-
-.nav > .disabled > a {
-  color: #999999;
-}
-
-.nav > .disabled > a:hover,
-.nav > .disabled > a:focus {
-  text-decoration: none;
-  cursor: default;
-  background-color: transparent;
-}
-
-.navbar {
-  *position: relative;
-  *z-index: 2;
-  margin-bottom: 20px;
-  overflow: visible;
-}
-
-.navbar-inner {
-  min-height: 40px;
-  padding-right: 20px;
-  padding-left: 20px;
-  background-color: #fafafa;
-  background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2));
-  background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2);
-  background-image: -o-linear-gradient(top, #ffffff, #f2f2f2);
-  background-image: linear-gradient(to bottom, #ffffff, #f2f2f2);
-  background-repeat: repeat-x;
-  border: 1px solid #d4d4d4;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
-  *zoom: 1;
-  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
-     -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
-          box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
-}
-
-.navbar-inner:before,
-.navbar-inner:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.navbar-inner:after {
-  clear: both;
-}
-
-.navbar .container {
-  width: auto;
-}
-
-.nav-collapse.collapse {
-  height: auto;
-  overflow: visible;
-}
-
-.navbar .brand {
-  display: block;
-  float: left;
-  padding: 10px 20px 10px;
-  margin-left: -20px;
-  font-size: 20px;
-  font-weight: 200;
-  color: #777777;
-  text-shadow: 0 1px 0 #ffffff;
-}
-
-.navbar .brand:hover,
-.navbar .brand:focus {
-  text-decoration: none;
-}
-
-.navbar-text {
-  margin-bottom: 0;
-  line-height: 40px;
-  color: #777777;
-}
-
-.navbar-link {
-  color: #777777;
-}
-
-.navbar-link:hover,
-.navbar-link:focus {
-  color: #333333;
-}
-
-.navbar .divider-vertical {
-  height: 40px;
-  margin: 0 9px;
-  border-right: 1px solid #ffffff;
-  border-left: 1px solid #f2f2f2;
-}
-
-.navbar .btn,
-.navbar .btn-group {
-  margin-top: 5px;
-}
-
-.navbar .btn-group .btn,
-.navbar .input-prepend .btn,
-.navbar .input-append .btn,
-.navbar .input-prepend .btn-group,
-.navbar .input-append .btn-group {
-  margin-top: 0;
-}
-
-.navbar-form {
-  margin-bottom: 0;
-  *zoom: 1;
-}
-
-.navbar-form:before,
-.navbar-form:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.navbar-form:after {
-  clear: both;
-}
-
-.navbar-form input,
-.navbar-form select,
-.navbar-form .radio,
-.navbar-form .checkbox {
-  margin-top: 5px;
-}
-
-.navbar-form input,
-.navbar-form select,
-.navbar-form .btn {
-  display: inline-block;
-  margin-bottom: 0;
-}
-
-.navbar-form input[type="image"],
-.navbar-form input[type="checkbox"],
-.navbar-form input[type="radio"] {
-  margin-top: 3px;
-}
-
-.navbar-form .input-append,
-.navbar-form .input-prepend {
-  margin-top: 5px;
-  white-space: nowrap;
-}
-
-.navbar-form .input-append input,
-.navbar-form .input-prepend input {
-  margin-top: 0;
-}
-
-.navbar-search {
-  position: relative;
-  float: left;
-  margin-top: 5px;
-  margin-bottom: 0;
-}
-
-.navbar-search .search-query {
-  padding: 4px 14px;
-  margin-bottom: 0;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
-  font-weight: normal;
-  line-height: 1;
-  -webkit-border-radius: 15px;
-     -moz-border-radius: 15px;
-          border-radius: 15px;
-}
-
-.navbar-static-top {
-  position: static;
-  margin-bottom: 0;
-}
-
-.navbar-static-top .navbar-inner {
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.navbar-fixed-top,
-.navbar-fixed-bottom {
-  position: fixed;
-  right: 0;
-  left: 0;
-  z-index: 1030;
-  margin-bottom: 0;
-}
-
-.navbar-fixed-top .navbar-inner,
-.navbar-static-top .navbar-inner {
-  border-width: 0 0 1px;
-}
-
-.navbar-fixed-bottom .navbar-inner {
-  border-width: 1px 0 0;
-}
-
-.navbar-fixed-top .navbar-inner,
-.navbar-fixed-bottom .navbar-inner {
-  padding-right: 0;
-  padding-left: 0;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.navbar-static-top .container,
-.navbar-fixed-top .container,
-.navbar-fixed-bottom .container {
-  width: 940px;
-}
-
-.navbar-fixed-top {
-  top: 0;
-}
-
-.navbar-fixed-top .navbar-inner,
-.navbar-static-top .navbar-inner {
-  -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
-     -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
-          box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
-}
-
-.navbar-fixed-bottom {
-  bottom: 0;
-}
-
-.navbar-fixed-bottom .navbar-inner {
-  -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
-     -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
-          box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
-}
-
-.navbar .nav {
-  position: relative;
-  left: 0;
-  display: block;
-  float: left;
-  margin: 0 10px 0 0;
-}
-
-.navbar .nav.pull-right {
-  float: right;
-  margin-right: 0;
-}
-
-.navbar .nav > li {
-  float: left;
-}
-
-.navbar .nav > li > a {
-  float: none;
-  padding: 10px 15px 10px;
-  color: #777777;
-  text-decoration: none;
-  text-shadow: 0 1px 0 #ffffff;
-}
-
-.navbar .nav .dropdown-toggle .caret {
-  margin-top: 8px;
-}
-
-.navbar .nav > li > a:focus,
-.navbar .nav > li > a:hover {
-  color: #333333;
-  text-decoration: none;
-  background-color: transparent;
-}
-
-.navbar .nav > .active > a,
-.navbar .nav > .active > a:hover,
-.navbar .nav > .active > a:focus {
-  color: #555555;
-  text-decoration: none;
-  background-color: #e5e5e5;
-  -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
-     -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
-          box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
-}
-
-.navbar .btn-navbar {
-  display: none;
-  float: right;
-  padding: 7px 10px;
-  margin-right: 5px;
-  margin-left: 5px;
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #ededed;
-  *background-color: #e5e5e5;
-  background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5));
-  background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5);
-  background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5);
-  background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5);
-  background-repeat: repeat-x;
-  border-color: #e5e5e5 #e5e5e5 #bfbfbf;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
-     -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
-}
-
-.navbar .btn-navbar:hover,
-.navbar .btn-navbar:focus,
-.navbar .btn-navbar:active,
-.navbar .btn-navbar.active,
-.navbar .btn-navbar.disabled,
-.navbar .btn-navbar[disabled] {
-  color: #ffffff;
-  background-color: #e5e5e5;
-  *background-color: #d9d9d9;
-}
-
-.navbar .btn-navbar:active,
-.navbar .btn-navbar.active {
-  background-color: #cccccc \9;
-}
-
-.navbar .btn-navbar .icon-bar {
-  display: block;
-  width: 18px;
-  height: 2px;
-  background-color: #f5f5f5;
-  -webkit-border-radius: 1px;
-     -moz-border-radius: 1px;
-          border-radius: 1px;
-  -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
-     -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
-          box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
-}
-
-.btn-navbar .icon-bar + .icon-bar {
-  margin-top: 3px;
-}
-
-.navbar .nav > li > .dropdown-menu:before {
-  position: absolute;
-  top: -7px;
-  left: 9px;
-  display: inline-block;
-  border-right: 7px solid transparent;
-  border-bottom: 7px solid #ccc;
-  border-left: 7px solid transparent;
-  border-bottom-color: rgba(0, 0, 0, 0.2);
-  content: '';
-}
-
-.navbar .nav > li > .dropdown-menu:after {
-  position: absolute;
-  top: -6px;
-  left: 10px;
-  display: inline-block;
-  border-right: 6px solid transparent;
-  border-bottom: 6px solid #ffffff;
-  border-left: 6px solid transparent;
-  content: '';
-}
-
-.navbar-fixed-bottom .nav > li > .dropdown-menu:before {
-  top: auto;
-  bottom: -7px;
-  border-top: 7px solid #ccc;
-  border-bottom: 0;
-  border-top-color: rgba(0, 0, 0, 0.2);
-}
-
-.navbar-fixed-bottom .nav > li > .dropdown-menu:after {
-  top: auto;
-  bottom: -6px;
-  border-top: 6px solid #ffffff;
-  border-bottom: 0;
-}
-
-.navbar .nav li.dropdown > a:hover .caret,
-.navbar .nav li.dropdown > a:focus .caret {
-  border-top-color: #333333;
-  border-bottom-color: #333333;
-}
-
-.navbar .nav li.dropdown.open > .dropdown-toggle,
-.navbar .nav li.dropdown.active > .dropdown-toggle,
-.navbar .nav li.dropdown.open.active > .dropdown-toggle {
-  color: #555555;
-  background-color: #e5e5e5;
-}
-
-.navbar .nav li.dropdown > .dropdown-toggle .caret {
-  border-top-color: #777777;
-  border-bottom-color: #777777;
-}
-
-.navbar .nav li.dropdown.open > .dropdown-toggle .caret,
-.navbar .nav li.dropdown.active > .dropdown-toggle .caret,
-.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret {
-  border-top-color: #555555;
-  border-bottom-color: #555555;
-}
-
-.navbar .pull-right > li > .dropdown-menu,
-.navbar .nav > li > .dropdown-menu.pull-right {
-  right: 0;
-  left: auto;
-}
-
-.navbar .pull-right > li > .dropdown-menu:before,
-.navbar .nav > li > .dropdown-menu.pull-right:before {
-  right: 12px;
-  left: auto;
-}
-
-.navbar .pull-right > li > .dropdown-menu:after,
-.navbar .nav > li > .dropdown-menu.pull-right:after {
-  right: 13px;
-  left: auto;
-}
-
-.navbar .pull-right > li > .dropdown-menu .dropdown-menu,
-.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu {
-  right: 100%;
-  left: auto;
-  margin-right: -1px;
-  margin-left: 0;
-  -webkit-border-radius: 6px 0 6px 6px;
-     -moz-border-radius: 6px 0 6px 6px;
-          border-radius: 6px 0 6px 6px;
-}
-
-.navbar-inverse .navbar-inner {
-  background-color: #1b1b1b;
-  background-image: -moz-linear-gradient(top, #222222, #111111);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111));
-  background-image: -webkit-linear-gradient(top, #222222, #111111);
-  background-image: -o-linear-gradient(top, #222222, #111111);
-  background-image: linear-gradient(to bottom, #222222, #111111);
-  background-repeat: repeat-x;
-  border-color: #252525;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
-}
-
-.navbar-inverse .brand,
-.navbar-inverse .nav > li > a {
-  color: #999999;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-}
-
-.navbar-inverse .brand:hover,
-.navbar-inverse .nav > li > a:hover,
-.navbar-inverse .brand:focus,
-.navbar-inverse .nav > li > a:focus {
-  color: #ffffff;
-}
-
-.navbar-inverse .brand {
-  color: #999999;
-}
-
-.navbar-inverse .navbar-text {
-  color: #999999;
-}
-
-.navbar-inverse .nav > li > a:focus,
-.navbar-inverse .nav > li > a:hover {
-  color: #ffffff;
-  background-color: transparent;
-}
-
-.navbar-inverse .nav .active > a,
-.navbar-inverse .nav .active > a:hover,
-.navbar-inverse .nav .active > a:focus {
-  color: #ffffff;
-  background-color: #111111;
-}
-
-.navbar-inverse .navbar-link {
-  color: #999999;
-}
-
-.navbar-inverse .navbar-link:hover,
-.navbar-inverse .navbar-link:focus {
-  color: #ffffff;
-}
-
-.navbar-inverse .divider-vertical {
-  border-right-color: #222222;
-  border-left-color: #111111;
-}
-
-.navbar-inverse .nav li.dropdown.open > .dropdown-toggle,
-.navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
-.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
-  color: #ffffff;
-  background-color: #111111;
-}
-
-.navbar-inverse .nav li.dropdown > a:hover .caret,
-.navbar-inverse .nav li.dropdown > a:focus .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
-}
-
-.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret {
-  border-top-color: #999999;
-  border-bottom-color: #999999;
-}
-
-.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret,
-.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret,
-.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
-}
-
-.navbar-inverse .navbar-search .search-query {
-  color: #ffffff;
-  background-color: #515151;
-  border-color: #111111;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
-     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
-          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
-  -webkit-transition: none;
-     -moz-transition: none;
-       -o-transition: none;
-          transition: none;
-}
-
-.navbar-inverse .navbar-search .search-query:-moz-placeholder {
-  color: #cccccc;
-}
-
-.navbar-inverse .navbar-search .search-query:-ms-input-placeholder {
-  color: #cccccc;
-}
-
-.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder {
-  color: #cccccc;
-}
-
-.navbar-inverse .navbar-search .search-query:focus,
-.navbar-inverse .navbar-search .search-query.focused {
-  padding: 5px 15px;
-  color: #333333;
-  text-shadow: 0 1px 0 #ffffff;
-  background-color: #ffffff;
-  border: 0;
-  outline: 0;
-  -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-     -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-          box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-}
-
-.navbar-inverse .btn-navbar {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #0e0e0e;
-  *background-color: #040404;
-  background-image: -moz-linear-gradient(top, #151515, #040404);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404));
-  background-image: -webkit-linear-gradient(top, #151515, #040404);
-  background-image: -o-linear-gradient(top, #151515, #040404);
-  background-image: linear-gradient(to bottom, #151515, #040404);
-  background-repeat: repeat-x;
-  border-color: #040404 #040404 #000000;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-}
-
-.navbar-inverse .btn-navbar:hover,
-.navbar-inverse .btn-navbar:focus,
-.navbar-inverse .btn-navbar:active,
-.navbar-inverse .btn-navbar.active,
-.navbar-inverse .btn-navbar.disabled,
-.navbar-inverse .btn-navbar[disabled] {
-  color: #ffffff;
-  background-color: #040404;
-  *background-color: #000000;
-}
-
-.navbar-inverse .btn-navbar:active,
-.navbar-inverse .btn-navbar.active {
-  background-color: #000000 \9;
-}
-
-.breadcrumb {
-  padding: 8px 15px;
-  margin: 0 0 20px;
-  list-style: none;
-  background-color: #f5f5f5;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-.breadcrumb > li {
-  display: inline-block;
-  *display: inline;
-  text-shadow: 0 1px 0 #ffffff;
-  *zoom: 1;
-}
-
-.breadcrumb > li > .divider {
-  padding: 0 5px;
-  color: #ccc;
-}
-
-.breadcrumb > .active {
-  color: #999999;
-}
-
-.pagination {
-  margin: 20px 0;
-}
-
-.pagination ul {
-  display: inline-block;
-  *display: inline;
-  margin-bottom: 0;
-  margin-left: 0;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  *zoom: 1;
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-.pagination ul > li {
-  display: inline;
-}
-
-.pagination ul > li > a,
-.pagination ul > li > span {
-  float: left;
-  padding: 4px 12px;
-  line-height: 20px;
-  text-decoration: none;
-  background-color: #ffffff;
-  border: 1px solid #dddddd;
-  border-left-width: 0;
-}
-
-.pagination ul > li > a:hover,
-.pagination ul > li > a:focus,
-.pagination ul > .active > a,
-.pagination ul > .active > span {
-  background-color: #f5f5f5;
-}
-
-.pagination ul > .active > a,
-.pagination ul > .active > span {
-  color: #999999;
-  cursor: default;
-}
-
-.pagination ul > .disabled > span,
-.pagination ul > .disabled > a,
-.pagination ul > .disabled > a:hover,
-.pagination ul > .disabled > a:focus {
-  color: #999999;
-  cursor: default;
-  background-color: transparent;
-}
-
-.pagination ul > li:first-child > a,
-.pagination ul > li:first-child > span {
-  border-left-width: 1px;
-  -webkit-border-bottom-left-radius: 4px;
-          border-bottom-left-radius: 4px;
-  -webkit-border-top-left-radius: 4px;
-          border-top-left-radius: 4px;
-  -moz-border-radius-bottomleft: 4px;
-  -moz-border-radius-topleft: 4px;
-}
-
-.pagination ul > li:last-child > a,
-.pagination ul > li:last-child > span {
-  -webkit-border-top-right-radius: 4px;
-          border-top-right-radius: 4px;
-  -webkit-border-bottom-right-radius: 4px;
-          border-bottom-right-radius: 4px;
-  -moz-border-radius-topright: 4px;
-  -moz-border-radius-bottomright: 4px;
-}
-
-.pagination-centered {
-  text-align: center;
-}
-
-.pagination-right {
-  text-align: right;
-}
-
-.pagination-large ul > li > a,
-.pagination-large ul > li > span {
-  padding: 11px 19px;
-  font-size: 17.5px;
-}
-
-.pagination-large ul > li:first-child > a,
-.pagination-large ul > li:first-child > span {
-  -webkit-border-bottom-left-radius: 6px;
-          border-bottom-left-radius: 6px;
-  -webkit-border-top-left-radius: 6px;
-          border-top-left-radius: 6px;
-  -moz-border-radius-bottomleft: 6px;
-  -moz-border-radius-topleft: 6px;
-}
-
-.pagination-large ul > li:last-child > a,
-.pagination-large ul > li:last-child > span {
-  -webkit-border-top-right-radius: 6px;
-          border-top-right-radius: 6px;
-  -webkit-border-bottom-right-radius: 6px;
-          border-bottom-right-radius: 6px;
-  -moz-border-radius-topright: 6px;
-  -moz-border-radius-bottomright: 6px;
-}
-
-.pagination-mini ul > li:first-child > a,
-.pagination-small ul > li:first-child > a,
-.pagination-mini ul > li:first-child > span,
-.pagination-small ul > li:first-child > span {
-  -webkit-border-bottom-left-radius: 3px;
-          border-bottom-left-radius: 3px;
-  -webkit-border-top-left-radius: 3px;
-          border-top-left-radius: 3px;
-  -moz-border-radius-bottomleft: 3px;
-  -moz-border-radius-topleft: 3px;
-}
-
-.pagination-mini ul > li:last-child > a,
-.pagination-small ul > li:last-child > a,
-.pagination-mini ul > li:last-child > span,
-.pagination-small ul > li:last-child > span {
-  -webkit-border-top-right-radius: 3px;
-          border-top-right-radius: 3px;
-  -webkit-border-bottom-right-radius: 3px;
-          border-bottom-right-radius: 3px;
-  -moz-border-radius-topright: 3px;
-  -moz-border-radius-bottomright: 3px;
-}
-
-.pagination-small ul > li > a,
-.pagination-small ul > li > span {
-  padding: 2px 10px;
-  font-size: 11.9px;
-}
-
-.pagination-mini ul > li > a,
-.pagination-mini ul > li > span {
-  padding: 0 6px;
-  font-size: 10.5px;
-}
-
-.pager {
-  margin: 20px 0;
-  text-align: center;
-  list-style: none;
-  *zoom: 1;
-}
-
-.pager:before,
-.pager:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.pager:after {
-  clear: both;
-}
-
-.pager li {
-  display: inline;
-}
-
-.pager li > a,
-.pager li > span {
-  display: inline-block;
-  padding: 5px 14px;
-  background-color: #fff;
-  border: 1px solid #ddd;
-  -webkit-border-radius: 15px;
-     -moz-border-radius: 15px;
-          border-radius: 15px;
-}
-
-.pager li > a:hover,
-.pager li > a:focus {
-  text-decoration: none;
-  background-color: #f5f5f5;
-}
-
-.pager .next > a,
-.pager .next > span {
-  float: right;
-}
-
-.pager .previous > a,
-.pager .previous > span {
-  float: left;
-}
-
-.pager .disabled > a,
-.pager .disabled > a:hover,
-.pager .disabled > a:focus,
-.pager .disabled > span {
-  color: #999999;
-  cursor: default;
-  background-color: #fff;
-}
-
-.modal-backdrop {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 1040;
-  background-color: #000000;
-}
-
-.modal-backdrop.fade {
-  opacity: 0;
-}
-
-.modal-backdrop,
-.modal-backdrop.fade.in {
-  opacity: 0.8;
-  filter: alpha(opacity=80);
-}
-
-.modal {
-  position: fixed;
-  top: 10%;
-  left: 50%;
-  z-index: 1050;
-  width: 560px;
-  margin-left: -280px;
-  background-color: #ffffff;
-  border: 1px solid #999;
-  border: 1px solid rgba(0, 0, 0, 0.3);
-  *border: 1px solid #999;
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-  outline: none;
-  -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-     -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-          box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-  -webkit-background-clip: padding-box;
-     -moz-background-clip: padding-box;
-          background-clip: padding-box;
-}
-
-.modal.fade {
-  top: -25%;
-  -webkit-transition: opacity 0.3s linear, top 0.3s ease-out;
-     -moz-transition: opacity 0.3s linear, top 0.3s ease-out;
-       -o-transition: opacity 0.3s linear, top 0.3s ease-out;
-          transition: opacity 0.3s linear, top 0.3s ease-out;
-}
-
-.modal.fade.in {
-  top: 10%;
-}
-
-.modal-header {
-  padding: 9px 15px;
-  border-bottom: 1px solid #eee;
-}
-
-.modal-header .close {
-  margin-top: 2px;
-}
-
-.modal-header h3 {
-  margin: 0;
-  line-height: 30px;
-}
-
-.modal-body {
-  position: relative;
-  max-height: 400px;
-  padding: 15px;
-  overflow-y: auto;
-}
-
-.modal-form {
-  margin-bottom: 0;
-}
-
-.modal-footer {
-  padding: 14px 15px 15px;
-  margin-bottom: 0;
-  text-align: right;
-  background-color: #f5f5f5;
-  border-top: 1px solid #ddd;
-  -webkit-border-radius: 0 0 6px 6px;
-     -moz-border-radius: 0 0 6px 6px;
-          border-radius: 0 0 6px 6px;
-  *zoom: 1;
-  -webkit-box-shadow: inset 0 1px 0 #ffffff;
-     -moz-box-shadow: inset 0 1px 0 #ffffff;
-          box-shadow: inset 0 1px 0 #ffffff;
-}
-
-.modal-footer:before,
-.modal-footer:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.modal-footer:after {
-  clear: both;
-}
-
-.modal-footer .btn + .btn {
-  margin-bottom: 0;
-  margin-left: 5px;
-}
-
-.modal-footer .btn-group .btn + .btn {
-  margin-left: -1px;
-}
-
-.modal-footer .btn-block + .btn-block {
-  margin-left: 0;
-}
-
-.tooltip {
-  position: absolute;
-  z-index: 1030;
-  display: block;
-  font-size: 11px;
-  line-height: 1.4;
-  opacity: 0;
-  filter: alpha(opacity=0);
-  visibility: visible;
-}
-
-.tooltip.in {
-  opacity: 0.8;
-  filter: alpha(opacity=80);
-}
-
-.tooltip.top {
-  padding: 5px 0;
-  margin-top: -3px;
-}
-
-.tooltip.right {
-  padding: 0 5px;
-  margin-left: 3px;
-}
-
-.tooltip.bottom {
-  padding: 5px 0;
-  margin-top: 3px;
-}
-
-.tooltip.left {
-  padding: 0 5px;
-  margin-left: -3px;
-}
-
-.tooltip-inner {
-  max-width: 200px;
-  padding: 8px;
-  color: #ffffff;
-  text-align: center;
-  text-decoration: none;
-  background-color: #000000;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-.tooltip-arrow {
-  position: absolute;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
-}
-
-.tooltip.top .tooltip-arrow {
-  bottom: 0;
-  left: 50%;
-  margin-left: -5px;
-  border-top-color: #000000;
-  border-width: 5px 5px 0;
-}
-
-.tooltip.right .tooltip-arrow {
-  top: 50%;
-  left: 0;
-  margin-top: -5px;
-  border-right-color: #000000;
-  border-width: 5px 5px 5px 0;
-}
-
-.tooltip.left .tooltip-arrow {
-  top: 50%;
-  right: 0;
-  margin-top: -5px;
-  border-left-color: #000000;
-  border-width: 5px 0 5px 5px;
-}
-
-.tooltip.bottom .tooltip-arrow {
-  top: 0;
-  left: 50%;
-  margin-left: -5px;
-  border-bottom-color: #000000;
-  border-width: 0 5px 5px;
-}
-
-.popover {
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 1010;
-  display: none;
-  max-width: 276px;
-  padding: 1px;
-  text-align: left;
-  white-space: normal;
-  background-color: #ffffff;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-  -webkit-background-clip: padding-box;
-     -moz-background-clip: padding;
-          background-clip: padding-box;
-}
-
-.popover.top {
-  margin-top: -10px;
-}
-
-.popover.right {
-  margin-left: 10px;
-}
-
-.popover.bottom {
-  margin-top: 10px;
-}
-
-.popover.left {
-  margin-left: -10px;
-}
-
-.popover-title {
-  padding: 8px 14px;
-  margin: 0;
-  font-size: 14px;
-  font-weight: normal;
-  line-height: 18px;
-  background-color: #f7f7f7;
-  border-bottom: 1px solid #ebebeb;
-  -webkit-border-radius: 5px 5px 0 0;
-     -moz-border-radius: 5px 5px 0 0;
-          border-radius: 5px 5px 0 0;
-}
-
-.popover-title:empty {
-  display: none;
-}
-
-.popover-content {
-  padding: 9px 14px;
-}
-
-.popover .arrow,
-.popover .arrow:after {
-  position: absolute;
-  display: block;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
-}
-
-.popover .arrow {
-  border-width: 11px;
-}
-
-.popover .arrow:after {
-  border-width: 10px;
-  content: "";
-}
-
-.popover.top .arrow {
-  bottom: -11px;
-  left: 50%;
-  margin-left: -11px;
-  border-top-color: #999;
-  border-top-color: rgba(0, 0, 0, 0.25);
-  border-bottom-width: 0;
-}
-
-.popover.top .arrow:after {
-  bottom: 1px;
-  margin-left: -10px;
-  border-top-color: #ffffff;
-  border-bottom-width: 0;
-}
-
-.popover.right .arrow {
-  top: 50%;
-  left: -11px;
-  margin-top: -11px;
-  border-right-color: #999;
-  border-right-color: rgba(0, 0, 0, 0.25);
-  border-left-width: 0;
-}
-
-.popover.right .arrow:after {
-  bottom: -10px;
-  left: 1px;
-  border-right-color: #ffffff;
-  border-left-width: 0;
-}
-
-.popover.bottom .arrow {
-  top: -11px;
-  left: 50%;
-  margin-left: -11px;
-  border-bottom-color: #999;
-  border-bottom-color: rgba(0, 0, 0, 0.25);
-  border-top-width: 0;
-}
-
-.popover.bottom .arrow:after {
-  top: 1px;
-  margin-left: -10px;
-  border-bottom-color: #ffffff;
-  border-top-width: 0;
-}
-
-.popover.left .arrow {
-  top: 50%;
-  right: -11px;
-  margin-top: -11px;
-  border-left-color: #999;
-  border-left-color: rgba(0, 0, 0, 0.25);
-  border-right-width: 0;
-}
-
-.popover.left .arrow:after {
-  right: 1px;
-  bottom: -10px;
-  border-left-color: #ffffff;
-  border-right-width: 0;
-}
-
-.thumbnails {
-  margin-left: -20px;
-  list-style: none;
-  *zoom: 1;
-}
-
-.thumbnails:before,
-.thumbnails:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.thumbnails:after {
-  clear: both;
-}
-
-.row-fluid .thumbnails {
-  margin-left: 0;
-}
-
-.thumbnails > li {
-  float: left;
-  margin-bottom: 20px;
-  margin-left: 20px;
-}
-
-.thumbnail {
-  display: block;
-  padding: 4px;
-  line-height: 20px;
-  border: 1px solid #ddd;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
-     -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
-          box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
-  -webkit-transition: all 0.2s ease-in-out;
-     -moz-transition: all 0.2s ease-in-out;
-       -o-transition: all 0.2s ease-in-out;
-          transition: all 0.2s ease-in-out;
-}
-
-a.thumbnail:hover,
-a.thumbnail:focus {
-  border-color: #0088cc;
-  -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
-     -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
-          box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
-}
-
-.thumbnail > img {
-  display: block;
-  max-width: 100%;
-  margin-right: auto;
-  margin-left: auto;
-}
-
-.thumbnail .caption {
-  padding: 9px;
-  color: #555555;
-}
-
-.media,
-.media-body {
-  overflow: hidden;
-  *overflow: visible;
-  zoom: 1;
-}
-
-.media,
-.media .media {
-  margin-top: 15px;
-}
-
-.media:first-child {
-  margin-top: 0;
-}
-
-.media-object {
-  display: block;
-}
-
-.media-heading {
-  margin: 0 0 5px;
-}
-
-.media > .pull-left {
-  margin-right: 10px;
-}
-
-.media > .pull-right {
-  margin-left: 10px;
-}
-
-.media-list {
-  margin-left: 0;
-  list-style: none;
-}
-
-.label,
-.badge {
-  display: inline-block;
-  padding: 2px 4px;
-  font-size: 11.844px;
-  font-weight: bold;
-  line-height: 14px;
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  white-space: nowrap;
-  vertical-align: baseline;
-  background-color: #999999;
-}
-
-.label {
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-          border-radius: 3px;
-}
-
-.badge {
-  padding-right: 9px;
-  padding-left: 9px;
-  -webkit-border-radius: 9px;
-     -moz-border-radius: 9px;
-          border-radius: 9px;
-}
-
-.label:empty,
-.badge:empty {
-  display: none;
-}
-
-a.label:hover,
-a.label:focus,
-a.badge:hover,
-a.badge:focus {
-  color: #ffffff;
-  text-decoration: none;
-  cursor: pointer;
-}
-
-.label-important,
-.badge-important {
-  background-color: #b94a48;
-}
-
-.label-important[href],
-.badge-important[href] {
-  background-color: #953b39;
-}
-
-.label-warning,
-.badge-warning {
-  background-color: #f89406;
-}
-
-.label-warning[href],
-.badge-warning[href] {
-  background-color: #c67605;
-}
-
-.label-success,
-.badge-success {
-  background-color: #468847;
-}
-
-.label-success[href],
-.badge-success[href] {
-  background-color: #356635;
-}
-
-.label-info,
-.badge-info {
-  background-color: #3a87ad;
-}
-
-.label-info[href],
-.badge-info[href] {
-  background-color: #2d6987;
-}
-
-.label-inverse,
-.badge-inverse {
-  background-color: #333333;
-}
-
-.label-inverse[href],
-.badge-inverse[href] {
-  background-color: #1a1a1a;
-}
-
-.btn .label,
-.btn .badge {
-  position: relative;
-  top: -1px;
-}
-
-.btn-mini .label,
-.btn-mini .badge {
-  top: 0;
-}
-
-@-webkit-keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-
-@-moz-keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-
-@-ms-keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-
-@-o-keyframes progress-bar-stripes {
-  from {
-    background-position: 0 0;
-  }
-  to {
-    background-position: 40px 0;
-  }
-}
-
-@keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-
-.progress {
-  height: 20px;
-  margin-bottom: 20px;
-  overflow: hidden;
-  background-color: #f7f7f7;
-  background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));
-  background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9);
-  background-repeat: repeat-x;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-}
-
-.progress .bar {
-  float: left;
-  width: 0;
-  height: 100%;
-  font-size: 12px;
-  color: #ffffff;
-  text-align: center;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #0e90d2;
-  background-image: -moz-linear-gradient(top, #149bdf, #0480be);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));
-  background-image: -webkit-linear-gradient(top, #149bdf, #0480be);
-  background-image: -o-linear-gradient(top, #149bdf, #0480be);
-  background-image: linear-gradient(to bottom, #149bdf, #0480be);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);
-  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-     -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-  -webkit-transition: width 0.6s ease;
-     -moz-transition: width 0.6s ease;
-       -o-transition: width 0.6s ease;
-          transition: width 0.6s ease;
-}
-
-.progress .bar + .bar {
-  -webkit-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-     -moz-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-          box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-}
-
-.progress-striped .bar {
-  background-color: #149bdf;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  -webkit-background-size: 40px 40px;
-     -moz-background-size: 40px 40px;
-       -o-background-size: 40px 40px;
-          background-size: 40px 40px;
-}
-
-.progress.active .bar {
-  -webkit-animation: progress-bar-stripes 2s linear infinite;
-     -moz-animation: progress-bar-stripes 2s linear infinite;
-      -ms-animation: progress-bar-stripes 2s linear infinite;
-       -o-animation: progress-bar-stripes 2s linear infinite;
-          animation: progress-bar-stripes 2s linear infinite;
-}
-
-.progress-danger .bar,
-.progress .bar-danger {
-  background-color: #dd514c;
-  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
-  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: linear-gradient(to bottom, #ee5f5b, #c43c35);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0);
-}
-
-.progress-danger.progress-striped .bar,
-.progress-striped .bar-danger {
-  background-color: #ee5f5b;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-
-.progress-success .bar,
-.progress .bar-success {
-  background-color: #5eb95e;
-  background-image: -moz-linear-gradient(top, #62c462, #57a957);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
-  background-image: -webkit-linear-gradient(top, #62c462, #57a957);
-  background-image: -o-linear-gradient(top, #62c462, #57a957);
-  background-image: linear-gradient(to bottom, #62c462, #57a957);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0);
-}
-
-.progress-success.progress-striped .bar,
-.progress-striped .bar-success {
-  background-color: #62c462;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-
-.progress-info .bar,
-.progress .bar-info {
-  background-color: #4bb1cf;
-  background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));
-  background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: linear-gradient(to bottom, #5bc0de, #339bb9);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0);
-}
-
-.progress-info.progress-striped .bar,
-.progress-striped .bar-info {
-  background-color: #5bc0de;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-
-.progress-warning .bar,
-.progress .bar-warning {
-  background-color: #faa732;
-  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
-  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
-  background-image: -o-linear-gradient(top, #fbb450, #f89406);
-  background-image: linear-gradient(to bottom, #fbb450, #f89406);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
-}
-
-.progress-warning.progress-striped .bar,
-.progress-striped .bar-warning {
-  background-color: #fbb450;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-
-.accordion {
-  margin-bottom: 20px;
-}
-
-.accordion-group {
-  margin-bottom: 2px;
-  border: 1px solid #e5e5e5;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-.accordion-heading {
-  border-bottom: 0;
-}
-
-.accordion-heading .accordion-toggle {
-  display: block;
-  padding: 8px 15px;
-}
-
-.accordion-toggle {
-  cursor: pointer;
-}
-
-.accordion-inner {
-  padding: 9px 15px;
-  border-top: 1px solid #e5e5e5;
-}
-
-.carousel {
-  position: relative;
-  margin-bottom: 20px;
-  line-height: 1;
-}
-
-.carousel-inner {
-  position: relative;
-  width: 100%;
-  overflow: hidden;
-}
-
-.carousel-inner > .item {
-  position: relative;
-  display: none;
-  -webkit-transition: 0.6s ease-in-out left;
-     -moz-transition: 0.6s ease-in-out left;
-       -o-transition: 0.6s ease-in-out left;
-          transition: 0.6s ease-in-out left;
-}
-
-.carousel-inner > .item > img,
-.carousel-inner > .item > a > img {
-  display: block;
-  line-height: 1;
-}
-
-.carousel-inner > .active,
-.carousel-inner > .next,
-.carousel-inner > .prev {
-  display: block;
-}
-
-.carousel-inner > .active {
-  left: 0;
-}
-
-.carousel-inner > .next,
-.carousel-inner > .prev {
-  position: absolute;
-  top: 0;
-  width: 100%;
-}
-
-.carousel-inner > .next {
-  left: 100%;
-}
-
-.carousel-inner > .prev {
-  left: -100%;
-}
-
-.carousel-inner > .next.left,
-.carousel-inner > .prev.right {
-  left: 0;
-}
-
-.carousel-inner > .active.left {
-  left: -100%;
-}
-
-.carousel-inner > .active.right {
-  left: 100%;
-}
-
-.carousel-control {
-  position: absolute;
-  top: 40%;
-  left: 15px;
-  width: 40px;
-  height: 40px;
-  margin-top: -20px;
-  font-size: 60px;
-  font-weight: 100;
-  line-height: 30px;
-  color: #ffffff;
-  text-align: center;
-  background: #222222;
-  border: 3px solid #ffffff;
-  -webkit-border-radius: 23px;
-     -moz-border-radius: 23px;
-          border-radius: 23px;
-  opacity: 0.5;
-  filter: alpha(opacity=50);
-}
-
-.carousel-control.right {
-  right: 15px;
-  left: auto;
-}
-
-.carousel-control:hover,
-.carousel-control:focus {
-  color: #ffffff;
-  text-decoration: none;
-  opacity: 0.9;
-  filter: alpha(opacity=90);
-}
-
-.carousel-indicators {
-  position: absolute;
-  top: 15px;
-  right: 15px;
-  z-index: 5;
-  margin: 0;
-  list-style: none;
-}
-
-.carousel-indicators li {
-  display: block;
-  float: left;
-  width: 10px;
-  height: 10px;
-  margin-left: 5px;
-  text-indent: -999px;
-  background-color: #ccc;
-  background-color: rgba(255, 255, 255, 0.25);
-  border-radius: 5px;
-}
-
-.carousel-indicators .active {
-  background-color: #fff;
-}
-
-.carousel-caption {
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  padding: 15px;
-  background: #333333;
-  background: rgba(0, 0, 0, 0.75);
-}
-
-.carousel-caption h4,
-.carousel-caption p {
-  line-height: 20px;
-  color: #ffffff;
-}
-
-.carousel-caption h4 {
-  margin: 0 0 5px;
-}
-
-.carousel-caption p {
-  margin-bottom: 0;
-}
-
-.hero-unit {
-  padding: 60px;
-  margin-bottom: 30px;
-  font-size: 18px;
-  font-weight: 200;
-  line-height: 30px;
-  color: inherit;
-  background-color: #eeeeee;
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-}
-
-.hero-unit h1 {
-  margin-bottom: 0;
-  font-size: 60px;
-  line-height: 1;
-  letter-spacing: -1px;
-  color: inherit;
-}
-
-.hero-unit li {
-  line-height: 30px;
-}
-
-.pull-right {
-  float: right;
-}
-
-.pull-left {
-  float: left;
-}
-
-.hide {
-  display: none;
-}
-
-.show {
-  display: block;
-}
-
-.invisible {
-  visibility: hidden;
-}
-
-.affix {
-  position: fixed;
-}
diff --git a/app/css/bootstrap.min.css b/app/css/bootstrap.min.css
deleted file mode 100644
index c10c7f4..0000000
--- a/app/css/bootstrap.min.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * Bootstrap v2.3.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}a:hover,a:active{outline:0}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{width:auto\9;height:auto;max-width:100%;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic}#map_canvas img,.google-maps img{max-width:none}button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle}button,input{*overflow:visible;line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}button,html input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}label,select,button,input[type="button"],input[type="reset"],input[type="submit"],input[type="radio"],input[type="checkbox"]{cursor:pointer}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}textarea{overflow:auto;vertical-align:top}@media print{*{color:#000!important;text-shadow:none!important;background:transparent!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}@page{margin:.5cm}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}}body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:20px;color:#333;background-color:#fff}a{color:#08c;text-decoration:none}a:hover,a:focus{color:#005580;text-decoration:underline}.img-rounded{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.img-polaroid{padding:4px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.1);box-shadow:0 1px 3px rgba(0,0,0,0.1)}.img-circle{-webkit-border-radius:500px;-moz-border-radius:500px;border-radius:500px}.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.span12{width:940px}.span11{width:860px}.span10{width:780px}.span9{width:700px}.span8{width:620px}.span7{width:540px}.span6{width:460px}.span5{width:380px}.span4{width:300px}.span3{width:220px}.span2{width:140px}.span1{width:60px}.offset12{margin-left:980px}.offset11{margin-left:900px}.offset10{margin-left:820px}.offset9{margin-left:740px}.offset8{margin-left:660px}.offset7{margin-left:580px}.offset6{margin-left:500px}.offset5{margin-left:420px}.offset4{margin-left:340px}.offset3{margin-left:260px}.offset2{margin-left:180px}.offset1{margin-left:100px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.127659574468085%;*margin-left:2.074468085106383%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.127659574468085%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.48936170212765%;*width:91.43617021276594%}.row-fluid .span10{width:82.97872340425532%;*width:82.92553191489361%}.row-fluid .span9{width:74.46808510638297%;*width:74.41489361702126%}.row-fluid .span8{width:65.95744680851064%;*width:65.90425531914893%}.row-fluid .span7{width:57.44680851063829%;*width:57.39361702127659%}.row-fluid .span6{width:48.93617021276595%;*width:48.88297872340425%}.row-fluid .span5{width:40.42553191489362%;*width:40.37234042553192%}.row-fluid .span4{width:31.914893617021278%;*width:31.861702127659576%}.row-fluid .span3{width:23.404255319148934%;*width:23.351063829787233%}.row-fluid .span2{width:14.893617021276595%;*width:14.840425531914894%}.row-fluid .span1{width:6.382978723404255%;*width:6.329787234042553%}.row-fluid .offset12{margin-left:104.25531914893617%;*margin-left:104.14893617021275%}.row-fluid .offset12:first-child{margin-left:102.12765957446808%;*margin-left:102.02127659574467%}.row-fluid .offset11{margin-left:95.74468085106382%;*margin-left:95.6382978723404%}.row-fluid .offset11:first-child{margin-left:93.61702127659574%;*margin-left:93.51063829787232%}.row-fluid .offset10{margin-left:87.23404255319149%;*margin-left:87.12765957446807%}.row-fluid .offset10:first-child{margin-left:85.1063829787234%;*margin-left:84.99999999999999%}.row-fluid .offset9{margin-left:78.72340425531914%;*margin-left:78.61702127659572%}.row-fluid .offset9:first-child{margin-left:76.59574468085106%;*margin-left:76.48936170212764%}.row-fluid .offset8{margin-left:70.2127659574468%;*margin-left:70.10638297872339%}.row-fluid .offset8:first-child{margin-left:68.08510638297872%;*margin-left:67.9787234042553%}.row-fluid .offset7{margin-left:61.70212765957446%;*margin-left:61.59574468085106%}.row-fluid .offset7:first-child{margin-left:59.574468085106375%;*margin-left:59.46808510638297%}.row-fluid .offset6{margin-left:53.191489361702125%;*margin-left:53.085106382978715%}.row-fluid .offset6:first-child{margin-left:51.063829787234035%;*margin-left:50.95744680851063%}.row-fluid .offset5{margin-left:44.68085106382979%;*margin-left:44.57446808510638%}.row-fluid .offset5:first-child{margin-left:42.5531914893617%;*margin-left:42.4468085106383%}.row-fluid .offset4{margin-left:36.170212765957444%;*margin-left:36.06382978723405%}.row-fluid .offset4:first-child{margin-left:34.04255319148936%;*margin-left:33.93617021276596%}.row-fluid .offset3{margin-left:27.659574468085104%;*margin-left:27.5531914893617%}.row-fluid .offset3:first-child{margin-left:25.53191489361702%;*margin-left:25.425531914893618%}.row-fluid .offset2{margin-left:19.148936170212764%;*margin-left:19.04255319148936%}.row-fluid .offset2:first-child{margin-left:17.02127659574468%;*margin-left:16.914893617021278%}.row-fluid .offset1{margin-left:10.638297872340425%;*margin-left:10.53191489361702%}.row-fluid .offset1:first-child{margin-left:8.51063829787234%;*margin-left:8.404255319148938%}[class*="span"].hide,.row-fluid [class*="span"].hide{display:none}[class*="span"].pull-right,.row-fluid [class*="span"].pull-right{float:right}.container{margin-right:auto;margin-left:auto;*zoom:1}.container:before,.container:after{display:table;line-height:0;content:""}.container:after{clear:both}.container-fluid{padding-right:20px;padding-left:20px;*zoom:1}.container-fluid:before,.container-fluid:after{display:table;line-height:0;content:""}.container-fluid:after{clear:both}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:21px;font-weight:200;line-height:30px}small{font-size:85%}strong{font-weight:bold}em{font-style:italic}cite{font-style:normal}.muted{color:#999}a.muted:hover,a.muted:focus{color:#808080}.text-warning{color:#c09853}a.text-warning:hover,a.text-warning:focus{color:#a47e3c}.text-error{color:#b94a48}a.text-error:hover,a.text-error:focus{color:#953b39}.text-info{color:#3a87ad}a.text-info:hover,a.text-info:focus{color:#2d6987}.text-success{color:#468847}a.text-success:hover,a.text-success:focus{color:#356635}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}h1,h2,h3,h4,h5,h6{margin:10px 0;font-family:inherit;font-weight:bold;line-height:20px;color:inherit;text-rendering:optimizelegibility}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;line-height:1;color:#999}h1,h2,h3{line-height:40px}h1{font-size:38.5px}h2{font-size:31.5px}h3{font-size:24.5px}h4{font-size:17.5px}h5{font-size:14px}h6{font-size:11.9px}h1 small{font-size:24.5px}h2 small{font-size:17.5px}h3 small{font-size:14px}h4 small{font-size:14px}.page-header{padding-bottom:9px;margin:20px 0 30px;border-bottom:1px solid #eee}ul,ol{padding:0;margin:0 0 10px 25px}ul ul,ul ol,ol ol,ol ul{margin-bottom:0}li{line-height:20px}ul.unstyled,ol.unstyled{margin-left:0;list-style:none}ul.inline,ol.inline{margin-left:0;list-style:none}ul.inline>li,ol.inline>li{display:inline-block;*display:inline;padding-right:5px;padding-left:5px;*zoom:1}dl{margin-bottom:20px}dt,dd{line-height:20px}dt{font-weight:bold}dd{margin-left:10px}.dl-horizontal{*zoom:1}.dl-horizontal:before,.dl-horizontal:after{display:table;line-height:0;content:""}.dl-horizontal:after{clear:both}.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}hr{margin:20px 0;border:0;border-top:1px solid #eee;border-bottom:1px solid #fff}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}abbr.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:0 0 0 15px;margin:0 0 20px;border-left:5px solid #eee}blockquote p{margin-bottom:0;font-size:17.5px;font-weight:300;line-height:1.25}blockquote small{display:block;line-height:20px;color:#999}blockquote small:before{content:'\2014 \00A0'}blockquote.pull-right{float:right;padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0}blockquote.pull-right p,blockquote.pull-right small{text-align:right}blockquote.pull-right small:before{content:''}blockquote.pull-right small:after{content:'\00A0 \2014'}q:before,q:after,blockquote:before,blockquote:after{content:""}address{display:block;margin-bottom:20px;font-style:normal;line-height:20px}code,pre{padding:0 3px 2px;font-family:Monaco,Menlo,Consolas,"Courier New",monospace;font-size:12px;color:#333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}code{padding:2px 4px;color:#d14;white-space:nowrap;background-color:#f7f7f9;border:1px solid #e1e1e8}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:20px;word-break:break-all;word-wrap:break-word;white-space:pre;white-space:pre-wrap;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}pre.prettyprint{margin-bottom:20px}pre code{padding:0;color:inherit;white-space:pre;white-space:pre-wrap;background-color:transparent;border:0}.pre-scrollable{max-height:340px;overflow-y:scroll}form{margin:0 0 20px}fieldset{padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:40px;color:#333;border:0;border-bottom:1px solid #e5e5e5}legend small{font-size:15px;color:#999}label,input,button,select,textarea{font-size:14px;font-weight:normal;line-height:20px}input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif}label{display:block;margin-bottom:5px}select,textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{display:inline-block;height:20px;padding:4px 6px;margin-bottom:10px;font-size:14px;line-height:20px;color:#555;vertical-align:middle;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}input,textarea,.uneditable-input{width:206px}textarea{height:auto}textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{background-color:#fff;border:1px solid #ccc;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border linear .2s,box-shadow linear .2s;-moz-transition:border linear .2s,box-shadow linear .2s;-o-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s}textarea:focus,input[type="text"]:focus,input[type="password"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus,.uneditable-input:focus{border-color:rgba(82,168,236,0.8);outline:0;outline:thin dotted \9;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;*margin-top:0;line-height:normal}input[type="file"],input[type="image"],input[type="submit"],input[type="reset"],input[type="button"],input[type="radio"],input[type="checkbox"]{width:auto}select,input[type="file"]{height:30px;*margin-top:4px;line-height:30px}select{width:220px;background-color:#fff;border:1px solid #ccc}select[multiple],select[size]{height:auto}select:focus,input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.uneditable-input,.uneditable-textarea{color:#999;cursor:not-allowed;background-color:#fcfcfc;border-color:#ccc;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);box-shadow:inset 0 1px 2px rgba(0,0,0,0.025)}.uneditable-input{overflow:hidden;white-space:nowrap}.uneditable-textarea{width:auto;height:auto}input:-moz-placeholder,textarea:-moz-placeholder{color:#999}input:-ms-input-placeholder,textarea:-ms-input-placeholder{color:#999}input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{color:#999}.radio,.checkbox{min-height:20px;padding-left:20px}.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-20px}.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px}.radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle}.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px}.input-mini{width:60px}.input-small{width:90px}.input-medium{width:150px}.input-large{width:210px}.input-xlarge{width:270px}.input-xxlarge{width:530px}input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"]{float:none;margin-left:0}.input-append input[class*="span"],.input-append .uneditable-input[class*="span"],.input-prepend input[class*="span"],.input-prepend .uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"],.row-fluid .input-prepend [class*="span"],.row-fluid .input-append [class*="span"]{display:inline-block}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:926px}input.span11,textarea.span11,.uneditable-input.span11{width:846px}input.span10,textarea.span10,.uneditable-input.span10{width:766px}input.span9,textarea.span9,.uneditable-input.span9{width:686px}input.span8,textarea.span8,.uneditable-input.span8{width:606px}input.span7,textarea.span7,.uneditable-input.span7{width:526px}input.span6,textarea.span6,.uneditable-input.span6{width:446px}input.span5,textarea.span5,.uneditable-input.span5{width:366px}input.span4,textarea.span4,.uneditable-input.span4{width:286px}input.span3,textarea.span3,.uneditable-input.span3{width:206px}input.span2,textarea.span2,.uneditable-input.span2{width:126px}input.span1,textarea.span1,.uneditable-input.span1{width:46px}.controls-row{*zoom:1}.controls-row:before,.controls-row:after{display:table;line-height:0;content:""}.controls-row:after{clear:both}.controls-row [class*="span"],.row-fluid .controls-row [class*="span"]{float:left}.controls-row .checkbox[class*="span"],.controls-row .radio[class*="span"]{padding-top:5px}input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#eee}input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio"][readonly],input[type="checkbox"][readonly]{background-color:transparent}.control-group.warning .control-label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853}.control-group.warning .checkbox,.control-group.warning .radio,.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853}.control-group.warning input,.control-group.warning select,.control-group.warning textarea{border-color:#c09853;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e}.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853}.control-group.error .control-label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48}.control-group.error .checkbox,.control-group.error .radio,.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48}.control-group.error input,.control-group.error select,.control-group.error textarea{border-color:#b94a48;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392}.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48}.control-group.success .control-label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847}.control-group.success .checkbox,.control-group.success .radio,.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847}.control-group.success input,.control-group.success select,.control-group.success textarea{border-color:#468847;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b}.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847}.control-group.info .control-label,.control-group.info .help-block,.control-group.info .help-inline{color:#3a87ad}.control-group.info .checkbox,.control-group.info .radio,.control-group.info input,.control-group.info select,.control-group.info textarea{color:#3a87ad}.control-group.info input,.control-group.info select,.control-group.info textarea{border-color:#3a87ad;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.info input:focus,.control-group.info select:focus,.control-group.info textarea:focus{border-color:#2d6987;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3}.control-group.info .input-prepend .add-on,.control-group.info .input-append .add-on{color:#3a87ad;background-color:#d9edf7;border-color:#3a87ad}input:focus:invalid,textarea:focus:invalid,select:focus:invalid{color:#b94a48;border-color:#ee5f5b}input:focus:invalid:focus,textarea:focus:invalid:focus,select:focus:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7}.form-actions{padding:19px 20px 20px;margin-top:20px;margin-bottom:20px;background-color:#f5f5f5;border-top:1px solid #e5e5e5;*zoom:1}.form-actions:before,.form-actions:after{display:table;line-height:0;content:""}.form-actions:after{clear:both}.help-block,.help-inline{color:#595959}.help-block{display:block;margin-bottom:10px}.help-inline{display:inline-block;*display:inline;padding-left:5px;vertical-align:middle;*zoom:1}.input-append,.input-prepend{display:inline-block;margin-bottom:10px;font-size:0;white-space:nowrap;vertical-align:middle}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input,.input-append .dropdown-menu,.input-prepend .dropdown-menu,.input-append .popover,.input-prepend .popover{font-size:14px}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input{position:relative;margin-bottom:0;*margin-left:0;vertical-align:top;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-append input:focus,.input-prepend input:focus,.input-append select:focus,.input-prepend select:focus,.input-append .uneditable-input:focus,.input-prepend .uneditable-input:focus{z-index:2}.input-append .add-on,.input-prepend .add-on{display:inline-block;width:auto;height:20px;min-width:16px;padding:4px 5px;font-size:14px;font-weight:normal;line-height:20px;text-align:center;text-shadow:0 1px 0 #fff;background-color:#eee;border:1px solid #ccc}.input-append .add-on,.input-prepend .add-on,.input-append .btn,.input-prepend .btn,.input-append .btn-group>.dropdown-toggle,.input-prepend .btn-group>.dropdown-toggle{vertical-align:top;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-append .active,.input-prepend .active{background-color:#a9dba9;border-color:#46a546}.input-prepend .add-on,.input-prepend .btn{margin-right:-1px}.input-prepend .add-on:first-child,.input-prepend .btn:first-child{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-append input,.input-append select,.input-append .uneditable-input{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-append input+.btn-group .btn:last-child,.input-append select+.btn-group .btn:last-child,.input-append .uneditable-input+.btn-group .btn:last-child{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-append .add-on,.input-append .btn,.input-append .btn-group{margin-left:-1px}.input-append .add-on:last-child,.input-append .btn:last-child,.input-append .btn-group:last-child>.dropdown-toggle{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append input,.input-prepend.input-append select,.input-prepend.input-append .uneditable-input{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-prepend.input-append input+.btn-group .btn,.input-prepend.input-append select+.btn-group .btn,.input-prepend.input-append .uneditable-input+.btn-group .btn{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append .add-on:first-child,.input-prepend.input-append .btn:first-child{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-prepend.input-append .add-on:last-child,.input-prepend.input-append .btn:last-child{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append .btn-group:first-child{margin-left:0}input.search-query{padding-right:14px;padding-right:4px \9;padding-left:14px;padding-left:4px \9;margin-bottom:0;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.form-search .input-append .search-query,.form-search .input-prepend .search-query{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.form-search .input-append .search-query{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px}.form-search .input-append .btn{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0}.form-search .input-prepend .search-query{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0}.form-search .input-prepend .btn{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px}.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input,.form-search .input-prepend,.form-inline .input-prepend,.form-horizontal .input-prepend,.form-search .input-append,.form-inline .input-append,.form-horizontal .input-append{display:inline-block;*display:inline;margin-bottom:0;vertical-align:middle;*zoom:1}.form-search .hide,.form-inline .hide,.form-horizontal .hide{display:none}.form-search label,.form-inline label,.form-search .btn-group,.form-inline .btn-group{display:inline-block}.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{margin-bottom:0}.form-search .radio,.form-search .checkbox,.form-inline .radio,.form-inline .checkbox{padding-left:0;margin-bottom:0;vertical-align:middle}.form-search .radio input[type="radio"],.form-search .checkbox input[type="checkbox"],.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:left;margin-right:3px;margin-left:0}.control-group{margin-bottom:10px}legend+.control-group{margin-top:20px;-webkit-margin-top-collapse:separate}.form-horizontal .control-group{margin-bottom:20px;*zoom:1}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;line-height:0;content:""}.form-horizontal .control-group:after{clear:both}.form-horizontal .control-label{float:left;width:160px;padding-top:5px;text-align:right}.form-horizontal .controls{*display:inline-block;*padding-left:20px;margin-left:180px;*margin-left:0}.form-horizontal .controls:first-child{*padding-left:180px}.form-horizontal .help-block{margin-bottom:0}.form-horizontal input+.help-block,.form-horizontal select+.help-block,.form-horizontal textarea+.help-block,.form-horizontal .uneditable-input+.help-block,.form-horizontal .input-prepend+.help-block,.form-horizontal .input-append+.help-block{margin-top:10px}.form-horizontal .form-actions{padding-left:180px}table{max-width:100%;background-color:transparent;border-collapse:collapse;border-spacing:0}.table{width:100%;margin-bottom:20px}.table th,.table td{padding:8px;line-height:20px;text-align:left;vertical-align:top;border-top:1px solid #ddd}.table th{font-weight:bold}.table thead th{vertical-align:bottom}.table caption+thead tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0}.table tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed th,.table-condensed td{padding:4px 5px}.table-bordered{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapse;border-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.table-bordered th,.table-bordered td{border-left:1px solid #ddd}.table-bordered caption+thead tr:first-child th,.table-bordered caption+tbody tr:first-child th,.table-bordered caption+tbody tr:first-child td,.table-bordered colgroup+thead tr:first-child th,.table-bordered colgroup+tbody tr:first-child th,.table-bordered colgroup+tbody tr:first-child td,.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0}.table-bordered thead:first-child tr:first-child>th:first-child,.table-bordered tbody:first-child tr:first-child>td:first-child,.table-bordered tbody:first-child tr:first-child>th:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px}.table-bordered thead:first-child tr:first-child>th:last-child,.table-bordered tbody:first-child tr:first-child>td:last-child,.table-bordered tbody:first-child tr:first-child>th:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px}.table-bordered thead:last-child tr:last-child>th:first-child,.table-bordered tbody:last-child tr:last-child>td:first-child,.table-bordered tbody:last-child tr:last-child>th:first-child,.table-bordered tfoot:last-child tr:last-child>td:first-child,.table-bordered tfoot:last-child tr:last-child>th:first-child{-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px}.table-bordered thead:last-child tr:last-child>th:last-child,.table-bordered tbody:last-child tr:last-child>td:last-child,.table-bordered tbody:last-child tr:last-child>th:last-child,.table-bordered tfoot:last-child tr:last-child>td:last-child,.table-bordered tfoot:last-child tr:last-child>th:last-child{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px}.table-bordered tfoot+tbody:last-child tr:last-child td:first-child{-webkit-border-bottom-left-radius:0;border-bottom-left-radius:0;-moz-border-radius-bottomleft:0}.table-bordered tfoot+tbody:last-child tr:last-child td:last-child{-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;-moz-border-radius-bottomright:0}.table-bordered caption+thead tr:first-child th:first-child,.table-bordered caption+tbody tr:first-child td:first-child,.table-bordered colgroup+thead tr:first-child th:first-child,.table-bordered colgroup+tbody tr:first-child td:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px}.table-bordered caption+thead tr:first-child th:last-child,.table-bordered caption+tbody tr:first-child td:last-child,.table-bordered colgroup+thead tr:first-child th:last-child,.table-bordered colgroup+tbody tr:first-child td:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px}.table-striped tbody>tr:nth-child(odd)>td,.table-striped tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover tbody tr:hover>td,.table-hover tbody tr:hover>th{background-color:#f5f5f5}table td[class*="span"],table th[class*="span"],.row-fluid table td[class*="span"],.row-fluid table th[class*="span"]{display:table-cell;float:none;margin-left:0}.table td.span1,.table th.span1{float:none;width:44px;margin-left:0}.table td.span2,.table th.span2{float:none;width:124px;margin-left:0}.table td.span3,.table th.span3{float:none;width:204px;margin-left:0}.table td.span4,.table th.span4{float:none;width:284px;margin-left:0}.table td.span5,.table th.span5{float:none;width:364px;margin-left:0}.table td.span6,.table th.span6{float:none;width:444px;margin-left:0}.table td.span7,.table th.span7{float:none;width:524px;margin-left:0}.table td.span8,.table th.span8{float:none;width:604px;margin-left:0}.table td.span9,.table th.span9{float:none;width:684px;margin-left:0}.table td.span10,.table th.span10{float:none;width:764px;margin-left:0}.table td.span11,.table th.span11{float:none;width:844px;margin-left:0}.table td.span12,.table th.span12{float:none;width:924px;margin-left:0}.table tbody tr.success>td{background-color:#dff0d8}.table tbody tr.error>td{background-color:#f2dede}.table tbody tr.warning>td{background-color:#fcf8e3}.table tbody tr.info>td{background-color:#d9edf7}.table-hover tbody tr.success:hover>td{background-color:#d0e9c6}.table-hover tbody tr.error:hover>td{background-color:#ebcccc}.table-hover tbody tr.warning:hover>td{background-color:#faf2cc}.table-hover tbody tr.info:hover>td{background-color:#c4e3f3}[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;margin-top:1px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat}.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:focus>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>li>a:focus>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:focus>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"],.dropdown-submenu:focus>a>[class*=" icon-"]{background-image:url("../img/glyphicons-halflings-white.png")}.icon-glass{background-position:0 0}.icon-music{background-position:-24px 0}.icon-search{background-position:-48px 0}.icon-envelope{background-position:-72px 0}.icon-heart{background-position:-96px 0}.icon-star{background-position:-120px 0}.icon-star-empty{background-position:-144px 0}.icon-user{background-position:-168px 0}.icon-film{background-position:-192px 0}.icon-th-large{background-position:-216px 0}.icon-th{background-position:-240px 0}.icon-th-list{background-position:-264px 0}.icon-ok{background-position:-288px 0}.icon-remove{background-position:-312px 0}.icon-zoom-in{background-position:-336px 0}.icon-zoom-out{background-position:-360px 0}.icon-off{background-position:-384px 0}.icon-signal{background-position:-408px 0}.icon-cog{background-position:-432px 0}.icon-trash{background-position:-456px 0}.icon-home{background-position:0 -24px}.icon-file{background-position:-24px -24px}.icon-time{background-position:-48px -24px}.icon-road{background-position:-72px -24px}.icon-download-alt{background-position:-96px -24px}.icon-download{background-position:-120px -24px}.icon-upload{background-position:-144px -24px}.icon-inbox{background-position:-168px -24px}.icon-play-circle{background-position:-192px -24px}.icon-repeat{background-position:-216px -24px}.icon-refresh{background-position:-240px -24px}.icon-list-alt{background-position:-264px -24px}.icon-lock{background-position:-287px -24px}.icon-flag{background-position:-312px -24px}.icon-headphones{background-position:-336px -24px}.icon-volume-off{background-position:-360px -24px}.icon-volume-down{background-position:-384px -24px}.icon-volume-up{background-position:-408px -24px}.icon-qrcode{background-position:-432px -24px}.icon-barcode{background-position:-456px -24px}.icon-tag{background-position:0 -48px}.icon-tags{background-position:-25px -48px}.icon-book{background-position:-48px -48px}.icon-bookmark{background-position:-72px -48px}.icon-print{background-position:-96px -48px}.icon-camera{background-position:-120px -48px}.icon-font{background-position:-144px -48px}.icon-bold{background-position:-167px -48px}.icon-italic{background-position:-192px -48px}.icon-text-height{background-position:-216px -48px}.icon-text-width{background-position:-240px -48px}.icon-align-left{background-position:-264px -48px}.icon-align-center{background-position:-288px -48px}.icon-align-right{background-position:-312px -48px}.icon-align-justify{background-position:-336px -48px}.icon-list{background-position:-360px -48px}.icon-indent-left{background-position:-384px -48px}.icon-indent-right{background-position:-408px -48px}.icon-facetime-video{background-position:-432px -48px}.icon-picture{background-position:-456px -48px}.icon-pencil{background-position:0 -72px}.icon-map-marker{background-position:-24px -72px}.icon-adjust{background-position:-48px -72px}.icon-tint{background-position:-72px -72px}.icon-edit{background-position:-96px -72px}.icon-share{background-position:-120px -72px}.icon-check{background-position:-144px -72px}.icon-move{background-position:-168px -72px}.icon-step-backward{background-position:-192px -72px}.icon-fast-backward{background-position:-216px -72px}.icon-backward{background-position:-240px -72px}.icon-play{background-position:-264px -72px}.icon-pause{background-position:-288px -72px}.icon-stop{background-position:-312px -72px}.icon-forward{background-position:-336px -72px}.icon-fast-forward{background-position:-360px -72px}.icon-step-forward{background-position:-384px -72px}.icon-eject{background-position:-408px -72px}.icon-chevron-left{background-position:-432px -72px}.icon-chevron-right{background-position:-456px -72px}.icon-plus-sign{background-position:0 -96px}.icon-minus-sign{background-position:-24px -96px}.icon-remove-sign{background-position:-48px -96px}.icon-ok-sign{background-position:-72px -96px}.icon-question-sign{background-position:-96px -96px}.icon-info-sign{background-position:-120px -96px}.icon-screenshot{background-position:-144px -96px}.icon-remove-circle{background-position:-168px -96px}.icon-ok-circle{background-position:-192px -96px}.icon-ban-circle{background-position:-216px -96px}.icon-arrow-left{background-position:-240px -96px}.icon-arrow-right{background-position:-264px -96px}.icon-arrow-up{background-position:-289px -96px}.icon-arrow-down{background-position:-312px -96px}.icon-share-alt{background-position:-336px -96px}.icon-resize-full{background-position:-360px -96px}.icon-resize-small{background-position:-384px -96px}.icon-plus{background-position:-408px -96px}.icon-minus{background-position:-433px -96px}.icon-asterisk{background-position:-456px -96px}.icon-exclamation-sign{background-position:0 -120px}.icon-gift{background-position:-24px -120px}.icon-leaf{background-position:-48px -120px}.icon-fire{background-position:-72px -120px}.icon-eye-open{background-position:-96px -120px}.icon-eye-close{background-position:-120px -120px}.icon-warning-sign{background-position:-144px -120px}.icon-plane{background-position:-168px -120px}.icon-calendar{background-position:-192px -120px}.icon-random{width:16px;background-position:-216px -120px}.icon-comment{background-position:-240px -120px}.icon-magnet{background-position:-264px -120px}.icon-chevron-up{background-position:-288px -120px}.icon-chevron-down{background-position:-313px -119px}.icon-retweet{background-position:-336px -120px}.icon-shopping-cart{background-position:-360px -120px}.icon-folder-close{width:16px;background-position:-384px -120px}.icon-folder-open{width:16px;background-position:-408px -120px}.icon-resize-vertical{background-position:-432px -119px}.icon-resize-horizontal{background-position:-456px -118px}.icon-hdd{background-position:0 -144px}.icon-bullhorn{background-position:-24px -144px}.icon-bell{background-position:-48px -144px}.icon-certificate{background-position:-72px -144px}.icon-thumbs-up{background-position:-96px -144px}.icon-thumbs-down{background-position:-120px -144px}.icon-hand-right{background-position:-144px -144px}.icon-hand-left{background-position:-168px -144px}.icon-hand-up{background-position:-192px -144px}.icon-hand-down{background-position:-216px -144px}.icon-circle-arrow-right{background-position:-240px -144px}.icon-circle-arrow-left{background-position:-264px -144px}.icon-circle-arrow-up{background-position:-288px -144px}.icon-circle-arrow-down{background-position:-312px -144px}.icon-globe{background-position:-336px -144px}.icon-wrench{background-position:-360px -144px}.icon-tasks{background-position:-384px -144px}.icon-filter{background-position:-408px -144px}.icon-briefcase{background-position:-432px -144px}.icon-fullscreen{background-position:-456px -144px}.dropup,.dropdown{position:relative}.dropdown-toggle{*margin-bottom:-3px}.dropdown-toggle:active,.open .dropdown-toggle{outline:0}.caret{display:inline-block;width:0;height:0;vertical-align:top;border-top:4px solid #000;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.dropdown .caret{margin-top:8px;margin-left:2px}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus,.dropdown-submenu:hover>a,.dropdown-submenu:focus>a{color:#fff;text-decoration:none;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0)}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;outline:0;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0)}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;cursor:default;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open{*z-index:1000}.open>.dropdown-menu{display:block}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}.dropdown-submenu{position:relative}.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px}.dropdown-submenu:hover>.dropdown-menu{display:block}.dropup .dropdown-submenu>.dropdown-menu{top:auto;bottom:0;margin-top:0;margin-bottom:-2px;-webkit-border-radius:5px 5px 5px 0;-moz-border-radius:5px 5px 5px 0;border-radius:5px 5px 5px 0}.dropdown-submenu>a:after{display:block;float:right;width:0;height:0;margin-top:5px;margin-right:-10px;border-color:transparent;border-left-color:#ccc;border-style:solid;border-width:5px 0 5px 5px;content:" "}.dropdown-submenu:hover>a:after{border-left-color:#fff}.dropdown-submenu.pull-left{float:none}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.dropdown .dropdown-menu .nav-header{padding-right:20px;padding-left:20px}.typeahead{z-index:1051;margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.fade{opacity:0;-webkit-transition:opacity .15s linear;-moz-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;-moz-transition:height .35s ease;-o-transition:height .35s ease;transition:height .35s ease}.collapse.in{height:auto}.close{float:right;font-size:20px;font-weight:bold;line-height:20px;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.4;filter:alpha(opacity=40)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.btn{display:inline-block;*display:inline;padding:4px 12px;margin-bottom:0;*margin-left:.3em;font-size:14px;line-height:20px;color:#333;text-align:center;text-shadow:0 1px 1px rgba(255,255,255,0.75);vertical-align:middle;cursor:pointer;background-color:#f5f5f5;*background-color:#e6e6e6;background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(to bottom,#fff,#e6e6e6);background-repeat:repeat-x;border:1px solid #ccc;*border:0;border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe6e6e6',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);*zoom:1;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn:hover,.btn:focus,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333;background-color:#e6e6e6;*background-color:#d9d9d9}.btn:active,.btn.active{background-color:#ccc \9}.btn:first-child{*margin-left:0}.btn:hover,.btn:focus{color:#333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn.disabled,.btn[disabled]{cursor:default;background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-large{padding:11px 19px;font-size:17.5px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.btn-large [class^="icon-"],.btn-large [class*=" icon-"]{margin-top:4px}.btn-small{padding:2px 10px;font-size:11.9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-small [class^="icon-"],.btn-small [class*=" icon-"]{margin-top:0}.btn-mini [class^="icon-"],.btn-mini [class*=" icon-"]{margin-top:-1px}.btn-mini{padding:0 6px;font-size:10.5px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-block{display:block;width:100%;padding-right:0;padding-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255,255,255,0.75)}.btn-primary{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#006dcc;*background-color:#04c;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;border-color:#04c #04c #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#fff;background-color:#04c;*background-color:#003bb3}.btn-primary:active,.btn-primary.active{background-color:#039 \9}.btn-warning{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#faa732;*background-color:#f89406;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;border-color:#f89406 #f89406 #ad6704;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#fff;background-color:#f89406;*background-color:#df8505}.btn-warning:active,.btn-warning.active{background-color:#c67605 \9}.btn-danger{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#da4f49;*background-color:#bd362f;background-image:-moz-linear-gradient(top,#ee5f5b,#bd362f);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#bd362f));background-image:-webkit-linear-gradient(top,#ee5f5b,#bd362f);background-image:-o-linear-gradient(top,#ee5f5b,#bd362f);background-image:linear-gradient(to bottom,#ee5f5b,#bd362f);background-repeat:repeat-x;border-color:#bd362f #bd362f #802420;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffbd362f',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#fff;background-color:#bd362f;*background-color:#a9302a}.btn-danger:active,.btn-danger.active{background-color:#942a25 \9}.btn-success{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#5bb75b;*background-color:#51a351;background-image:-moz-linear-gradient(top,#62c462,#51a351);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));background-image:-webkit-linear-gradient(top,#62c462,#51a351);background-image:-o-linear-gradient(top,#62c462,#51a351);background-image:linear-gradient(to bottom,#62c462,#51a351);background-repeat:repeat-x;border-color:#51a351 #51a351 #387038;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff51a351',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#fff;background-color:#51a351;*background-color:#499249}.btn-success:active,.btn-success.active{background-color:#408140 \9}.btn-info{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#49afcd;*background-color:#2f96b4;background-image:-moz-linear-gradient(top,#5bc0de,#2f96b4);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#2f96b4));background-image:-webkit-linear-gradient(top,#5bc0de,#2f96b4);background-image:-o-linear-gradient(top,#5bc0de,#2f96b4);background-image:linear-gradient(to bottom,#5bc0de,#2f96b4);background-repeat:repeat-x;border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff2f96b4',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{color:#fff;background-color:#2f96b4;*background-color:#2a85a0}.btn-info:active,.btn-info.active{background-color:#24748c \9}.btn-inverse{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#363636;*background-color:#222;background-image:-moz-linear-gradient(top,#444,#222);background-image:-webkit-gradient(linear,0 0,0 100%,from(#444),to(#222));background-image:-webkit-linear-gradient(top,#444,#222);background-image:-o-linear-gradient(top,#444,#222);background-image:linear-gradient(to bottom,#444,#222);background-repeat:repeat-x;border-color:#222 #222 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444',endColorstr='#ff222222',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-inverse:hover,.btn-inverse:focus,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#fff;background-color:#222;*background-color:#151515}.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9}button.btn,input[type="submit"].btn{*padding-top:3px;*padding-bottom:3px}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0}button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px}button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px}button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px}.btn-link,.btn-link:active,.btn-link[disabled]{background-color:transparent;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-link{color:#08c;cursor:pointer;border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-link:hover,.btn-link:focus{color:#005580;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,.btn-link[disabled]:focus{color:#333;text-decoration:none}.btn-group{position:relative;display:inline-block;*display:inline;*margin-left:.3em;font-size:0;white-space:nowrap;vertical-align:middle;*zoom:1}.btn-group:first-child{*margin-left:0}.btn-group+.btn-group{margin-left:5px}.btn-toolbar{margin-top:10px;margin-bottom:10px;font-size:0}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group{margin-left:5px}.btn-group>.btn{position:relative;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group>.btn+.btn{margin-left:-1px}.btn-group>.btn,.btn-group>.dropdown-menu,.btn-group>.popover{font-size:14px}.btn-group>.btn-mini{font-size:10.5px}.btn-group>.btn-small{font-size:11.9px}.btn-group>.btn-large{font-size:17.5px}.btn-group>.btn:first-child{margin-left:0;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px}.btn-group>.btn:last-child,.btn-group>.dropdown-toggle{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}.btn-group>.btn.large:first-child{margin-left:0;-webkit-border-bottom-left-radius:6px;border-bottom-left-radius:6px;-webkit-border-top-left-radius:6px;border-top-left-radius:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topleft:6px}.btn-group>.btn.large:last-child,.btn-group>.large.dropdown-toggle{-webkit-border-top-right-radius:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;border-bottom-right-radius:6px;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px}.btn-group>.btn:hover,.btn-group>.btn:focus,.btn-group>.btn:active,.btn-group>.btn.active{z-index:2}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{*padding-top:5px;padding-right:8px;*padding-bottom:5px;padding-left:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn-group>.btn-mini+.dropdown-toggle{*padding-top:2px;padding-right:5px;*padding-bottom:2px;padding-left:5px}.btn-group>.btn-small+.dropdown-toggle{*padding-top:5px;*padding-bottom:4px}.btn-group>.btn-large+.dropdown-toggle{*padding-top:7px;padding-right:12px;*padding-bottom:7px;padding-left:12px}.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn-group.open .btn.dropdown-toggle{background-color:#e6e6e6}.btn-group.open .btn-primary.dropdown-toggle{background-color:#04c}.btn-group.open .btn-warning.dropdown-toggle{background-color:#f89406}.btn-group.open .btn-danger.dropdown-toggle{background-color:#bd362f}.btn-group.open .btn-success.dropdown-toggle{background-color:#51a351}.btn-group.open .btn-info.dropdown-toggle{background-color:#2f96b4}.btn-group.open .btn-inverse.dropdown-toggle{background-color:#222}.btn .caret{margin-top:8px;margin-left:0}.btn-large .caret{margin-top:6px}.btn-large .caret{border-top-width:5px;border-right-width:5px;border-left-width:5px}.btn-mini .caret,.btn-small .caret{margin-top:8px}.dropup .btn-large .caret{border-bottom-width:5px}.btn-primary .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret,.btn-inverse .caret{border-top-color:#fff;border-bottom-color:#fff}.btn-group-vertical{display:inline-block;*display:inline;*zoom:1}.btn-group-vertical>.btn{display:block;float:none;max-width:100%;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group-vertical>.btn+.btn{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:first-child{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.btn-group-vertical>.btn:last-child{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.btn-group-vertical>.btn-large:first-child{-webkit-border-radius:6px 6px 0 0;-moz-border-radius:6px 6px 0 0;border-radius:6px 6px 0 0}.btn-group-vertical>.btn-large:last-child{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.alert{padding:8px 35px 8px 14px;margin-bottom:20px;text-shadow:0 1px 0 rgba(255,255,255,0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.alert,.alert h4{color:#c09853}.alert h4{margin:0}.alert .close{position:relative;top:-2px;right:-21px;line-height:20px}.alert-success{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.alert-success h4{color:#468847}.alert-danger,.alert-error{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.alert-danger h4,.alert-error h4{color:#b94a48}.alert-info{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.alert-info h4{color:#3a87ad}.alert-block{padding-top:14px;padding-bottom:14px}.alert-block>p,.alert-block>ul{margin-bottom:0}.alert-block p+p{margin-top:5px}.nav{margin-bottom:20px;margin-left:0;list-style:none}.nav>li>a{display:block}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li>a>img{max-width:none}.nav>.pull-right{float:right}.nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:20px;color:#999;text-shadow:0 1px 0 rgba(255,255,255,0.5);text-transform:uppercase}.nav li+.nav-header{margin-top:9px}.nav-list{padding-right:15px;padding-left:15px;margin-bottom:0}.nav-list>li>a,.nav-list .nav-header{margin-right:-15px;margin-left:-15px;text-shadow:0 1px 0 rgba(255,255,255,0.5)}.nav-list>li>a{padding:3px 15px}.nav-list>.active>a,.nav-list>.active>a:hover,.nav-list>.active>a:focus{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.2);background-color:#08c}.nav-list [class^="icon-"],.nav-list [class*=" icon-"]{margin-right:2px}.nav-list .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.nav-tabs,.nav-pills{*zoom:1}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;line-height:0;content:""}.nav-tabs:after,.nav-pills:after{clear:both}.nav-tabs>li,.nav-pills>li{float:left}.nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{margin-bottom:-1px}.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:20px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover,.nav-tabs>li>a:focus{border-color:#eee #eee #ddd}.nav-tabs>.active>a,.nav-tabs>.active>a:hover,.nav-tabs>.active>a:focus{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.nav-pills>.active>a,.nav-pills>.active>a:hover,.nav-pills>.active>a:focus{color:#fff;background-color:#08c}.nav-stacked>li{float:none}.nav-stacked>li>a{margin-right:0}.nav-tabs.nav-stacked{border-bottom:0}.nav-tabs.nav-stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.nav-tabs.nav-stacked>li:first-child>a{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-topleft:4px}.nav-tabs.nav-stacked>li:last-child>a{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomright:4px;-moz-border-radius-bottomleft:4px}.nav-tabs.nav-stacked>li>a:hover,.nav-tabs.nav-stacked>li>a:focus{z-index:2;border-color:#ddd}.nav-pills.nav-stacked>li>a{margin-bottom:3px}.nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px}.nav-tabs .dropdown-menu{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.nav-pills .dropdown-menu{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.nav .dropdown-toggle .caret{margin-top:6px;border-top-color:#08c;border-bottom-color:#08c}.nav .dropdown-toggle:hover .caret,.nav .dropdown-toggle:focus .caret{border-top-color:#005580;border-bottom-color:#005580}.nav-tabs .dropdown-toggle .caret{margin-top:8px}.nav .active .dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff}.nav-tabs .active .dropdown-toggle .caret{border-top-color:#555;border-bottom-color:#555}.nav>.dropdown.active>a:hover,.nav>.dropdown.active>a:focus{cursor:pointer}.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover,.nav>li.dropdown.open.active>a:focus{color:#fff;background-color:#999;border-color:#999}.nav li.dropdown.open .caret,.nav li.dropdown.open.active .caret,.nav li.dropdown.open a:hover .caret,.nav li.dropdown.open a:focus .caret{border-top-color:#fff;border-bottom-color:#fff;opacity:1;filter:alpha(opacity=100)}.tabs-stacked .open>a:hover,.tabs-stacked .open>a:focus{border-color:#999}.tabbable{*zoom:1}.tabbable:before,.tabbable:after{display:table;line-height:0;content:""}.tabbable:after{clear:both}.tab-content{overflow:auto}.tabs-below>.nav-tabs,.tabs-right>.nav-tabs,.tabs-left>.nav-tabs{border-bottom:0}.tab-content>.tab-pane,.pill-content>.pill-pane{display:none}.tab-content>.active,.pill-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:hover,.tabs-below>.nav-tabs>li>a:focus{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:hover,.tabs-below>.nav-tabs>.active>a:focus{border-color:transparent #ddd #ddd #ddd}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px}.tabs-left>.nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd}.tabs-left>.nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:hover,.tabs-left>.nav-tabs>li>a:focus{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs .active>a,.tabs-left>.nav-tabs .active>a:hover,.tabs-left>.nav-tabs .active>a:focus{border-color:#ddd transparent #ddd #ddd;*border-right-color:#fff}.tabs-right>.nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd}.tabs-right>.nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:hover,.tabs-right>.nav-tabs>li>a:focus{border-color:#eee #eee #eee #ddd}.tabs-right>.nav-tabs .active>a,.tabs-right>.nav-tabs .active>a:hover,.tabs-right>.nav-tabs .active>a:focus{border-color:#ddd #ddd #ddd transparent;*border-left-color:#fff}.nav>.disabled>a{color:#999}.nav>.disabled>a:hover,.nav>.disabled>a:focus{text-decoration:none;cursor:default;background-color:transparent}.navbar{*position:relative;*z-index:2;margin-bottom:20px;overflow:visible}.navbar-inner{min-height:40px;padding-right:20px;padding-left:20px;background-color:#fafafa;background-image:-moz-linear-gradient(top,#fff,#f2f2f2);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#f2f2f2));background-image:-webkit-linear-gradient(top,#fff,#f2f2f2);background-image:-o-linear-gradient(top,#fff,#f2f2f2);background-image:linear-gradient(to bottom,#fff,#f2f2f2);background-repeat:repeat-x;border:1px solid #d4d4d4;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#fff2f2f2',GradientType=0);*zoom:1;-webkit-box-shadow:0 1px 4px rgba(0,0,0,0.065);-moz-box-shadow:0 1px 4px rgba(0,0,0,0.065);box-shadow:0 1px 4px rgba(0,0,0,0.065)}.navbar-inner:before,.navbar-inner:after{display:table;line-height:0;content:""}.navbar-inner:after{clear:both}.navbar .container{width:auto}.nav-collapse.collapse{height:auto;overflow:visible}.navbar .brand{display:block;float:left;padding:10px 20px 10px;margin-left:-20px;font-size:20px;font-weight:200;color:#777;text-shadow:0 1px 0 #fff}.navbar .brand:hover,.navbar .brand:focus{text-decoration:none}.navbar-text{margin-bottom:0;line-height:40px;color:#777}.navbar-link{color:#777}.navbar-link:hover,.navbar-link:focus{color:#333}.navbar .divider-vertical{height:40px;margin:0 9px;border-right:1px solid #fff;border-left:1px solid #f2f2f2}.navbar .btn,.navbar .btn-group{margin-top:5px}.navbar .btn-group .btn,.navbar .input-prepend .btn,.navbar .input-append .btn,.navbar .input-prepend .btn-group,.navbar .input-append .btn-group{margin-top:0}.navbar-form{margin-bottom:0;*zoom:1}.navbar-form:before,.navbar-form:after{display:table;line-height:0;content:""}.navbar-form:after{clear:both}.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:5px}.navbar-form input,.navbar-form select,.navbar-form .btn{display:inline-block;margin-bottom:0}.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px}.navbar-form .input-append,.navbar-form .input-prepend{margin-top:5px;white-space:nowrap}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0}.navbar-search{position:relative;float:left;margin-top:5px;margin-bottom:0}.navbar-search .search-query{padding:4px 14px;margin-bottom:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.navbar-static-top{position:static;margin-bottom:0}.navbar-static-top .navbar-inner{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0}.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{border-width:0 0 1px}.navbar-fixed-bottom .navbar-inner{border-width:1px 0 0}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding-right:0;padding-left:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.navbar-fixed-top{top:0}.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{-webkit-box-shadow:0 1px 10px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 10px rgba(0,0,0,0.1);box-shadow:0 1px 10px rgba(0,0,0,0.1)}.navbar-fixed-bottom{bottom:0}.navbar-fixed-bottom .navbar-inner{-webkit-box-shadow:0 -1px 10px rgba(0,0,0,0.1);-moz-box-shadow:0 -1px 10px rgba(0,0,0,0.1);box-shadow:0 -1px 10px rgba(0,0,0,0.1)}.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0}.navbar .nav.pull-right{float:right;margin-right:0}.navbar .nav>li{float:left}.navbar .nav>li>a{float:none;padding:10px 15px 10px;color:#777;text-decoration:none;text-shadow:0 1px 0 #fff}.navbar .nav .dropdown-toggle .caret{margin-top:8px}.navbar .nav>li>a:focus,.navbar .nav>li>a:hover{color:#333;text-decoration:none;background-color:transparent}.navbar .nav>.active>a,.navbar .nav>.active>a:hover,.navbar .nav>.active>a:focus{color:#555;text-decoration:none;background-color:#e5e5e5;-webkit-box-shadow:inset 0 3px 8px rgba(0,0,0,0.125);-moz-box-shadow:inset 0 3px 8px rgba(0,0,0,0.125);box-shadow:inset 0 3px 8px rgba(0,0,0,0.125)}.navbar .btn-navbar{display:none;float:right;padding:7px 10px;margin-right:5px;margin-left:5px;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#ededed;*background-color:#e5e5e5;background-image:-moz-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#e5e5e5));background-image:-webkit-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:-o-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:linear-gradient(to bottom,#f2f2f2,#e5e5e5);background-repeat:repeat-x;border-color:#e5e5e5 #e5e5e5 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffe5e5e5',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075)}.navbar .btn-navbar:hover,.navbar .btn-navbar:focus,.navbar .btn-navbar:active,.navbar .btn-navbar.active,.navbar .btn-navbar.disabled,.navbar .btn-navbar[disabled]{color:#fff;background-color:#e5e5e5;*background-color:#d9d9d9}.navbar .btn-navbar:active,.navbar .btn-navbar.active{background-color:#ccc \9}.navbar .btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,0.25);-moz-box-shadow:0 1px 0 rgba(0,0,0,0.25);box-shadow:0 1px 0 rgba(0,0,0,0.25)}.btn-navbar .icon-bar+.icon-bar{margin-top:3px}.navbar .nav>li>.dropdown-menu:before{position:absolute;top:-7px;left:9px;display:inline-block;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-left:7px solid transparent;border-bottom-color:rgba(0,0,0,0.2);content:''}.navbar .nav>li>.dropdown-menu:after{position:absolute;top:-6px;left:10px;display:inline-block;border-right:6px solid transparent;border-bottom:6px solid #fff;border-left:6px solid transparent;content:''}.navbar-fixed-bottom .nav>li>.dropdown-menu:before{top:auto;bottom:-7px;border-top:7px solid #ccc;border-bottom:0;border-top-color:rgba(0,0,0,0.2)}.navbar-fixed-bottom .nav>li>.dropdown-menu:after{top:auto;bottom:-6px;border-top:6px solid #fff;border-bottom:0}.navbar .nav li.dropdown>a:hover .caret,.navbar .nav li.dropdown>a:focus .caret{border-top-color:#333;border-bottom-color:#333}.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.open.active>.dropdown-toggle{color:#555;background-color:#e5e5e5}.navbar .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#777;border-bottom-color:#777}.navbar .nav li.dropdown.open>.dropdown-toggle .caret,.navbar .nav li.dropdown.active>.dropdown-toggle .caret,.navbar .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#555;border-bottom-color:#555}.navbar .pull-right>li>.dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right{right:0;left:auto}.navbar .pull-right>li>.dropdown-menu:before,.navbar .nav>li>.dropdown-menu.pull-right:before{right:12px;left:auto}.navbar .pull-right>li>.dropdown-menu:after,.navbar .nav>li>.dropdown-menu.pull-right:after{right:13px;left:auto}.navbar .pull-right>li>.dropdown-menu .dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right .dropdown-menu{right:100%;left:auto;margin-right:-1px;margin-left:0;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.navbar-inverse .navbar-inner{background-color:#1b1b1b;background-image:-moz-linear-gradient(top,#222,#111);background-image:-webkit-gradient(linear,0 0,0 100%,from(#222),to(#111));background-image:-webkit-linear-gradient(top,#222,#111);background-image:-o-linear-gradient(top,#222,#111);background-image:linear-gradient(to bottom,#222,#111);background-repeat:repeat-x;border-color:#252525;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222',endColorstr='#ff111111',GradientType=0)}.navbar-inverse .brand,.navbar-inverse .nav>li>a{color:#999;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.navbar-inverse .brand:hover,.navbar-inverse .nav>li>a:hover,.navbar-inverse .brand:focus,.navbar-inverse .nav>li>a:focus{color:#fff}.navbar-inverse .brand{color:#999}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .nav>li>a:focus,.navbar-inverse .nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .nav .active>a,.navbar-inverse .nav .active>a:hover,.navbar-inverse .nav .active>a:focus{color:#fff;background-color:#111}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover,.navbar-inverse .navbar-link:focus{color:#fff}.navbar-inverse .divider-vertical{border-right-color:#222;border-left-color:#111}.navbar-inverse .nav li.dropdown.open>.dropdown-toggle,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle{color:#fff;background-color:#111}.navbar-inverse .nav li.dropdown>a:hover .caret,.navbar-inverse .nav li.dropdown>a:focus .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#999;border-bottom-color:#999}.navbar-inverse .nav li.dropdown.open>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .navbar-search .search-query{color:#fff;background-color:#515151;border-color:#111;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-webkit-transition:none;-moz-transition:none;-o-transition:none;transition:none}.navbar-inverse .navbar-search .search-query:-moz-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query:-ms-input-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query:focus,.navbar-inverse .navbar-search .search-query.focused{padding:5px 15px;color:#333;text-shadow:0 1px 0 #fff;background-color:#fff;border:0;outline:0;-webkit-box-shadow:0 0 3px rgba(0,0,0,0.15);-moz-box-shadow:0 0 3px rgba(0,0,0,0.15);box-shadow:0 0 3px rgba(0,0,0,0.15)}.navbar-inverse .btn-navbar{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#0e0e0e;*background-color:#040404;background-image:-moz-linear-gradient(top,#151515,#040404);background-image:-webkit-gradient(linear,0 0,0 100%,from(#151515),to(#040404));background-image:-webkit-linear-gradient(top,#151515,#040404);background-image:-o-linear-gradient(top,#151515,#040404);background-image:linear-gradient(to bottom,#151515,#040404);background-repeat:repeat-x;border-color:#040404 #040404 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515',endColorstr='#ff040404',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.navbar-inverse .btn-navbar:hover,.navbar-inverse .btn-navbar:focus,.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active,.navbar-inverse .btn-navbar.disabled,.navbar-inverse .btn-navbar[disabled]{color:#fff;background-color:#040404;*background-color:#000}.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active{background-color:#000 \9}.breadcrumb{padding:8px 15px;margin:0 0 20px;list-style:none;background-color:#f5f5f5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.breadcrumb>li{display:inline-block;*display:inline;text-shadow:0 1px 0 #fff;*zoom:1}.breadcrumb>li>.divider{padding:0 5px;color:#ccc}.breadcrumb>.active{color:#999}.pagination{margin:20px 0}.pagination ul{display:inline-block;*display:inline;margin-bottom:0;margin-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*zoom:1;-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:0 1px 2px rgba(0,0,0,0.05);box-shadow:0 1px 2px rgba(0,0,0,0.05)}.pagination ul>li{display:inline}.pagination ul>li>a,.pagination ul>li>span{float:left;padding:4px 12px;line-height:20px;text-decoration:none;background-color:#fff;border:1px solid #ddd;border-left-width:0}.pagination ul>li>a:hover,.pagination ul>li>a:focus,.pagination ul>.active>a,.pagination ul>.active>span{background-color:#f5f5f5}.pagination ul>.active>a,.pagination ul>.active>span{color:#999;cursor:default}.pagination ul>.disabled>span,.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover,.pagination ul>.disabled>a:focus{color:#999;cursor:default;background-color:transparent}.pagination ul>li:first-child>a,.pagination ul>li:first-child>span{border-left-width:1px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px}.pagination ul>li:last-child>a,.pagination ul>li:last-child>span{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}.pagination-centered{text-align:center}.pagination-right{text-align:right}.pagination-large ul>li>a,.pagination-large ul>li>span{padding:11px 19px;font-size:17.5px}.pagination-large ul>li:first-child>a,.pagination-large ul>li:first-child>span{-webkit-border-bottom-left-radius:6px;border-bottom-left-radius:6px;-webkit-border-top-left-radius:6px;border-top-left-radius:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topleft:6px}.pagination-large ul>li:last-child>a,.pagination-large ul>li:last-child>span{-webkit-border-top-right-radius:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;border-bottom-right-radius:6px;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px}.pagination-mini ul>li:first-child>a,.pagination-small ul>li:first-child>a,.pagination-mini ul>li:first-child>span,.pagination-small ul>li:first-child>span{-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-moz-border-radius-bottomleft:3px;-moz-border-radius-topleft:3px}.pagination-mini ul>li:last-child>a,.pagination-small ul>li:last-child>a,.pagination-mini ul>li:last-child>span,.pagination-small ul>li:last-child>span{-webkit-border-top-right-radius:3px;border-top-right-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;-moz-border-radius-topright:3px;-moz-border-radius-bottomright:3px}.pagination-small ul>li>a,.pagination-small ul>li>span{padding:2px 10px;font-size:11.9px}.pagination-mini ul>li>a,.pagination-mini ul>li>span{padding:0 6px;font-size:10.5px}.pager{margin:20px 0;text-align:center;list-style:none;*zoom:1}.pager:before,.pager:after{display:table;line-height:0;content:""}.pager:after{clear:both}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#f5f5f5}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;cursor:default;background-color:#fff}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0}.modal-backdrop,.modal-backdrop.fade.in{opacity:.8;filter:alpha(opacity=80)}.modal{position:fixed;top:10%;left:50%;z-index:1050;width:560px;margin-left:-280px;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;outline:0;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box}.modal.fade{top:-25%;-webkit-transition:opacity .3s linear,top .3s ease-out;-moz-transition:opacity .3s linear,top .3s ease-out;-o-transition:opacity .3s linear,top .3s ease-out;transition:opacity .3s linear,top .3s ease-out}.modal.fade.in{top:10%}.modal-header{padding:9px 15px;border-bottom:1px solid #eee}.modal-header .close{margin-top:2px}.modal-header h3{margin:0;line-height:30px}.modal-body{position:relative;max-height:400px;padding:15px;overflow-y:auto}.modal-form{margin-bottom:0}.modal-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;*zoom:1;-webkit-box-shadow:inset 0 1px 0 #fff;-moz-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.modal-footer:before,.modal-footer:after{display:table;line-height:0;content:""}.modal-footer:after{clear:both}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.tooltip{position:absolute;z-index:1030;display:block;font-size:11px;line-height:1.4;opacity:0;filter:alpha(opacity=0);visibility:visible}.tooltip.in{opacity:.8;filter:alpha(opacity=80)}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-right-color:#000;border-width:5px 5px 5px 0}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-left-color:#000;border-width:5px 0 5px 5px}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-color:#000;border-width:0 5px 5px}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;max-width:276px;padding:1px;text-align:left;white-space:normal;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;font-weight:normal;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0}.popover-title:empty{display:none}.popover-content{padding:9px 14px}.popover .arrow,.popover .arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover .arrow{border-width:11px}.popover .arrow:after{border-width:10px;content:""}.popover.top .arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,0.25);border-bottom-width:0}.popover.top .arrow:after{bottom:1px;margin-left:-10px;border-top-color:#fff;border-bottom-width:0}.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,0.25);border-left-width:0}.popover.right .arrow:after{bottom:-10px;left:1px;border-right-color:#fff;border-left-width:0}.popover.bottom .arrow{top:-11px;left:50%;margin-left:-11px;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);border-top-width:0}.popover.bottom .arrow:after{top:1px;margin-left:-10px;border-bottom-color:#fff;border-top-width:0}.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-left-color:#999;border-left-color:rgba(0,0,0,0.25);border-right-width:0}.popover.left .arrow:after{right:1px;bottom:-10px;border-left-color:#fff;border-right-width:0}.thumbnails{margin-left:-20px;list-style:none;*zoom:1}.thumbnails:before,.thumbnails:after{display:table;line-height:0;content:""}.thumbnails:after{clear:both}.row-fluid .thumbnails{margin-left:0}.thumbnails>li{float:left;margin-bottom:20px;margin-left:20px}.thumbnail{display:block;padding:4px;line-height:20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.055);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.055);box-shadow:0 1px 3px rgba(0,0,0,0.055);-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}a.thumbnail:hover,a.thumbnail:focus{border-color:#08c;-webkit-box-shadow:0 1px 4px rgba(0,105,214,0.25);-moz-box-shadow:0 1px 4px rgba(0,105,214,0.25);box-shadow:0 1px 4px rgba(0,105,214,0.25)}.thumbnail>img{display:block;max-width:100%;margin-right:auto;margin-left:auto}.thumbnail .caption{padding:9px;color:#555}.media,.media-body{overflow:hidden;*overflow:visible;zoom:1}.media,.media .media{margin-top:15px}.media:first-child{margin-top:0}.media-object{display:block}.media-heading{margin:0 0 5px}.media>.pull-left{margin-right:10px}.media>.pull-right{margin-left:10px}.media-list{margin-left:0;list-style:none}.label,.badge{display:inline-block;padding:2px 4px;font-size:11.844px;font-weight:bold;line-height:14px;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);white-space:nowrap;vertical-align:baseline;background-color:#999}.label{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.badge{padding-right:9px;padding-left:9px;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px}.label:empty,.badge:empty{display:none}a.label:hover,a.label:focus,a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}.label-important,.badge-important{background-color:#b94a48}.label-important[href],.badge-important[href]{background-color:#953b39}.label-warning,.badge-warning{background-color:#f89406}.label-warning[href],.badge-warning[href]{background-color:#c67605}.label-success,.badge-success{background-color:#468847}.label-success[href],.badge-success[href]{background-color:#356635}.label-info,.badge-info{background-color:#3a87ad}.label-info[href],.badge-info[href]{background-color:#2d6987}.label-inverse,.badge-inverse{background-color:#333}.label-inverse[href],.badge-inverse[href]{background-color:#1a1a1a}.btn .label,.btn .badge{position:relative;top:-1px}.btn-mini .label,.btn-mini .badge{top:0}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-ms-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:0 0}to{background-position:40px 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f7f7f7;background-image:-moz-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f5f5f5),to(#f9f9f9));background-image:-webkit-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-o-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:linear-gradient(to bottom,#f5f5f5,#f9f9f9);background-repeat:repeat-x;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5',endColorstr='#fff9f9f9',GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)}.progress .bar{float:left;width:0;height:100%;font-size:12px;color:#fff;text-align:center;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top,#149bdf,#0480be);background-image:-webkit-gradient(linear,0 0,0 100%,from(#149bdf),to(#0480be));background-image:-webkit-linear-gradient(top,#149bdf,#0480be);background-image:-o-linear-gradient(top,#149bdf,#0480be);background-image:linear-gradient(to bottom,#149bdf,#0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf',endColorstr='#ff0480be',GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width .6s ease;-moz-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress .bar+.bar{-webkit-box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15);-moz-box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15)}.progress-striped .bar{background-color:#149bdf;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px}.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-danger .bar,.progress .bar-danger{background-color:#dd514c;background-image:-moz-linear-gradient(top,#ee5f5b,#c43c35);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#c43c35));background-image:-webkit-linear-gradient(top,#ee5f5b,#c43c35);background-image:-o-linear-gradient(top,#ee5f5b,#c43c35);background-image:linear-gradient(to bottom,#ee5f5b,#c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffc43c35',GradientType=0)}.progress-danger.progress-striped .bar,.progress-striped .bar-danger{background-color:#ee5f5b;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-success .bar,.progress .bar-success{background-color:#5eb95e;background-image:-moz-linear-gradient(top,#62c462,#57a957);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#57a957));background-image:-webkit-linear-gradient(top,#62c462,#57a957);background-image:-o-linear-gradient(top,#62c462,#57a957);background-image:linear-gradient(to bottom,#62c462,#57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff57a957',GradientType=0)}.progress-success.progress-striped .bar,.progress-striped .bar-success{background-color:#62c462;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-info .bar,.progress .bar-info{background-color:#4bb1cf;background-image:-moz-linear-gradient(top,#5bc0de,#339bb9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#339bb9));background-image:-webkit-linear-gradient(top,#5bc0de,#339bb9);background-image:-o-linear-gradient(top,#5bc0de,#339bb9);background-image:linear-gradient(to bottom,#5bc0de,#339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff339bb9',GradientType=0)}.progress-info.progress-striped .bar,.progress-striped .bar-info{background-color:#5bc0de;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-warning .bar,.progress .bar-warning{background-color:#faa732;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0)}.progress-warning.progress-striped .bar,.progress-striped .bar-warning{background-color:#fbb450;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.accordion{margin-bottom:20px}.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.accordion-heading{border-bottom:0}.accordion-heading .accordion-toggle{display:block;padding:8px 15px}.accordion-toggle{cursor:pointer}.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5}.carousel{position:relative;margin-bottom:20px;line-height:1}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-moz-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;line-height:1}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#fff;text-align:center;background:#222;border:3px solid #fff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:.5;filter:alpha(opacity=50)}.carousel-control.right{right:15px;left:auto}.carousel-control:hover,.carousel-control:focus{color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-indicators{position:absolute;top:15px;right:15px;z-index:5;margin:0;list-style:none}.carousel-indicators li{display:block;float:left;width:10px;height:10px;margin-left:5px;text-indent:-999px;background-color:#ccc;background-color:rgba(255,255,255,0.25);border-radius:5px}.carousel-indicators .active{background-color:#fff}.carousel-caption{position:absolute;right:0;bottom:0;left:0;padding:15px;background:#333;background:rgba(0,0,0,0.75)}.carousel-caption h4,.carousel-caption p{line-height:20px;color:#fff}.carousel-caption h4{margin:0 0 5px}.carousel-caption p{margin-bottom:0}.hero-unit{padding:60px;margin-bottom:30px;font-size:18px;font-weight:200;line-height:30px;color:inherit;background-color:#eee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;color:inherit}.hero-unit li{line-height:30px}.pull-right{float:right}.pull-left{float:left}.hide{display:none}.show{display:block}.invisible{visibility:hidden}.affix{position:fixed}
diff --git a/app/css/site.css b/app/css/site.css
deleted file mode 100644
index 890a953..0000000
--- a/app/css/site.css
+++ /dev/null
@@ -1,78 +0,0 @@
-body {
-	padding-top: 20px;
-	padding-bottom: 60px;
-}
-
-/* Custom container */
-.container {
-	margin: 0 auto;
-	max-width: 1000px;
-}
-
-.container > hr {
-	margin: 60px 0;
-}
-
-/* Main marketing message and sign up button */
-.jumbotron {
-	margin: 80px 0;
-	text-align: center;
-}
-
-.jumbotron h1 {
-	font-size: 100px;
-	line-height: 1;
-}
-
-.jumbotron .lead {
-	font-size: 24px;
-	line-height: 1.25;
-}
-
-.jumbotron .btn {
-	font-size: 21px;
-	padding: 14px 24px;
-}
-
-/* Supporting marketing content */
-.marketing {
-	margin: 60px 0;
-}
-
-.marketing p + h4 {
-	margin-top: 28px;
-}
-
-/* Customize the navbar links to be fill the entire space of the .navbar */
-.navbar .navbar-inner {
-	padding: 0;
-}
-
-.navbar .nav {
-	margin: 0;
-	display: table;
-	width: 100%;
-}
-
-.navbar .nav li {
-	display: table-cell;
-	width: 1%;
-	float: none;
-}
-
-.navbar .nav li a {
-	font-weight: bold;
-	text-align: center;
-	border-left: 1px solid rgba(255, 255, 255, .75);
-	border-right: 1px solid rgba(0, 0, 0, .1);
-}
-
-.navbar .nav li:first-child a {
-	border-left: 0;
-	border-radius: 3px 0 0 3px;
-}
-
-.navbar .nav li:last-child a {
-	border-right: 0;
-	border-radius: 0 3px 3px 0;
-}
diff --git a/app/img/glyphicons-halflings-white.png b/app/img/glyphicons-halflings-white.png
deleted file mode 100644
index 3bf6484a29d8da269f9bc874b25493a45fae3bae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8777
zcmZvC1yGz#v+m*$LXcp=A$ZWB0fL7wNbp_U*$~{_gL`my3oP#L!5tQYy99Ta`+g_q
zKlj|KJ2f@c)ARJx{q*b<Rc{fZDE|-E3z8Qg5C}{9v!pTzga8NZOmrk*O`5892Z0dh
z6y;PuJwHDK9$?(w-u|_L_3`o1($W%e0`}kWUyy&dCnqOQPfu4@SAgf?;o*P$z|s8t
zJh1KR>bkhN_!|Wn*Vos8{TEhUT@5e;_WJsIMMcG5%>DiS&dv_N`4@J0cnAQ-#>RjZ
z00W5t&tJ^l-QC*ST1-p~00u^9XJ=AUl7oW-;2a+x2k__T=grN{+1c4XK0ZL~^z^i$
zp&>vEhr@4fZWb380S18T&!0cQ3IKpHF)?v=b_NIm0Q>v<fKgXh*W25>wY7D0baZ)n
z31Fa5sELUQARIVaU0nqf0XzT+fB_63aA;@<$l~wse|mcA;^G1TmX?-)e)jkGPfkuA
z92@|!<>h5S_4f8QP-JRq>d&7)^Yin8l7K8gED$&_FaV?gY+wLjpoW%~7NDe=nHfMG
z5DO3j{R9kv5GbssrUpO)<pElNvVjx;Inad7%}rnn)BtoiIXM{s0C>Oyv<s*i2m!7M
zNCXUk1jq|?5|99_k&%%AIlu-a0ty3=KxY8j%*;&S3IIajE_Qc!f%*X_5DScgf&xH0
zumu>Vrlx>u0UKD0i;Dpm5S5dY16(DL5l{ixz|mhJU@&-OWCTb7_%}8-fE(P~+XIRO
zJU|wp1|S>|J3KrLcz^+v1f&BDpd>&MAaibR4#5A_4(MucZwG9E1h4@u0P@C8;oo+g
zIVj7kfJi{oV~E(NZ*h(@^<JQ`7oGGHtP>-(Q(C`Psb3KZ{N;^GB(a8NE*Vwc715!9
zr-H4Ao|T_c6+VT_JH9H+P3>iXSt!a$F`>s`jn`w9GZ_~B!{<w2b}Uz=xRP0Noee!5
zHGxHKH;uZjouChSB9)ldcOm@{14~ct04{b8>0soaiV|O_c^R2aWa%}O3jUE)WO=pa
zs~_Wz08z|ieY5A%$@FcBF9^!1a}m5ks@7gjn;67N>}S~Hrm`4sM5Hh`q7&5-N{|31
z6x1{ol7Bn<k_m&K*9NkB7ANp6;_WSmra!UL^eY+pz_w5LlB(g$UY9|-AP@zsw4|7-
zi|#>skoViZ<brlX21G1wL@^v%v2P&MSTZc8SKT&&Tq!~%Uw%k^(D<O<S;ewoH)@(b
zb2Z<#wBV6y-?HHFVJFRg^me&@Reg!dys6F1>0GqbLa#kW`Z<Hy>)VCjt1MysKg|rT
zi!?s#<KsBd5lg=VLu4^|xo0%enAx0mMXMSpk0KF_*gOS;jx!zP=@5TPN+S>#Ck>8c
zpi|>$lGlw#@yMNi&V4`6OBGJ(H&7lqLlcTQ&1zWriG_fL>BnFcr~?;E93{M-xIozQ
zO=EHQ#+?<}%@wbWWv23#!V70h9MOuUVaU>3kpTvYfc|LBw?&b*89~Gc9i&8tlT#kF
ztpbZoAzkdB+UTy=tx%L3Z4)I{zY(Kb)eg{InobSJmNwPZt$14aS-uc4eKuY<?xyi!
z`TeGpun(kP^7#~<fX0r^ExRQwveWDF;DOQbL}?LBzt>8h$dtfyxu^a%zA)<y|4;I#
zFU8x7%0eT|Hd@3!T6Anh3IoHrN%@H8e6ge;3u)_$N2H&Rv2`ml6;kL~xS07C5Nzt<
z>>fYI&)@ZXky?^{5>xSC?;w4r&td6vBdi%vHm4=XJH!3yL3?Ep+T5aU_>i;yr_XGq
zxZfCzUU@GvnoIk+_Nd`aky>S&H!b*{A%L>?*XPAgWL(Vf(k7qUS}>Zn=U(ZfcOc{B
z3*tOHH@t5Ub5D~#N7!Fxx}P2)sy{vE_l(R7$aW&CX>c|&HY+7};vUIietK%}!ph<X
z*_6&Ee=)&D@nDa!y{$f<(Q`UdM+|H2ksGEhG7utFYl`Y6pD#+4LC8Hw@6|1H-x{D`
zE$uaNS!i^Rx(%B(My5}1#H73>rCuh+;C@1usp;XLU<8Gq8P!rEI3<U)y>ieg#W$!=
zQcZr{hp>8sF?k&Yl0?B84OneiQxef-4TEFrq3O~JAZR}yEJHA|Xkqd49tR&8oq{zP
zY@>J^HBV*(gJvJZc_0VFN7Sx?H7#75E3#?N8<p*btH>Z!C+_f53YU}py<FUNWgSuj
zi^M}p>ggxx1?wQi5Yb-_`I`_V*SMx5+*P^b=ec5RON-k1cIlsBLk}(HiaJyab0`CI
zo0{<v3Q5P3@oM!6@v&t6RJy0OS}M??mGqk1x;(pa`FWA#n+2z37<uPHl{#HvB!^?r
zm9?WOv;Tt(gt*?Pw;;%nF3|I0gDBXPM>=1_LO$~oE2%Tl_}KURuX<`+mQN_sTdM&*
zkFf!Xtl^e^gTy6ON=&gTn6)$JHQq2)33R@_!#9?BLNq-Wi{U|rVX7Vny$l6#+S<va
z%-r+y8D)Cm{5=IM8|<{prj)kZfIZ$NiW0)fE9{-SR)@-;NBJtHk@DI_v*mK(N0#s#
z?S8~jyotdcJJAAUt_;Tr)fa|*cT)~*JZ!c_7yVpSb{r2MllfJDbfI~-7n_#K6lw4G
z^Eyhsh^z8eZs2;adrfk9ip%h;IP|>Z@KvQt@VYb%<9JfapI^b9j=wa+Tqb4ei;8c5
z&1>Uz@lVFv6T4Z*YU$r4G`g=91lSeA<=GRZ!*KTWKDPR}NPUW%peCUj`Ix_LDq!8|
zMH-V`Pv!a~QkTL||L@cqiTz)*G-0=ytr1KqTuFPan9y4gYD5>PleK`NZB$ev@W%t=
zkp)_=lBUTLZJpAtZg;pjI;7r2y|26-N7&a(h<zryrg`J^oeC|8V|qszB+|*eQ-(Dy
zbn*nJ1W|b4-1y?dTI6}3IPMw+-O0;Q@eMMtjjQ+G6QfN3ae61Yd9LfQx_UREWecK4
zMn7A~fOz)be1)Yg{2Ysl9G%s8-h-~@C;ALAL0r=<JP2uCe!T|wAywH1r;F|f_q8N(
zYp^0FkyL9uj<8bK@fyTtgo+DT)14B^<SigcSJotgDV02O!M(CS6_B&^bILwyV?Ng4
zm7WQp?{l<Obhuy=22?5<oQDiM22&u4rZrRVG|L9ABfY{=95aTyd~@a$o~1P#ji`=w
zBKmQqX}r3Nlk9Q|gR7)~#n6AzYk`#!R*d5x`A)hU(!1R1%^zXxNJ(kPCw4htU9^(O
zP4cYV^F(I>X|`1YNM9N8{>8JAu<en5+94bD>v}hp1v`3JHT-=5lbXpbMq7X~2J5Kl
zh7tyU`_AusMFZ{ej9D;Uyy;SQ!4nwgSnngsYBwdS&EO3NS*o04)*j<g2BLf;iAZ2(
z7Key$cc6ey>uAYl;57c2Ly0(DEZ8IY?zSph-kyxu+D`tt@oU{32J#I{vmy=#0ySPK
zA+i(A3yl)qmTz*$dZi#y9FS;$;h%bY+;StNx{_R56Otq+?pGe^T^{5d7Gs&?`_r`8
zD&dzOA|j8@3<oPyCd}SOX6AZj_;pT>A&FR5U3*eQNBf<4^4W_iS_()*8b4aaUzfk2
zzIcMWSEjm;EPZPk{j{1>oXd}pXAj!NaRm8{Sjz!D=~q3WJ@vmt6ND_?HI~|wUS1j5
z9!S1MKr7%nxoJ3k`GB^7yV~*{n~O~n6($~x5Bu{7s|JyXbAyKI4+tO(zZYMslK;Zc
zzeHGVl{`iP@jfSKq>R;{+djJ9n%$%EL()Uw+sykjNQdflkJZSjqV_QDWivbZS~S{K
zkE@T^Jcv)Dfm93!mf$XYnCT--_A$zo9MOkPB6&diM8MwOfV?+ApNv`moV@nqn>&lv
zYbN1-M|jc~sG|yLN^1R2=`+1ih3jCshg`iP&mY$GMTcY^W^T`WOCX!{-KHmZ#GiRH
zYl{|+KLn5!PCLtBy~9i}`#d^gCDDx$+GQb~uc;V#K3OgbbOG0j5{BRG-si%Bo{@lB
zGIt+Ain8^C`!*S0d0OSWVO+Z8<kqm;qPrHIJ!qB8;9h5*>9}}O8aFTZ>p&k}2gGCV
zh#<$gswePFxWGT$4DC^8@84_e*^KT74?7n8!$8cg=sL$OlKr&HMh@Rr5%*Wr!xoOl
zo7jItnj-xYgVTX)H1=A2bD(tle<tL7^Z!nJ*fwgn&QUe>EH57#V{xAeW_ezISg5OC
zg=k>hOLA^urTH_e6*vSYRqCm$J{xo}-x3@HH;bsHD1Z`Pzvsn}%cvfw%Q(}h`Dgtb
z0_J^niUmoCM5$*f)6}}qi(u;cPgxfyeV<wtcQgsqG?QDyA@6XXM7siU#+0#mP~AnX
z9f=bMes~9>aaVmOsG<)5`6tzU4wyhF;k|~|x>7-2hXpVBpc5k{L4M`Wbe6Q?tr^*B
z`Y*>6*&R#~%JlBIitlZ^qGe3s21~h3U|&k%%jeMM;6!~UH|+0+<5V-_zDqZQN7<fD
zM2vP&&BMr(%$M51tLpycNES^{gnGn-o~t&>9?n?!Aj!Nj`YMO9?j>uqI9-Tex+nJD
z%e0#Yca6(zqGUR|KITa?9x-#C0!JKJHO(+fy@1!B$%ZwJwncQW7vGYv?~!^`#L~Um
zOL++>4qmqW`0Chc0T23G8|vO)tK=Z2`gvS4*qpqhIJCEv9i&&$09VO8YOz|oZ+ubd
zNXVdLc&p=KsSgtmIPLN69P7xYkYQ1vJ?u1g)T!6Ru`k2wkdj*wDC)VryGu2=yb0?F
z>q~~e>KZ0d<sP$M^)hrN7IC)eGuv*?pAk#*4fxII<8rIx545@9E}-};{IJdo*}!V1
zkUgWQp<TD%7(QQhWkf*vd;SiT1P@}N?jaoKEV?lzqfa1pG1Y^}ikjNMM*Kb?m5(n&
zOz8{+G2z7JatI<J95R%#%#ATAzlwPl$?6)w6WH~ku?(FhO)k1eRlF4I5UqR?T`Iy=
z_bVtkxqs3lQGny-BS%nkzwrXhI_M|P4l_VNVoMjVRoZ*0(JkMQ#AdJLFBj%$oTBx9
z_5|g_ll0@cfLf<j;&lJ>_#7f3UgV%9MY1}vMgF{B8yfE{HL*pMyhYF)WDZ^^3vS8F
zGlOhs%g_~pS3=WQ#494@jAXwOtr^Y|TnQ5zki>qRG)(oPY*f}U_=ip_{qB0!%w7~G
zWE!P4p3khyW-JJnE>eECuYfI?^d366Shq!Wm#x&jA<tFBO~aWRutYg|6S!-V%dvXb
zjpm3-7^fYCzbWmx*ts$8ECu=f{D#|=T{2_Q?C-SVQTSi8ey{G^D$8U&*bY{vQ$kGG
zq$8)>o>=HdCllE$>DPO0N;y#4G)D2y#B@5=N=+F%Xo2n{gKcPcK2!hP*^WSXl+ut;
zyLvVoY>VL{H%Kd9^i~lsb8j4>$EllrparEOJNT?Ym>vJa$(P^tOG)5aVb_5w^*&M0
zYOJ`I`}<NkH4X@iCc57jNSqY3D>9}UoSnYg#E(&yyK(tqr^@n}qU2H2DhkK-`2He%
zgXr_4kpXoQHxAO9S`wEdmqGU4j=1JdG!OixdqB4PPP6<nq;ZS)73s_@N{54U_<mt#
zR{@UUroZJ1=lVB~3y%RbLLE=9Mh=pj4wNruVxXLk8pKH)JVr{Hbx`P1XQ>RXA}>GM
zumruUUH|ZG2$bBj)Qluj&uB=dRb)?^qomw?Z$X%#D+Q*O97eHrgVB2*mR$bFBU`*}
zIem?dM)i}raTFDn@5^caxE^XFXVhBePmH9fqcTi`TLaXiueH=@06sl}>F%}h9H_e9
z>^O?LxM1EjX}NVppaO@NNQr=AtHcH-BU{yBT_vejJ#J)l^cl69Z7$sk`82Zyw7Wxt
z=~J?hZm{f@W}|96FUJfy65Gk8?^{^yjhOahUMCNNpt5DJw}ZKH7b!bGiFY9y6OY&T
z_N)?Jj(MuLTN36ZCJ6<obtKS{VOOSzs>I5Xy7uVlrb$o*Z%=-)kPo9s?<^Yqz~!Z*
z_mP<Y8YDC3(vm~>8(unFq65XSi!$@YtieSQ!<7IEOaA9VkKI?lA`*(nURv<D`3vIl
zzk?RMHDq|}aqs!Q7n{<V(L>fKL8cX}-+~uw9|_5)uC2`ZHca<BJSyCJ7L7R3^ezpJ
zixdU%^Arizo-zh;Lga89_J>eX7L8aG6Ghleg@F9aG%X$#g6^yP5apnB>YTz&EfS{q
z9UVfSyEIczebC)qlVu5cOoMzS_jrC|)rQlAzK7sfiW0`M8mVIohazPE9Jzn*qPt%6
zZL8RELY@L09B83@Be;x5V-IHnn$}{RAT#<2JA%ttlk#^(%u}CGze|1JY5MPhbfnYG
zIw%$XfBmA-<_pKLpGKwbRF$#P;@_)ech#>vj25sv25VM$ouo)?BXdRcO{)*OwTw)G
zv43W~T6ekBMtUD%5Bm>`<n0ehww;K9t*_z=^iZoM2Gjm6Wx6QTWDzOX28g|i7p-G(
znPo(pGb2-Hja^(5g>^Ltv!w4~65N!Ut5twl!Agrzyq4O2Fi3pUMtCU~>9gt_=h-f%
z;1&OuSu?A_sJvIvQ+dZNo3?m1%b1+s&UAx?8sUHEe_sB7zkm4R%6)<@oYB_i5>3Ip
zIA+?jVdX|zL{)?TGpx+=Ta>G80}0}Ax+722$XFNJsC1gcH56{8B)*)eU#r~HrC&}`
z|EWW92&;6y;3}!L5zXa385@?-D%>dSvyK;?jqU2t_R3wvBW;$!j45uQ7tyEIQv<v(
zw)qBpyRhiKBMR9HV)v2ZJdk>a;Db}r&bR3kqNSh)Q_$MJ#Uj3Gj1F;)sO|%6z#@<+
zi{pbYsYS#u`X$Nf($OS+lhw>xgjos1OnF^$-I$u;qhJswhH~p|ab*nO>zBrtb0ndn
zxV0uh!LN`&xckTP+JW}gznSpU492)u+`f{9Yr)js`NmfYH#Wdtradc0TnKNz@Su!e
zu$9}G_=ku;%4xk}eXl>)KgpuT>_<`Ud(A^a++K&pm3LbN;gI}ku@YVrA%FJBZ5$;m
zobR8}OLtW4-i+qPPLS-(7<>M{)rhiPoi@?&vDeVq5%fmZk=mDdRV>Pb-l7pP1y6|J
z8I>sF+TypKV=_<SBxSgNFy@5`t70+_4F<*(g54PNEt&4u%OoVR^n+$TL)qKdP6c)n
z-CoP*_kXZ4vBsj8M^2Y0nDq-^4r-wgu2Y-3fmi6ooPIXTI%UdJhw@7KgR=N+Vl3NO
zcl8-&i~^e%3E1G+u&^#M&5!sI)la$uQ2y&KsaZjx^r8D68BTZd^NrAV{0u$=#SH#4
zLE2)q%<UADH&I$um|>^NwBU^>4JJq<*14GLfM2*XQzYdlqqjnE)gZsPW^E@mp&ww*
zW9i>XL=uwLVZ9pO*8K>t>vdL~Ek_NUL$?LQi5sc#1Q-f6-ywKcIT8Kw?C<o*=Aa~-
z*eA0Mgmu5-j8rTh^;={1$#X=Ck5Gk;@KK#haYa^sXr0^_^Q84%+WOl3?#Mc#{{d}B
z>(_3pbR`e|)%9S-({if|E+hR2W!&qfQ&UiF^I!|M#xhdWsen<tq75@@WHX{+T3S~F
znoMw2v{^ia4`fkd=3p<6XkL)!lsI%8iq@>v^wpKCBiuxXbnp85`{i|;BM?Ba`lqTA
zyRm=UWJl&E{8JzYDHFu>*Z10-?#A8D|5jW9Ho0*CAs0fAy~MqbwYuOq9jjt9*nuHI
zbDwKvh)5Ir$r!fS5|;?Dt>V+@F*v8=TJJF)TdnC#Mk>+tGDGCw;A~^PC`gUt*<(|i
zB{{g{`uFehu`$fm4)&k7`u{xIV)yvA(%5SxX9MS80p2EKnL<HSdiWFiAy=3UmV-rj
zc%^|o`X!t!vuYErrUzbG?ostY(qs7GE^=Z33k*P+F6r($h_?W-bHJ|GUK@Wlv9++M
zG}?Z?8{_X${_c9aOXw4qfk0vTaVRH6FMOnFD?w|zo{zKKg$8wzW&yufWk&idB=+9!
z^dTI@g=>t<HJ%Cd%{u~X`lRpMFg&X{m?Nw#T4cg*?z{+rC($M4z9RHV@8KoueD7_)
z8T@i-6RG$5%_Y`lSjj|?wSvITK5c4g0!Uq49VAn-H<9~;vn7~hBdYuDOt2$gtNuBm
zo8$Y{2lwMxZNbfb$Hm0T528Og7Jfl!35edSr>CZ>tlX>*Z6nd&6-<c}7z{sZ9V^Ux
zMNgR3$iH97>Mv$5rHD*<Fmux@1NkgiA%VmyOAwal{&*L*?*@Cl?&!jtcf3KL{{|8z
z_($$R;SoAei#gUO@=7)M7s~2aAxJ>db;&IBK3KH&M<+ArlGXDRdX1VVO4)&R$f4<g
z`M~bg9+=(|cc^a3vB10?3GZiq$o|Zromh?lE2%m!alG4CIrvmRZHZVSM>NxXI>GBh
zSv|h>5GDAI(4E`@F?En<q4iBUtn-fux#Jt=qU6#PBE4-GhP)}OK!CI;i(sJ6^VIJF
zwJMEAeGKMb_^`VbA1hFYio)roSCrLG-NL5Yqhb{sh3_zt(Zg93UP*;!m?}k&V`1AB
zNYPri&yVkXW8uO1geXM3Oj&$G%~#Jd%h;?JDKwrq;P+!t&4W1Z^1?Ikguvk#bK?Bx
z$w5M*LxgRe=jz?UiDBbfC1I3!cjeMD*ueh4W0S*z6=TAf+ZYkG$}FGti`ipjpIK>W
zS>#c&Gw6~_XL`qQG4bK`W*>hek4LX*efn6|_MY+rXkNyAuu?NxS%L7~9tD3cn7&p(
zCtfqe6sjB&Q-Vs7BP5+%;#Gk};4xtwU!KY0XXbmkUy$kR9)!~?*v)qw00!+Yg^#H>
zc#8*z6zZo>+(bud?K<*!QO<vKd$8TBt^HLIw%iB>4ehiTCK&PD4G&n)Tr9X_3r-we
z?fI+}-G~Yn93gI6F{}Dw_SC*FLZ)5(85zp4%uubtD)J)UELLkvGk4#tw&Tuss<g@J
zd3(n+h;=s-joD7pea}*kl|?T5<3W!rK}V)#HpvFL3uRc{oe_mV<z1l~^m1_TkJDu3
z;JtNs6#g&&@E09TG{#Z`zh|EKwRTiJr)s50$5?Nrhn68HAr=rV#m>a)mTD$R2&O~{
zCI3>fr-!-b@EGRI%g0L8UU%%u_<;e9439JNV;4KSxd|78v+I+8^rmM<g+mx0&Si$a
zgf1uYC03KcCN)Lz!>f3f40Jb}wEszROD?xBZu>Ll3;sUIoNxDK3|j3*sam2tC@@e$
z^!;+AK>efeBJB%ALsQ{uFui)oD<x}JL&L^@dTz{b&_?*nsS;lNnoJ@(k9d5xVq$|w
z<ejC>oq()2USi?n=6C3#eetz?wPswc={I<8x=(8lE4EIsUfyGNZ{|KYn1IR|=E==f
z(;!A5(-2y^2xRFCSPqzHAZn5RCN_bp22T(KEtjA(rFZ%>a4@STrHZflxKoqe9Z4@^
zM*scx_y73<sFS1_?6+u!sT9fvjld*kU~edMy>?Q{<Kw(x)TAd1JfBpLz7(Nk)Jsdz
zj7#eyM{0^=a(C#N_pwZ(&^&zZP@5Qw`oUBRW0i<S2ql<0tEs~>vt6?~WEl?2q*;@8
z3M*&@%l)SQmXkcUm)d@GT2#JdzhfSAP9|n#C;$E8X|pwD!r#X?0P>0ZisQ~TNqupW
z*lUY~+ikD`vQb?@SAWX#r*Y+;=_|oacL$2CL$^(mV}aKO77pg}O+-=T1oLBT5sL2i
z42Qth<Jh0Ysw=K%u7GarF`3bIM1>2+0@C`c+*D0*5!qy26sis<9a7>LN2{z%Qj49t
z=L@x`4$ALHb*3COHoT?5S_c(Hs}g!V>W^=6Q0}zaubkDn)(lTax0+!+%B}9Vqw6{H
zvL|BRM`O<@;eVi1DzM!tXtBrA20Ce@^Jz|>%X-t`vi-%WweXCh_LhI#bUg2*pcP~R
z*RuTUzBKLXO~~uMd&o$v3@d0shHfUjC6c539PE6rF&;Ufa(Rw@K1*m7?f5)t`MjH0
z)_V(cajV5Am>f!kWcI@5rE8t6$S>5M=k=aRZROH6fA^jJp~2NlR4;Q2>L$7F#RT#9
z>4@1RhWG`Khy>P2j1Yx^BBL{S`niMaxlSWV-JBU0-T9zZ%>7mR3l$~QV$({o0;jTI
ze5=cN^!Bc2bT|BcojXp~K#2cM>OTe*cM{Kg-j*CkiW)EGQot^}s;cy8_1_@JA0Whq
zlrNr+R;Efa+`6N)s5rH*|E)nYZ3uqkk2C(E7@A|3YI`ozP~9Lexx#*1(r8luq+YPk
z{J}c$<WQa$CfVIhsE>s`<i2`cEPYHzF!ZIy?L$}MhAPFqQe@_8Lh#cQAH~-zZ5p$u
zZauEKr<oluR2T6z2A|B^#roi2jr3F<X4&!ZjiXo?9nIbJ4iAii=A_@&#n$TqH^#R&
z{$qMQO7u^&7KEB6l{H~A;ylPsJw2kA4#E2@7dO%lsi+3{VJ4?~e4(Bz-tw&^YR9P1
zTlpCH(W_%+@#|?%RN0HM=U?pU5$E2f<RPK1fw%3KLs--hd|lj})1h|Y<6CA3NsuSI
zl=<<g*vcJW=6yZY`aXe5QUB~awgg5fxlu%7u#A8=UXt61U-7wGtR{L&XvKbUf-}PL
z<eXA6<<r^;=`XwtFN1~2J^$Y${#Q0Tyev?j!*Z4q^mjQ4ah)uW_s=JkrRS%l*Ut`>
zPM35Fx(YWB3Z5IYnN+L_4|jaR(5iWJi2~l&xy}aU7kW?o-V*6Av2wyZTG!E2KSW2*
zGRLQkQU;Oz##ie-Z4fI)WSRxn$(ZcD;TL+;^r=a4(G~H3ZhK$lSXZj?cvyY8%d9JM
zzc3#pD^W_QnWy#rx#;<pgDoauRid_B6w$J6XKKeAcZHU9rH9=s!y`%~e@hGc<c#A7
zRRTR`&dt`*;~VYcVGk-~aNB!?q#4B&%52?dI@=%LQ>c&N@sqHhrnHRmj<I9Tx4aSD
zVUQ}9lh=Kd&QIx0uCqYm3pFs_*L;b|$xyZks(AAwgYsH85PAL~ndH7DNUoZKBHCWu
z_<;@&ed^tpoO=DG4Hem|2>#i;s%zLm6SE(n&BWpd&f7>XnjV}OlZntI70fq%8~9<7
zMYaw`E-rp49-oC1N_uZTo)Cu%RR2QWdHpzQIcNsoDp`3xfP+`gI?tVQZ4X={qU?(n
zV>0ASES^Xuc;9JBji{)RnFL(Lez;8XbB1uWaMp@p?7xhXk6V#!6B@aP4Rz7-K%a>i
z?fvf}va_DGUXlI#4--`A3qK7J?-HwnG7O~H2;zR~RLW)_^#La!=}+>KW#anZ{|^D3
B7G?kd

diff --git a/app/img/glyphicons-halflings.png b/app/img/glyphicons-halflings.png
deleted file mode 100644
index a9969993201f9cee63cf9f49217646347297b643..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12799
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

diff --git a/app/index.php b/app/index.php
deleted file mode 100644
index 8f98090..0000000
--- a/app/index.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-defined('YII_DEBUG') or define('YII_DEBUG', true);
-
-require(__DIR__ . '/../framework/yii.php');
-
-$config = require(__DIR__ . '/protected/config/main.php');
-$application = new yii\web\Application($config);
-$application->run();
diff --git a/app/js/bootstrap.js b/app/js/bootstrap.js
deleted file mode 100644
index c298ee4..0000000
--- a/app/js/bootstrap.js
+++ /dev/null
@@ -1,2276 +0,0 @@
-/* ===================================================
- * bootstrap-transition.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#transitions
- * ===================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
-  /* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
-   * ======================================================= */
-
-  $(function () {
-
-    $.support.transition = (function () {
-
-      var transitionEnd = (function () {
-
-        var el = document.createElement('bootstrap')
-          , transEndEventNames = {
-               'WebkitTransition' : 'webkitTransitionEnd'
-            ,  'MozTransition'    : 'transitionend'
-            ,  'OTransition'      : 'oTransitionEnd otransitionend'
-            ,  'transition'       : 'transitionend'
-            }
-          , name
-
-        for (name in transEndEventNames){
-          if (el.style[name] !== undefined) {
-            return transEndEventNames[name]
-          }
-        }
-
-      }())
-
-      return transitionEnd && {
-        end: transitionEnd
-      }
-
-    })()
-
-  })
-
-}(window.jQuery);/* ==========================================================
- * bootstrap-alert.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#alerts
- * ==========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* ALERT CLASS DEFINITION
-  * ====================== */
-
-  var dismiss = '[data-dismiss="alert"]'
-    , Alert = function (el) {
-        $(el).on('click', dismiss, this.close)
-      }
-
-  Alert.prototype.close = function (e) {
-    var $this = $(this)
-      , selector = $this.attr('data-target')
-      , $parent
-
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
-    }
-
-    $parent = $(selector)
-
-    e && e.preventDefault()
-
-    $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
-
-    $parent.trigger(e = $.Event('close'))
-
-    if (e.isDefaultPrevented()) return
-
-    $parent.removeClass('in')
-
-    function removeElement() {
-      $parent
-        .trigger('closed')
-        .remove()
-    }
-
-    $.support.transition && $parent.hasClass('fade') ?
-      $parent.on($.support.transition.end, removeElement) :
-      removeElement()
-  }
-
-
- /* ALERT PLUGIN DEFINITION
-  * ======================= */
-
-  var old = $.fn.alert
-
-  $.fn.alert = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('alert')
-      if (!data) $this.data('alert', (data = new Alert(this)))
-      if (typeof option == 'string') data[option].call($this)
-    })
-  }
-
-  $.fn.alert.Constructor = Alert
-
-
- /* ALERT NO CONFLICT
-  * ================= */
-
-  $.fn.alert.noConflict = function () {
-    $.fn.alert = old
-    return this
-  }
-
-
- /* ALERT DATA-API
-  * ============== */
-
-  $(document).on('click.alert.data-api', dismiss, Alert.prototype.close)
-
-}(window.jQuery);/* ============================================================
- * bootstrap-button.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#buttons
- * ============================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============================================================ */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* BUTTON PUBLIC CLASS DEFINITION
-  * ============================== */
-
-  var Button = function (element, options) {
-    this.$element = $(element)
-    this.options = $.extend({}, $.fn.button.defaults, options)
-  }
-
-  Button.prototype.setState = function (state) {
-    var d = 'disabled'
-      , $el = this.$element
-      , data = $el.data()
-      , val = $el.is('input') ? 'val' : 'html'
-
-    state = state + 'Text'
-    data.resetText || $el.data('resetText', $el[val]())
-
-    $el[val](data[state] || this.options[state])
-
-    // push to event loop to allow forms to submit
-    setTimeout(function () {
-      state == 'loadingText' ?
-        $el.addClass(d).attr(d, d) :
-        $el.removeClass(d).removeAttr(d)
-    }, 0)
-  }
-
-  Button.prototype.toggle = function () {
-    var $parent = this.$element.closest('[data-toggle="buttons-radio"]')
-
-    $parent && $parent
-      .find('.active')
-      .removeClass('active')
-
-    this.$element.toggleClass('active')
-  }
-
-
- /* BUTTON PLUGIN DEFINITION
-  * ======================== */
-
-  var old = $.fn.button
-
-  $.fn.button = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('button')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('button', (data = new Button(this, options)))
-      if (option == 'toggle') data.toggle()
-      else if (option) data.setState(option)
-    })
-  }
-
-  $.fn.button.defaults = {
-    loadingText: 'loading...'
-  }
-
-  $.fn.button.Constructor = Button
-
-
- /* BUTTON NO CONFLICT
-  * ================== */
-
-  $.fn.button.noConflict = function () {
-    $.fn.button = old
-    return this
-  }
-
-
- /* BUTTON DATA-API
-  * =============== */
-
-  $(document).on('click.button.data-api', '[data-toggle^=button]', function (e) {
-    var $btn = $(e.target)
-    if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
-    $btn.button('toggle')
-  })
-
-}(window.jQuery);/* ==========================================================
- * bootstrap-carousel.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#carousel
- * ==========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* CAROUSEL CLASS DEFINITION
-  * ========================= */
-
-  var Carousel = function (element, options) {
-    this.$element = $(element)
-    this.$indicators = this.$element.find('.carousel-indicators')
-    this.options = options
-    this.options.pause == 'hover' && this.$element
-      .on('mouseenter', $.proxy(this.pause, this))
-      .on('mouseleave', $.proxy(this.cycle, this))
-  }
-
-  Carousel.prototype = {
-
-    cycle: function (e) {
-      if (!e) this.paused = false
-      if (this.interval) clearInterval(this.interval);
-      this.options.interval
-        && !this.paused
-        && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
-      return this
-    }
-
-  , getActiveIndex: function () {
-      this.$active = this.$element.find('.item.active')
-      this.$items = this.$active.parent().children()
-      return this.$items.index(this.$active)
-    }
-
-  , to: function (pos) {
-      var activeIndex = this.getActiveIndex()
-        , that = this
-
-      if (pos > (this.$items.length - 1) || pos < 0) return
-
-      if (this.sliding) {
-        return this.$element.one('slid', function () {
-          that.to(pos)
-        })
-      }
-
-      if (activeIndex == pos) {
-        return this.pause().cycle()
-      }
-
-      return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
-    }
-
-  , pause: function (e) {
-      if (!e) this.paused = true
-      if (this.$element.find('.next, .prev').length && $.support.transition.end) {
-        this.$element.trigger($.support.transition.end)
-        this.cycle(true)
-      }
-      clearInterval(this.interval)
-      this.interval = null
-      return this
-    }
-
-  , next: function () {
-      if (this.sliding) return
-      return this.slide('next')
-    }
-
-  , prev: function () {
-      if (this.sliding) return
-      return this.slide('prev')
-    }
-
-  , slide: function (type, next) {
-      var $active = this.$element.find('.item.active')
-        , $next = next || $active[type]()
-        , isCycling = this.interval
-        , direction = type == 'next' ? 'left' : 'right'
-        , fallback  = type == 'next' ? 'first' : 'last'
-        , that = this
-        , e
-
-      this.sliding = true
-
-      isCycling && this.pause()
-
-      $next = $next.length ? $next : this.$element.find('.item')[fallback]()
-
-      e = $.Event('slide', {
-        relatedTarget: $next[0]
-      , direction: direction
-      })
-
-      if ($next.hasClass('active')) return
-
-      if (this.$indicators.length) {
-        this.$indicators.find('.active').removeClass('active')
-        this.$element.one('slid', function () {
-          var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
-          $nextIndicator && $nextIndicator.addClass('active')
-        })
-      }
-
-      if ($.support.transition && this.$element.hasClass('slide')) {
-        this.$element.trigger(e)
-        if (e.isDefaultPrevented()) return
-        $next.addClass(type)
-        $next[0].offsetWidth // force reflow
-        $active.addClass(direction)
-        $next.addClass(direction)
-        this.$element.one($.support.transition.end, function () {
-          $next.removeClass([type, direction].join(' ')).addClass('active')
-          $active.removeClass(['active', direction].join(' '))
-          that.sliding = false
-          setTimeout(function () { that.$element.trigger('slid') }, 0)
-        })
-      } else {
-        this.$element.trigger(e)
-        if (e.isDefaultPrevented()) return
-        $active.removeClass('active')
-        $next.addClass('active')
-        this.sliding = false
-        this.$element.trigger('slid')
-      }
-
-      isCycling && this.cycle()
-
-      return this
-    }
-
-  }
-
-
- /* CAROUSEL PLUGIN DEFINITION
-  * ========================== */
-
-  var old = $.fn.carousel
-
-  $.fn.carousel = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('carousel')
-        , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option)
-        , action = typeof option == 'string' ? option : options.slide
-      if (!data) $this.data('carousel', (data = new Carousel(this, options)))
-      if (typeof option == 'number') data.to(option)
-      else if (action) data[action]()
-      else if (options.interval) data.pause().cycle()
-    })
-  }
-
-  $.fn.carousel.defaults = {
-    interval: 5000
-  , pause: 'hover'
-  }
-
-  $.fn.carousel.Constructor = Carousel
-
-
- /* CAROUSEL NO CONFLICT
-  * ==================== */
-
-  $.fn.carousel.noConflict = function () {
-    $.fn.carousel = old
-    return this
-  }
-
- /* CAROUSEL DATA-API
-  * ================= */
-
-  $(document).on('click.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
-    var $this = $(this), href
-      , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
-      , options = $.extend({}, $target.data(), $this.data())
-      , slideIndex
-
-    $target.carousel(options)
-
-    if (slideIndex = $this.attr('data-slide-to')) {
-      $target.data('carousel').pause().to(slideIndex).cycle()
-    }
-
-    e.preventDefault()
-  })
-
-}(window.jQuery);/* =============================================================
- * bootstrap-collapse.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#collapse
- * =============================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============================================================ */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* COLLAPSE PUBLIC CLASS DEFINITION
-  * ================================ */
-
-  var Collapse = function (element, options) {
-    this.$element = $(element)
-    this.options = $.extend({}, $.fn.collapse.defaults, options)
-
-    if (this.options.parent) {
-      this.$parent = $(this.options.parent)
-    }
-
-    this.options.toggle && this.toggle()
-  }
-
-  Collapse.prototype = {
-
-    constructor: Collapse
-
-  , dimension: function () {
-      var hasWidth = this.$element.hasClass('width')
-      return hasWidth ? 'width' : 'height'
-    }
-
-  , show: function () {
-      var dimension
-        , scroll
-        , actives
-        , hasData
-
-      if (this.transitioning || this.$element.hasClass('in')) return
-
-      dimension = this.dimension()
-      scroll = $.camelCase(['scroll', dimension].join('-'))
-      actives = this.$parent && this.$parent.find('> .accordion-group > .in')
-
-      if (actives && actives.length) {
-        hasData = actives.data('collapse')
-        if (hasData && hasData.transitioning) return
-        actives.collapse('hide')
-        hasData || actives.data('collapse', null)
-      }
-
-      this.$element[dimension](0)
-      this.transition('addClass', $.Event('show'), 'shown')
-      $.support.transition && this.$element[dimension](this.$element[0][scroll])
-    }
-
-  , hide: function () {
-      var dimension
-      if (this.transitioning || !this.$element.hasClass('in')) return
-      dimension = this.dimension()
-      this.reset(this.$element[dimension]())
-      this.transition('removeClass', $.Event('hide'), 'hidden')
-      this.$element[dimension](0)
-    }
-
-  , reset: function (size) {
-      var dimension = this.dimension()
-
-      this.$element
-        .removeClass('collapse')
-        [dimension](size || 'auto')
-        [0].offsetWidth
-
-      this.$element[size !== null ? 'addClass' : 'removeClass']('collapse')
-
-      return this
-    }
-
-  , transition: function (method, startEvent, completeEvent) {
-      var that = this
-        , complete = function () {
-            if (startEvent.type == 'show') that.reset()
-            that.transitioning = 0
-            that.$element.trigger(completeEvent)
-          }
-
-      this.$element.trigger(startEvent)
-
-      if (startEvent.isDefaultPrevented()) return
-
-      this.transitioning = 1
-
-      this.$element[method]('in')
-
-      $.support.transition && this.$element.hasClass('collapse') ?
-        this.$element.one($.support.transition.end, complete) :
-        complete()
-    }
-
-  , toggle: function () {
-      this[this.$element.hasClass('in') ? 'hide' : 'show']()
-    }
-
-  }
-
-
- /* COLLAPSE PLUGIN DEFINITION
-  * ========================== */
-
-  var old = $.fn.collapse
-
-  $.fn.collapse = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('collapse')
-        , options = $.extend({}, $.fn.collapse.defaults, $this.data(), typeof option == 'object' && option)
-      if (!data) $this.data('collapse', (data = new Collapse(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.collapse.defaults = {
-    toggle: true
-  }
-
-  $.fn.collapse.Constructor = Collapse
-
-
- /* COLLAPSE NO CONFLICT
-  * ==================== */
-
-  $.fn.collapse.noConflict = function () {
-    $.fn.collapse = old
-    return this
-  }
-
-
- /* COLLAPSE DATA-API
-  * ================= */
-
-  $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) {
-    var $this = $(this), href
-      , target = $this.attr('data-target')
-        || e.preventDefault()
-        || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
-      , option = $(target).data('collapse') ? 'toggle' : $this.data()
-    $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
-    $(target).collapse(option)
-  })
-
-}(window.jQuery);/* ============================================================
- * bootstrap-dropdown.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#dropdowns
- * ============================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============================================================ */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* DROPDOWN CLASS DEFINITION
-  * ========================= */
-
-  var toggle = '[data-toggle=dropdown]'
-    , Dropdown = function (element) {
-        var $el = $(element).on('click.dropdown.data-api', this.toggle)
-        $('html').on('click.dropdown.data-api', function () {
-          $el.parent().removeClass('open')
-        })
-      }
-
-  Dropdown.prototype = {
-
-    constructor: Dropdown
-
-  , toggle: function (e) {
-      var $this = $(this)
-        , $parent
-        , isActive
-
-      if ($this.is('.disabled, :disabled')) return
-
-      $parent = getParent($this)
-
-      isActive = $parent.hasClass('open')
-
-      clearMenus()
-
-      if (!isActive) {
-        $parent.toggleClass('open')
-      }
-
-      $this.focus()
-
-      return false
-    }
-
-  , keydown: function (e) {
-      var $this
-        , $items
-        , $active
-        , $parent
-        , isActive
-        , index
-
-      if (!/(38|40|27)/.test(e.keyCode)) return
-
-      $this = $(this)
-
-      e.preventDefault()
-      e.stopPropagation()
-
-      if ($this.is('.disabled, :disabled')) return
-
-      $parent = getParent($this)
-
-      isActive = $parent.hasClass('open')
-
-      if (!isActive || (isActive && e.keyCode == 27)) {
-        if (e.which == 27) $parent.find(toggle).focus()
-        return $this.click()
-      }
-
-      $items = $('[role=menu] li:not(.divider):visible a', $parent)
-
-      if (!$items.length) return
-
-      index = $items.index($items.filter(':focus'))
-
-      if (e.keyCode == 38 && index > 0) index--                                        // up
-      if (e.keyCode == 40 && index < $items.length - 1) index++                        // down
-      if (!~index) index = 0
-
-      $items
-        .eq(index)
-        .focus()
-    }
-
-  }
-
-  function clearMenus() {
-    $(toggle).each(function () {
-      getParent($(this)).removeClass('open')
-    })
-  }
-
-  function getParent($this) {
-    var selector = $this.attr('data-target')
-      , $parent
-
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
-    }
-
-    $parent = selector && $(selector)
-
-    if (!$parent || !$parent.length) $parent = $this.parent()
-
-    return $parent
-  }
-
-
-  /* DROPDOWN PLUGIN DEFINITION
-   * ========================== */
-
-  var old = $.fn.dropdown
-
-  $.fn.dropdown = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('dropdown')
-      if (!data) $this.data('dropdown', (data = new Dropdown(this)))
-      if (typeof option == 'string') data[option].call($this)
-    })
-  }
-
-  $.fn.dropdown.Constructor = Dropdown
-
-
- /* DROPDOWN NO CONFLICT
-  * ==================== */
-
-  $.fn.dropdown.noConflict = function () {
-    $.fn.dropdown = old
-    return this
-  }
-
-
-  /* APPLY TO STANDARD DROPDOWN ELEMENTS
-   * =================================== */
-
-  $(document)
-    .on('click.dropdown.data-api', clearMenus)
-    .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
-    .on('click.dropdown-menu', function (e) { e.stopPropagation() })
-    .on('click.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
-    .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
-
-}(window.jQuery);
-/* =========================================================
- * bootstrap-modal.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#modals
- * =========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================= */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* MODAL CLASS DEFINITION
-  * ====================== */
-
-  var Modal = function (element, options) {
-    this.options = options
-    this.$element = $(element)
-      .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
-    this.options.remote && this.$element.find('.modal-body').load(this.options.remote)
-  }
-
-  Modal.prototype = {
-
-      constructor: Modal
-
-    , toggle: function () {
-        return this[!this.isShown ? 'show' : 'hide']()
-      }
-
-    , show: function () {
-        var that = this
-          , e = $.Event('show')
-
-        this.$element.trigger(e)
-
-        if (this.isShown || e.isDefaultPrevented()) return
-
-        this.isShown = true
-
-        this.escape()
-
-        this.backdrop(function () {
-          var transition = $.support.transition && that.$element.hasClass('fade')
-
-          if (!that.$element.parent().length) {
-            that.$element.appendTo(document.body) //don't move modals dom position
-          }
-
-          that.$element.show()
-
-          if (transition) {
-            that.$element[0].offsetWidth // force reflow
-          }
-
-          that.$element
-            .addClass('in')
-            .attr('aria-hidden', false)
-
-          that.enforceFocus()
-
-          transition ?
-            that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown') }) :
-            that.$element.focus().trigger('shown')
-
-        })
-      }
-
-    , hide: function (e) {
-        e && e.preventDefault()
-
-        var that = this
-
-        e = $.Event('hide')
-
-        this.$element.trigger(e)
-
-        if (!this.isShown || e.isDefaultPrevented()) return
-
-        this.isShown = false
-
-        this.escape()
-
-        $(document).off('focusin.modal')
-
-        this.$element
-          .removeClass('in')
-          .attr('aria-hidden', true)
-
-        $.support.transition && this.$element.hasClass('fade') ?
-          this.hideWithTransition() :
-          this.hideModal()
-      }
-
-    , enforceFocus: function () {
-        var that = this
-        $(document).on('focusin.modal', function (e) {
-          if (that.$element[0] !== e.target && !that.$element.has(e.target).length) {
-            that.$element.focus()
-          }
-        })
-      }
-
-    , escape: function () {
-        var that = this
-        if (this.isShown && this.options.keyboard) {
-          this.$element.on('keyup.dismiss.modal', function ( e ) {
-            e.which == 27 && that.hide()
-          })
-        } else if (!this.isShown) {
-          this.$element.off('keyup.dismiss.modal')
-        }
-      }
-
-    , hideWithTransition: function () {
-        var that = this
-          , timeout = setTimeout(function () {
-              that.$element.off($.support.transition.end)
-              that.hideModal()
-            }, 500)
-
-        this.$element.one($.support.transition.end, function () {
-          clearTimeout(timeout)
-          that.hideModal()
-        })
-      }
-
-    , hideModal: function () {
-        var that = this
-        this.$element.hide()
-        this.backdrop(function () {
-          that.removeBackdrop()
-          that.$element.trigger('hidden')
-        })
-      }
-
-    , removeBackdrop: function () {
-        this.$backdrop && this.$backdrop.remove()
-        this.$backdrop = null
-      }
-
-    , backdrop: function (callback) {
-        var that = this
-          , animate = this.$element.hasClass('fade') ? 'fade' : ''
-
-        if (this.isShown && this.options.backdrop) {
-          var doAnimate = $.support.transition && animate
-
-          this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
-            .appendTo(document.body)
-
-          this.$backdrop.click(
-            this.options.backdrop == 'static' ?
-              $.proxy(this.$element[0].focus, this.$element[0])
-            : $.proxy(this.hide, this)
-          )
-
-          if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
-
-          this.$backdrop.addClass('in')
-
-          if (!callback) return
-
-          doAnimate ?
-            this.$backdrop.one($.support.transition.end, callback) :
-            callback()
-
-        } else if (!this.isShown && this.$backdrop) {
-          this.$backdrop.removeClass('in')
-
-          $.support.transition && this.$element.hasClass('fade')?
-            this.$backdrop.one($.support.transition.end, callback) :
-            callback()
-
-        } else if (callback) {
-          callback()
-        }
-      }
-  }
-
-
- /* MODAL PLUGIN DEFINITION
-  * ======================= */
-
-  var old = $.fn.modal
-
-  $.fn.modal = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('modal')
-        , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option)
-      if (!data) $this.data('modal', (data = new Modal(this, options)))
-      if (typeof option == 'string') data[option]()
-      else if (options.show) data.show()
-    })
-  }
-
-  $.fn.modal.defaults = {
-      backdrop: true
-    , keyboard: true
-    , show: true
-  }
-
-  $.fn.modal.Constructor = Modal
-
-
- /* MODAL NO CONFLICT
-  * ================= */
-
-  $.fn.modal.noConflict = function () {
-    $.fn.modal = old
-    return this
-  }
-
-
- /* MODAL DATA-API
-  * ============== */
-
-  $(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) {
-    var $this = $(this)
-      , href = $this.attr('href')
-      , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
-      , option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data())
-
-    e.preventDefault()
-
-    $target
-      .modal(option)
-      .one('hide', function () {
-        $this.focus()
-      })
-  })
-
-}(window.jQuery);
-/* ===========================================================
- * bootstrap-tooltip.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#tooltips
- * Inspired by the original jQuery.tipsy by Jason Frame
- * ===========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* TOOLTIP PUBLIC CLASS DEFINITION
-  * =============================== */
-
-  var Tooltip = function (element, options) {
-    this.init('tooltip', element, options)
-  }
-
-  Tooltip.prototype = {
-
-    constructor: Tooltip
-
-  , init: function (type, element, options) {
-      var eventIn
-        , eventOut
-        , triggers
-        , trigger
-        , i
-
-      this.type = type
-      this.$element = $(element)
-      this.options = this.getOptions(options)
-      this.enabled = true
-
-      triggers = this.options.trigger.split(' ')
-
-      for (i = triggers.length; i--;) {
-        trigger = triggers[i]
-        if (trigger == 'click') {
-          this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
-        } else if (trigger != 'manual') {
-          eventIn = trigger == 'hover' ? 'mouseenter' : 'focus'
-          eventOut = trigger == 'hover' ? 'mouseleave' : 'blur'
-          this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
-          this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
-        }
-      }
-
-      this.options.selector ?
-        (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
-        this.fixTitle()
-    }
-
-  , getOptions: function (options) {
-      options = $.extend({}, $.fn[this.type].defaults, this.$element.data(), options)
-
-      if (options.delay && typeof options.delay == 'number') {
-        options.delay = {
-          show: options.delay
-        , hide: options.delay
-        }
-      }
-
-      return options
-    }
-
-  , enter: function (e) {
-      var defaults = $.fn[this.type].defaults
-        , options = {}
-        , self
-
-      this._options && $.each(this._options, function (key, value) {
-        if (defaults[key] != value) options[key] = value
-      }, this)
-
-      self = $(e.currentTarget)[this.type](options).data(this.type)
-
-      if (!self.options.delay || !self.options.delay.show) return self.show()
-
-      clearTimeout(this.timeout)
-      self.hoverState = 'in'
-      this.timeout = setTimeout(function() {
-        if (self.hoverState == 'in') self.show()
-      }, self.options.delay.show)
-    }
-
-  , leave: function (e) {
-      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
-
-      if (this.timeout) clearTimeout(this.timeout)
-      if (!self.options.delay || !self.options.delay.hide) return self.hide()
-
-      self.hoverState = 'out'
-      this.timeout = setTimeout(function() {
-        if (self.hoverState == 'out') self.hide()
-      }, self.options.delay.hide)
-    }
-
-  , show: function () {
-      var $tip
-        , pos
-        , actualWidth
-        , actualHeight
-        , placement
-        , tp
-        , e = $.Event('show')
-
-      if (this.hasContent() && this.enabled) {
-        this.$element.trigger(e)
-        if (e.isDefaultPrevented()) return
-        $tip = this.tip()
-        this.setContent()
-
-        if (this.options.animation) {
-          $tip.addClass('fade')
-        }
-
-        placement = typeof this.options.placement == 'function' ?
-          this.options.placement.call(this, $tip[0], this.$element[0]) :
-          this.options.placement
-
-        $tip
-          .detach()
-          .css({ top: 0, left: 0, display: 'block' })
-
-        this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
-
-        pos = this.getPosition()
-
-        actualWidth = $tip[0].offsetWidth
-        actualHeight = $tip[0].offsetHeight
-
-        switch (placement) {
-          case 'bottom':
-            tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}
-            break
-          case 'top':
-            tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2}
-            break
-          case 'left':
-            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth}
-            break
-          case 'right':
-            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width}
-            break
-        }
-
-        this.applyPlacement(tp, placement)
-        this.$element.trigger('shown')
-      }
-    }
-
-  , applyPlacement: function(offset, placement){
-      var $tip = this.tip()
-        , width = $tip[0].offsetWidth
-        , height = $tip[0].offsetHeight
-        , actualWidth
-        , actualHeight
-        , delta
-        , replace
-
-      $tip
-        .offset(offset)
-        .addClass(placement)
-        .addClass('in')
-
-      actualWidth = $tip[0].offsetWidth
-      actualHeight = $tip[0].offsetHeight
-
-      if (placement == 'top' && actualHeight != height) {
-        offset.top = offset.top + height - actualHeight
-        replace = true
-      }
-
-      if (placement == 'bottom' || placement == 'top') {
-        delta = 0
-
-        if (offset.left < 0){
-          delta = offset.left * -2
-          offset.left = 0
-          $tip.offset(offset)
-          actualWidth = $tip[0].offsetWidth
-          actualHeight = $tip[0].offsetHeight
-        }
-
-        this.replaceArrow(delta - width + actualWidth, actualWidth, 'left')
-      } else {
-        this.replaceArrow(actualHeight - height, actualHeight, 'top')
-      }
-
-      if (replace) $tip.offset(offset)
-    }
-
-  , replaceArrow: function(delta, dimension, position){
-      this
-        .arrow()
-        .css(position, delta ? (50 * (1 - delta / dimension) + "%") : '')
-    }
-
-  , setContent: function () {
-      var $tip = this.tip()
-        , title = this.getTitle()
-
-      $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
-      $tip.removeClass('fade in top bottom left right')
-    }
-
-  , hide: function () {
-      var that = this
-        , $tip = this.tip()
-        , e = $.Event('hide')
-
-      this.$element.trigger(e)
-      if (e.isDefaultPrevented()) return
-
-      $tip.removeClass('in')
-
-      function removeWithAnimation() {
-        var timeout = setTimeout(function () {
-          $tip.off($.support.transition.end).detach()
-        }, 500)
-
-        $tip.one($.support.transition.end, function () {
-          clearTimeout(timeout)
-          $tip.detach()
-        })
-      }
-
-      $.support.transition && this.$tip.hasClass('fade') ?
-        removeWithAnimation() :
-        $tip.detach()
-
-      this.$element.trigger('hidden')
-
-      return this
-    }
-
-  , fixTitle: function () {
-      var $e = this.$element
-      if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
-        $e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
-      }
-    }
-
-  , hasContent: function () {
-      return this.getTitle()
-    }
-
-  , getPosition: function () {
-      var el = this.$element[0]
-      return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : {
-        width: el.offsetWidth
-      , height: el.offsetHeight
-      }, this.$element.offset())
-    }
-
-  , getTitle: function () {
-      var title
-        , $e = this.$element
-        , o = this.options
-
-      title = $e.attr('data-original-title')
-        || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
-
-      return title
-    }
-
-  , tip: function () {
-      return this.$tip = this.$tip || $(this.options.template)
-    }
-
-  , arrow: function(){
-      return this.$arrow = this.$arrow || this.tip().find(".tooltip-arrow")
-    }
-
-  , validate: function () {
-      if (!this.$element[0].parentNode) {
-        this.hide()
-        this.$element = null
-        this.options = null
-      }
-    }
-
-  , enable: function () {
-      this.enabled = true
-    }
-
-  , disable: function () {
-      this.enabled = false
-    }
-
-  , toggleEnabled: function () {
-      this.enabled = !this.enabled
-    }
-
-  , toggle: function (e) {
-      var self = e ? $(e.currentTarget)[this.type](this._options).data(this.type) : this
-      self.tip().hasClass('in') ? self.hide() : self.show()
-    }
-
-  , destroy: function () {
-      this.hide().$element.off('.' + this.type).removeData(this.type)
-    }
-
-  }
-
-
- /* TOOLTIP PLUGIN DEFINITION
-  * ========================= */
-
-  var old = $.fn.tooltip
-
-  $.fn.tooltip = function ( option ) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('tooltip')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('tooltip', (data = new Tooltip(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.tooltip.Constructor = Tooltip
-
-  $.fn.tooltip.defaults = {
-    animation: true
-  , placement: 'top'
-  , selector: false
-  , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
-  , trigger: 'hover focus'
-  , title: ''
-  , delay: 0
-  , html: false
-  , container: false
-  }
-
-
- /* TOOLTIP NO CONFLICT
-  * =================== */
-
-  $.fn.tooltip.noConflict = function () {
-    $.fn.tooltip = old
-    return this
-  }
-
-}(window.jQuery);
-/* ===========================================================
- * bootstrap-popover.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#popovers
- * ===========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* POPOVER PUBLIC CLASS DEFINITION
-  * =============================== */
-
-  var Popover = function (element, options) {
-    this.init('popover', element, options)
-  }
-
-
-  /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js
-     ========================================== */
-
-  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, {
-
-    constructor: Popover
-
-  , setContent: function () {
-      var $tip = this.tip()
-        , title = this.getTitle()
-        , content = this.getContent()
-
-      $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
-      $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content)
-
-      $tip.removeClass('fade top bottom left right in')
-    }
-
-  , hasContent: function () {
-      return this.getTitle() || this.getContent()
-    }
-
-  , getContent: function () {
-      var content
-        , $e = this.$element
-        , o = this.options
-
-      content = (typeof o.content == 'function' ? o.content.call($e[0]) :  o.content)
-        || $e.attr('data-content')
-
-      return content
-    }
-
-  , tip: function () {
-      if (!this.$tip) {
-        this.$tip = $(this.options.template)
-      }
-      return this.$tip
-    }
-
-  , destroy: function () {
-      this.hide().$element.off('.' + this.type).removeData(this.type)
-    }
-
-  })
-
-
- /* POPOVER PLUGIN DEFINITION
-  * ======================= */
-
-  var old = $.fn.popover
-
-  $.fn.popover = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('popover')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('popover', (data = new Popover(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.popover.Constructor = Popover
-
-  $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, {
-    placement: 'right'
-  , trigger: 'click'
-  , content: ''
-  , template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
-  })
-
-
- /* POPOVER NO CONFLICT
-  * =================== */
-
-  $.fn.popover.noConflict = function () {
-    $.fn.popover = old
-    return this
-  }
-
-}(window.jQuery);
-/* =============================================================
- * bootstrap-scrollspy.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#scrollspy
- * =============================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* SCROLLSPY CLASS DEFINITION
-  * ========================== */
-
-  function ScrollSpy(element, options) {
-    var process = $.proxy(this.process, this)
-      , $element = $(element).is('body') ? $(window) : $(element)
-      , href
-    this.options = $.extend({}, $.fn.scrollspy.defaults, options)
-    this.$scrollElement = $element.on('scroll.scroll-spy.data-api', process)
-    this.selector = (this.options.target
-      || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
-      || '') + ' .nav li > a'
-    this.$body = $('body')
-    this.refresh()
-    this.process()
-  }
-
-  ScrollSpy.prototype = {
-
-      constructor: ScrollSpy
-
-    , refresh: function () {
-        var self = this
-          , $targets
-
-        this.offsets = $([])
-        this.targets = $([])
-
-        $targets = this.$body
-          .find(this.selector)
-          .map(function () {
-            var $el = $(this)
-              , href = $el.data('target') || $el.attr('href')
-              , $href = /^#\w/.test(href) && $(href)
-            return ( $href
-              && $href.length
-              && [[ $href.position().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]] ) || null
-          })
-          .sort(function (a, b) { return a[0] - b[0] })
-          .each(function () {
-            self.offsets.push(this[0])
-            self.targets.push(this[1])
-          })
-      }
-
-    , process: function () {
-        var scrollTop = this.$scrollElement.scrollTop() + this.options.offset
-          , scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight
-          , maxScroll = scrollHeight - this.$scrollElement.height()
-          , offsets = this.offsets
-          , targets = this.targets
-          , activeTarget = this.activeTarget
-          , i
-
-        if (scrollTop >= maxScroll) {
-          return activeTarget != (i = targets.last()[0])
-            && this.activate ( i )
-        }
-
-        for (i = offsets.length; i--;) {
-          activeTarget != targets[i]
-            && scrollTop >= offsets[i]
-            && (!offsets[i + 1] || scrollTop <= offsets[i + 1])
-            && this.activate( targets[i] )
-        }
-      }
-
-    , activate: function (target) {
-        var active
-          , selector
-
-        this.activeTarget = target
-
-        $(this.selector)
-          .parent('.active')
-          .removeClass('active')
-
-        selector = this.selector
-          + '[data-target="' + target + '"],'
-          + this.selector + '[href="' + target + '"]'
-
-        active = $(selector)
-          .parent('li')
-          .addClass('active')
-
-        if (active.parent('.dropdown-menu').length)  {
-          active = active.closest('li.dropdown').addClass('active')
-        }
-
-        active.trigger('activate')
-      }
-
-  }
-
-
- /* SCROLLSPY PLUGIN DEFINITION
-  * =========================== */
-
-  var old = $.fn.scrollspy
-
-  $.fn.scrollspy = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('scrollspy')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.scrollspy.Constructor = ScrollSpy
-
-  $.fn.scrollspy.defaults = {
-    offset: 10
-  }
-
-
- /* SCROLLSPY NO CONFLICT
-  * ===================== */
-
-  $.fn.scrollspy.noConflict = function () {
-    $.fn.scrollspy = old
-    return this
-  }
-
-
- /* SCROLLSPY DATA-API
-  * ================== */
-
-  $(window).on('load', function () {
-    $('[data-spy="scroll"]').each(function () {
-      var $spy = $(this)
-      $spy.scrollspy($spy.data())
-    })
-  })
-
-}(window.jQuery);/* ========================================================
- * bootstrap-tab.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#tabs
- * ========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ======================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* TAB CLASS DEFINITION
-  * ==================== */
-
-  var Tab = function (element) {
-    this.element = $(element)
-  }
-
-  Tab.prototype = {
-
-    constructor: Tab
-
-  , show: function () {
-      var $this = this.element
-        , $ul = $this.closest('ul:not(.dropdown-menu)')
-        , selector = $this.attr('data-target')
-        , previous
-        , $target
-        , e
-
-      if (!selector) {
-        selector = $this.attr('href')
-        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
-      }
-
-      if ( $this.parent('li').hasClass('active') ) return
-
-      previous = $ul.find('.active:last a')[0]
-
-      e = $.Event('show', {
-        relatedTarget: previous
-      })
-
-      $this.trigger(e)
-
-      if (e.isDefaultPrevented()) return
-
-      $target = $(selector)
-
-      this.activate($this.parent('li'), $ul)
-      this.activate($target, $target.parent(), function () {
-        $this.trigger({
-          type: 'shown'
-        , relatedTarget: previous
-        })
-      })
-    }
-
-  , activate: function ( element, container, callback) {
-      var $active = container.find('> .active')
-        , transition = callback
-            && $.support.transition
-            && $active.hasClass('fade')
-
-      function next() {
-        $active
-          .removeClass('active')
-          .find('> .dropdown-menu > .active')
-          .removeClass('active')
-
-        element.addClass('active')
-
-        if (transition) {
-          element[0].offsetWidth // reflow for transition
-          element.addClass('in')
-        } else {
-          element.removeClass('fade')
-        }
-
-        if ( element.parent('.dropdown-menu') ) {
-          element.closest('li.dropdown').addClass('active')
-        }
-
-        callback && callback()
-      }
-
-      transition ?
-        $active.one($.support.transition.end, next) :
-        next()
-
-      $active.removeClass('in')
-    }
-  }
-
-
- /* TAB PLUGIN DEFINITION
-  * ===================== */
-
-  var old = $.fn.tab
-
-  $.fn.tab = function ( option ) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('tab')
-      if (!data) $this.data('tab', (data = new Tab(this)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.tab.Constructor = Tab
-
-
- /* TAB NO CONFLICT
-  * =============== */
-
-  $.fn.tab.noConflict = function () {
-    $.fn.tab = old
-    return this
-  }
-
-
- /* TAB DATA-API
-  * ============ */
-
-  $(document).on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
-    e.preventDefault()
-    $(this).tab('show')
-  })
-
-}(window.jQuery);/* =============================================================
- * bootstrap-typeahead.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#typeahead
- * =============================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============================================================ */
-
-
-!function($){
-
-  "use strict"; // jshint ;_;
-
-
- /* TYPEAHEAD PUBLIC CLASS DEFINITION
-  * ================================= */
-
-  var Typeahead = function (element, options) {
-    this.$element = $(element)
-    this.options = $.extend({}, $.fn.typeahead.defaults, options)
-    this.matcher = this.options.matcher || this.matcher
-    this.sorter = this.options.sorter || this.sorter
-    this.highlighter = this.options.highlighter || this.highlighter
-    this.updater = this.options.updater || this.updater
-    this.source = this.options.source
-    this.$menu = $(this.options.menu)
-    this.shown = false
-    this.listen()
-  }
-
-  Typeahead.prototype = {
-
-    constructor: Typeahead
-
-  , select: function () {
-      var val = this.$menu.find('.active').attr('data-value')
-      this.$element
-        .val(this.updater(val))
-        .change()
-      return this.hide()
-    }
-
-  , updater: function (item) {
-      return item
-    }
-
-  , show: function () {
-      var pos = $.extend({}, this.$element.position(), {
-        height: this.$element[0].offsetHeight
-      })
-
-      this.$menu
-        .insertAfter(this.$element)
-        .css({
-          top: pos.top + pos.height
-        , left: pos.left
-        })
-        .show()
-
-      this.shown = true
-      return this
-    }
-
-  , hide: function () {
-      this.$menu.hide()
-      this.shown = false
-      return this
-    }
-
-  , lookup: function (event) {
-      var items
-
-      this.query = this.$element.val()
-
-      if (!this.query || this.query.length < this.options.minLength) {
-        return this.shown ? this.hide() : this
-      }
-
-      items = $.isFunction(this.source) ? this.source(this.query, $.proxy(this.process, this)) : this.source
-
-      return items ? this.process(items) : this
-    }
-
-  , process: function (items) {
-      var that = this
-
-      items = $.grep(items, function (item) {
-        return that.matcher(item)
-      })
-
-      items = this.sorter(items)
-
-      if (!items.length) {
-        return this.shown ? this.hide() : this
-      }
-
-      return this.render(items.slice(0, this.options.items)).show()
-    }
-
-  , matcher: function (item) {
-      return ~item.toLowerCase().indexOf(this.query.toLowerCase())
-    }
-
-  , sorter: function (items) {
-      var beginswith = []
-        , caseSensitive = []
-        , caseInsensitive = []
-        , item
-
-      while (item = items.shift()) {
-        if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item)
-        else if (~item.indexOf(this.query)) caseSensitive.push(item)
-        else caseInsensitive.push(item)
-      }
-
-      return beginswith.concat(caseSensitive, caseInsensitive)
-    }
-
-  , highlighter: function (item) {
-      var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&')
-      return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) {
-        return '<strong>' + match + '</strong>'
-      })
-    }
-
-  , render: function (items) {
-      var that = this
-
-      items = $(items).map(function (i, item) {
-        i = $(that.options.item).attr('data-value', item)
-        i.find('a').html(that.highlighter(item))
-        return i[0]
-      })
-
-      items.first().addClass('active')
-      this.$menu.html(items)
-      return this
-    }
-
-  , next: function (event) {
-      var active = this.$menu.find('.active').removeClass('active')
-        , next = active.next()
-
-      if (!next.length) {
-        next = $(this.$menu.find('li')[0])
-      }
-
-      next.addClass('active')
-    }
-
-  , prev: function (event) {
-      var active = this.$menu.find('.active').removeClass('active')
-        , prev = active.prev()
-
-      if (!prev.length) {
-        prev = this.$menu.find('li').last()
-      }
-
-      prev.addClass('active')
-    }
-
-  , listen: function () {
-      this.$element
-        .on('focus',    $.proxy(this.focus, this))
-        .on('blur',     $.proxy(this.blur, this))
-        .on('keypress', $.proxy(this.keypress, this))
-        .on('keyup',    $.proxy(this.keyup, this))
-
-      if (this.eventSupported('keydown')) {
-        this.$element.on('keydown', $.proxy(this.keydown, this))
-      }
-
-      this.$menu
-        .on('click', $.proxy(this.click, this))
-        .on('mouseenter', 'li', $.proxy(this.mouseenter, this))
-        .on('mouseleave', 'li', $.proxy(this.mouseleave, this))
-    }
-
-  , eventSupported: function(eventName) {
-      var isSupported = eventName in this.$element
-      if (!isSupported) {
-        this.$element.setAttribute(eventName, 'return;')
-        isSupported = typeof this.$element[eventName] === 'function'
-      }
-      return isSupported
-    }
-
-  , move: function (e) {
-      if (!this.shown) return
-
-      switch(e.keyCode) {
-        case 9: // tab
-        case 13: // enter
-        case 27: // escape
-          e.preventDefault()
-          break
-
-        case 38: // up arrow
-          e.preventDefault()
-          this.prev()
-          break
-
-        case 40: // down arrow
-          e.preventDefault()
-          this.next()
-          break
-      }
-
-      e.stopPropagation()
-    }
-
-  , keydown: function (e) {
-      this.suppressKeyPressRepeat = ~$.inArray(e.keyCode, [40,38,9,13,27])
-      this.move(e)
-    }
-
-  , keypress: function (e) {
-      if (this.suppressKeyPressRepeat) return
-      this.move(e)
-    }
-
-  , keyup: function (e) {
-      switch(e.keyCode) {
-        case 40: // down arrow
-        case 38: // up arrow
-        case 16: // shift
-        case 17: // ctrl
-        case 18: // alt
-          break
-
-        case 9: // tab
-        case 13: // enter
-          if (!this.shown) return
-          this.select()
-          break
-
-        case 27: // escape
-          if (!this.shown) return
-          this.hide()
-          break
-
-        default:
-          this.lookup()
-      }
-
-      e.stopPropagation()
-      e.preventDefault()
-  }
-
-  , focus: function (e) {
-      this.focused = true
-    }
-
-  , blur: function (e) {
-      this.focused = false
-      if (!this.mousedover && this.shown) this.hide()
-    }
-
-  , click: function (e) {
-      e.stopPropagation()
-      e.preventDefault()
-      this.select()
-      this.$element.focus()
-    }
-
-  , mouseenter: function (e) {
-      this.mousedover = true
-      this.$menu.find('.active').removeClass('active')
-      $(e.currentTarget).addClass('active')
-    }
-
-  , mouseleave: function (e) {
-      this.mousedover = false
-      if (!this.focused && this.shown) this.hide()
-    }
-
-  }
-
-
-  /* TYPEAHEAD PLUGIN DEFINITION
-   * =========================== */
-
-  var old = $.fn.typeahead
-
-  $.fn.typeahead = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('typeahead')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('typeahead', (data = new Typeahead(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.typeahead.defaults = {
-    source: []
-  , items: 8
-  , menu: '<ul class="typeahead dropdown-menu"></ul>'
-  , item: '<li><a href="#"></a></li>'
-  , minLength: 1
-  }
-
-  $.fn.typeahead.Constructor = Typeahead
-
-
- /* TYPEAHEAD NO CONFLICT
-  * =================== */
-
-  $.fn.typeahead.noConflict = function () {
-    $.fn.typeahead = old
-    return this
-  }
-
-
- /* TYPEAHEAD DATA-API
-  * ================== */
-
-  $(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
-    var $this = $(this)
-    if ($this.data('typeahead')) return
-    $this.typeahead($this.data())
-  })
-
-}(window.jQuery);
-/* ==========================================================
- * bootstrap-affix.js v2.3.1
- * http://twitter.github.com/bootstrap/javascript.html#affix
- * ==========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* AFFIX CLASS DEFINITION
-  * ====================== */
-
-  var Affix = function (element, options) {
-    this.options = $.extend({}, $.fn.affix.defaults, options)
-    this.$window = $(window)
-      .on('scroll.affix.data-api', $.proxy(this.checkPosition, this))
-      .on('click.affix.data-api',  $.proxy(function () { setTimeout($.proxy(this.checkPosition, this), 1) }, this))
-    this.$element = $(element)
-    this.checkPosition()
-  }
-
-  Affix.prototype.checkPosition = function () {
-    if (!this.$element.is(':visible')) return
-
-    var scrollHeight = $(document).height()
-      , scrollTop = this.$window.scrollTop()
-      , position = this.$element.offset()
-      , offset = this.options.offset
-      , offsetBottom = offset.bottom
-      , offsetTop = offset.top
-      , reset = 'affix affix-top affix-bottom'
-      , affix
-
-    if (typeof offset != 'object') offsetBottom = offsetTop = offset
-    if (typeof offsetTop == 'function') offsetTop = offset.top()
-    if (typeof offsetBottom == 'function') offsetBottom = offset.bottom()
-
-    affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ?
-      false    : offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ?
-      'bottom' : offsetTop != null && scrollTop <= offsetTop ?
-      'top'    : false
-
-    if (this.affixed === affix) return
-
-    this.affixed = affix
-    this.unpin = affix == 'bottom' ? position.top - scrollTop : null
-
-    this.$element.removeClass(reset).addClass('affix' + (affix ? '-' + affix : ''))
-  }
-
-
- /* AFFIX PLUGIN DEFINITION
-  * ======================= */
-
-  var old = $.fn.affix
-
-  $.fn.affix = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('affix')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('affix', (data = new Affix(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.affix.Constructor = Affix
-
-  $.fn.affix.defaults = {
-    offset: 0
-  }
-
-
- /* AFFIX NO CONFLICT
-  * ================= */
-
-  $.fn.affix.noConflict = function () {
-    $.fn.affix = old
-    return this
-  }
-
-
- /* AFFIX DATA-API
-  * ============== */
-
-  $(window).on('load', function () {
-    $('[data-spy="affix"]').each(function () {
-      var $spy = $(this)
-        , data = $spy.data()
-
-      data.offset = data.offset || {}
-
-      data.offsetBottom && (data.offset.bottom = data.offsetBottom)
-      data.offsetTop && (data.offset.top = data.offsetTop)
-
-      $spy.affix(data)
-    })
-  })
-
-
-}(window.jQuery);
\ No newline at end of file
diff --git a/app/js/bootstrap.min.js b/app/js/bootstrap.min.js
deleted file mode 100644
index 95c5ac5..0000000
--- a/app/js/bootstrap.min.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/*!
-* Bootstrap.js by @fat & @mdo
-* Copyright 2012 Twitter, Inc.
-* http://www.apache.org/licenses/LICENSE-2.0.txt
-*/
-!function(e){"use strict";e(function(){e.support.transition=function(){var e=function(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},n;for(n in t)if(e.style[n]!==undefined)return t[n]}();return e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed").remove()}var n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()};var r=e.fn.alert;e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e.fn.alert.noConflict=function(){return e.fn.alert=r,this},e(document).on("click.alert.data-api",t,n.prototype.close)}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.closest('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")};var n=e.fn.button;e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e.fn.button.noConflict=function(){return e.fn.button=n,this},e(document).on("click.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.$indicators=this.$element.find(".carousel-indicators"),this.options=n,this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return t||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},getActiveIndex:function(){return this.$active=this.$element.find(".item.active"),this.$items=this.$active.parent().children(),this.$items.index(this.$active)},to:function(t){var n=this.getActiveIndex(),r=this;if(t>this.$items.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){r.to(t)}):n==t?this.pause().cycle():this.slide(t>n?"next":"prev",e(this.$items[t]))},pause:function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle(!0)),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this,f;this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u](),f=e.Event("slide",{relatedTarget:i[0],direction:o});if(i.hasClass("active"))return;this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid",function(){var t=e(a.$indicators.children()[a.getActiveIndex()]);t&&t.addClass("active")}));if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this}};var n=e.fn.carousel;e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("carousel"),s=e.extend({},e.fn.carousel.defaults,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.pause().cycle()})},e.fn.carousel.defaults={interval:5e3,pause:"hover"},e.fn.carousel.Constructor=t,e.fn.carousel.noConflict=function(){return e.fn.carousel=n,this},e(document).on("click.carousel.data-api","[data-slide], [data-slide-to]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=e.extend({},i.data(),n.data()),o;i.carousel(s),(o=n.attr("data-slide-to"))&&i.data("carousel").pause().to(o).cycle(),t.preventDefault()})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.collapse.defaults,n),this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.prototype={constructor:t,dimension:function(){var e=this.$element.hasClass("width");return e?"width":"height"},show:function(){var t,n,r,i;if(this.transitioning||this.$element.hasClass("in"))return;t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show"),"shown"),e.support.transition&&this.$element[t](this.$element[0][n])},hide:function(){var t;if(this.transitioning||!this.$element.hasClass("in"))return;t=this.dimension(),this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide"),"hidden"),this.$element[t](0)},reset:function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!==null?"addClass":"removeClass"]("collapse"),this},transition:function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}};var n=e.fn.collapse;e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=e.extend({},e.fn.collapse.defaults,r.data(),typeof n=="object"&&n);i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.defaults={toggle:!0},e.fn.collapse.Constructor=t,e.fn.collapse.noConflict=function(){return e.fn.collapse=n,this},e(document).on("click.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})}(window.jQuery),!function(e){"use strict";function r(){e(t).each(function(){i(e(this)).removeClass("open")})}function i(t){var n=t.attr("data-target"),r;n||(n=t.attr("href"),n=n&&/#/.test(n)&&n.replace(/.*(?=#[^\s]*$)/,"")),r=n&&e(n);if(!r||!r.length)r=t.parent();return r}var t="[data-toggle=dropdown]",n=function(t){var n=e(t).on("click.dropdown.data-api",this.toggle);e("html").on("click.dropdown.data-api",function(){n.parent().removeClass("open")})};n.prototype={constructor:n,toggle:function(t){var n=e(this),s,o;if(n.is(".disabled, :disabled"))return;return s=i(n),o=s.hasClass("open"),r(),o||s.toggleClass("open"),n.focus(),!1},keydown:function(n){var r,s,o,u,a,f;if(!/(38|40|27)/.test(n.keyCode))return;r=e(this),n.preventDefault(),n.stopPropagation();if(r.is(".disabled, :disabled"))return;u=i(r),a=u.hasClass("open");if(!a||a&&n.keyCode==27)return n.which==27&&u.find(t).focus(),r.click();s=e("[role=menu] li:not(.divider):visible a",u);if(!s.length)return;f=s.index(s.filter(":focus")),n.keyCode==38&&f>0&&f--,n.keyCode==40&&f<s.length-1&&f++,~f||(f=0),s.eq(f).focus()}};var s=e.fn.dropdown;e.fn.dropdown=function(t){return this.each(function(){var r=e(this),i=r.data("dropdown");i||r.data("dropdown",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.dropdown.Constructor=n,e.fn.dropdown.noConflict=function(){return e.fn.dropdown=s,this},e(document).on("click.dropdown.data-api",r).on("click.dropdown.data-api",".dropdown form",function(e){e.stopPropagation()}).on("click.dropdown-menu",function(e){e.stopPropagation()}).on("click.dropdown.data-api",t,n.prototype.toggle).on("keydown.dropdown.data-api",t+", [role=menu]",n.prototype.keydown)}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=n,this.$element=e(t).delegate('[data-dismiss="modal"]',"click.dismiss.modal",e.proxy(this.hide,this)),this.options.remote&&this.$element.find(".modal-body").load(this.options.remote)};t.prototype={constructor:t,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var t=this,n=e.Event("show");this.$element.trigger(n);if(this.isShown||n.isDefaultPrevented())return;this.isShown=!0,this.escape(),this.backdrop(function(){var n=e.support.transition&&t.$element.hasClass("fade");t.$element.parent().length||t.$element.appendTo(document.body),t.$element.show(),n&&t.$element[0].offsetWidth,t.$element.addClass("in").attr("aria-hidden",!1),t.enforceFocus(),n?t.$element.one(e.support.transition.end,function(){t.$element.focus().trigger("shown")}):t.$element.focus().trigger("shown")})},hide:function(t){t&&t.preventDefault();var n=this;t=e.Event("hide"),this.$element.trigger(t);if(!this.isShown||t.isDefaultPrevented())return;this.isShown=!1,this.escape(),e(document).off("focusin.modal"),this.$element.removeClass("in").attr("aria-hidden",!0),e.support.transition&&this.$element.hasClass("fade")?this.hideWithTransition():this.hideModal()},enforceFocus:function(){var t=this;e(document).on("focusin.modal",function(e){t.$element[0]!==e.target&&!t.$element.has(e.target).length&&t.$element.focus()})},escape:function(){var e=this;this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.modal",function(t){t.which==27&&e.hide()}):this.isShown||this.$element.off("keyup.dismiss.modal")},hideWithTransition:function(){var t=this,n=setTimeout(function(){t.$element.off(e.support.transition.end),t.hideModal()},500);this.$element.one(e.support.transition.end,function(){clearTimeout(n),t.hideModal()})},hideModal:function(){var e=this;this.$element.hide(),this.backdrop(function(){e.removeBackdrop(),e.$element.trigger("hidden")})},removeBackdrop:function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},backdrop:function(t){var n=this,r=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var i=e.support.transition&&r;this.$backdrop=e('<div class="modal-backdrop '+r+'" />').appendTo(document.body),this.$backdrop.click(this.options.backdrop=="static"?e.proxy(this.$element[0].focus,this.$element[0]):e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in");if(!t)return;i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,t):t()):t&&t()}};var n=e.fn.modal;e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("modal"),s=e.extend({},e.fn.modal.defaults,r.data(),typeof n=="object"&&n);i||r.data("modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},e.fn.modal.Constructor=t,e.fn.modal.noConflict=function(){return e.fn.modal=n,this},e(document).on("click.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})})}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("tooltip",e,t)};t.prototype={constructor:t,init:function(t,n,r){var i,s,o,u,a;this.type=t,this.$element=e(n),this.options=this.getOptions(r),this.enabled=!0,o=this.options.trigger.split(" ");for(a=o.length;a--;)u=o[a],u=="click"?this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this)):u!="manual"&&(i=u=="hover"?"mouseenter":"focus",s=u=="hover"?"mouseleave":"blur",this.$element.on(i+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(s+"."+this.type,this.options.selector,e.proxy(this.leave,this)));this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(t){return t=e.extend({},e.fn[this.type].defaults,this.$element.data(),t),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},enter:function(t){var n=e.fn[this.type].defaults,r={},i;this._options&&e.each(this._options,function(e,t){n[e]!=t&&(r[e]=t)},this),i=e(t.currentTarget)[this.type](r).data(this.type);if(!i.options.delay||!i.options.delay.show)return i.show();clearTimeout(this.timeout),i.hoverState="in",this.timeout=setTimeout(function(){i.hoverState=="in"&&i.show()},i.options.delay.show)},leave:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},show:function(){var t,n,r,i,s,o,u=e.Event("show");if(this.hasContent()&&this.enabled){this.$element.trigger(u);if(u.isDefaultPrevented())return;t=this.tip(),this.setContent(),this.options.animation&&t.addClass("fade"),s=typeof this.options.placement=="function"?this.options.placement.call(this,t[0],this.$element[0]):this.options.placement,t.detach().css({top:0,left:0,display:"block"}),this.options.container?t.appendTo(this.options.container):t.insertAfter(this.$element),n=this.getPosition(),r=t[0].offsetWidth,i=t[0].offsetHeight;switch(s){case"bottom":o={top:n.top+n.height,left:n.left+n.width/2-r/2};break;case"top":o={top:n.top-i,left:n.left+n.width/2-r/2};break;case"left":o={top:n.top+n.height/2-i/2,left:n.left-r};break;case"right":o={top:n.top+n.height/2-i/2,left:n.left+n.width}}this.applyPlacement(o,s),this.$element.trigger("shown")}},applyPlacement:function(e,t){var n=this.tip(),r=n[0].offsetWidth,i=n[0].offsetHeight,s,o,u,a;n.offset(e).addClass(t).addClass("in"),s=n[0].offsetWidth,o=n[0].offsetHeight,t=="top"&&o!=i&&(e.top=e.top+i-o,a=!0),t=="bottom"||t=="top"?(u=0,e.left<0&&(u=e.left*-2,e.left=0,n.offset(e),s=n[0].offsetWidth,o=n[0].offsetHeight),this.replaceArrow(u-r+s,s,"left")):this.replaceArrow(o-i,o,"top"),a&&n.offset(e)},replaceArrow:function(e,t,n){this.arrow().css(n,e?50*(1-e/t)+"%":"")},setContent:function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},hide:function(){function i(){var t=setTimeout(function(){n.off(e.support.transition.end).detach()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.detach()})}var t=this,n=this.tip(),r=e.Event("hide");this.$element.trigger(r);if(r.isDefaultPrevented())return;return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?i():n.detach(),this.$element.trigger("hidden"),this},fixTitle:function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").attr("title","")},hasContent:function(){return this.getTitle()},getPosition:function(){var t=this.$element[0];return e.extend({},typeof t.getBoundingClientRect=="function"?t.getBoundingClientRect():{width:t.offsetWidth,height:t.offsetHeight},this.$element.offset())},getTitle:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},tip:function(){return this.$tip=this.$tip||e(this.options.template)},arrow:function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(t){var n=t?e(t.currentTarget)[this.type](this._options).data(this.type):this;n.tip().hasClass("in")?n.hide():n.show()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}};var n=e.fn.tooltip;e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("tooltip"),s=typeof n=="object"&&n;i||r.data("tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},e.fn.tooltip.noConflict=function(){return e.fn.tooltip=n,this}}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype,{constructor:t,setContent:function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var e,t=this.$element,n=this.options;return e=(typeof n.content=="function"?n.content.call(t[0]):n.content)||t.attr("data-content"),e},tip:function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}});var n=e.fn.popover;e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("popover"),s=typeof n=="object"&&n;i||r.data("popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.defaults=e.extend({},e.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),e.fn.popover.noConflict=function(){return e.fn.popover=n,this}}(window.jQuery),!function(e){"use strict";function t(t,n){var r=e.proxy(this.process,this),i=e(t).is("body")?e(window):e(t),s;this.options=e.extend({},e.fn.scrollspy.defaults,n),this.$scrollElement=i.on("scroll.scroll-spy.data-api",r),this.selector=(this.options.target||(s=e(t).attr("href"))&&s.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=e("body"),this.refresh(),this.process()}t.prototype={constructor:t,refresh:function(){var t=this,n;this.offsets=e([]),this.targets=e([]),n=this.$body.find(this.selector).map(function(){var n=e(this),r=n.data("target")||n.attr("href"),i=/^#\w/.test(r)&&e(r);return i&&i.length&&[[i.position().top+(!e.isWindow(t.$scrollElement.get(0))&&t.$scrollElement.scrollTop()),r]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},process:function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},activate:function(t){var n,r;this.activeTarget=t,e(this.selector).parent(".active").removeClass("active"),r=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',n=e(r).parent("li").addClass("active"),n.parent(".dropdown-menu").length&&(n=n.closest("li.dropdown").addClass("active")),n.trigger("activate")}};var n=e.fn.scrollspy;e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("scrollspy"),s=typeof n=="object"&&n;i||r.data("scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.defaults={offset:10},e.fn.scrollspy.noConflict=function(){return e.fn.scrollspy=n,this},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype={constructor:t,show:function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target"),i,s,o;r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;i=n.find(".active:last a")[0],o=e.Event("show",{relatedTarget:i}),t.trigger(o);if(o.isDefaultPrevented())return;s=e(r),this.activate(t.parent("li"),n),this.activate(s,s.parent(),function(){t.trigger({type:"shown",relatedTarget:i})})},activate:function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")}};var n=e.fn.tab;e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("tab");i||r.data("tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e.fn.tab.noConflict=function(){return e.fn.tab=n,this},e(document).on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.source=this.options.source,this.$menu=e(this.options.menu),this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.position(),{height:this.$element[0].offsetHeight});return this.$menu.insertAfter(this.$element).css({top:t.top+t.height,left:t.left}).show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length<this.options.minLength?this.shown?this.hide():this:(n=e.isFunction(this.source)?this.source(this.query,e.proxy(this.process,this)):this.source,n?this.process(n):this)},process:function(t){var n=this;return t=e.grep(t,function(e){return n.matcher(e)}),t=this.sorter(t),t.length?this.render(t.slice(0,this.options.items)).show():this.shown?this.hide():this},matcher:function(e){return~e.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(e){var t=[],n=[],r=[],i;while(i=e.shift())i.toLowerCase().indexOf(this.query.toLowerCase())?~i.indexOf(this.query)?n.push(i):r.push(i):t.push(i);return t.concat(n,r)},highlighter:function(e){var t=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return e.replace(new RegExp("("+t+")","ig"),function(e,t){return"<strong>"+t+"</strong>"})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),t.first().addClass("active"),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("focus",e.proxy(this.focus,this)).on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),this.eventSupported("keydown")&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this)).on("mouseleave","li",e.proxy(this.mouseleave,this))},eventSupported:function(e){var t=e in this.$element;return t||(this.$element.setAttribute(e,"return;"),t=typeof this.$element[e]=="function"),t},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:case 16:case 17:case 18:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},focus:function(e){this.focused=!0},blur:function(e){this.focused=!1,!this.mousedover&&this.shown&&this.hide()},click:function(e){e.stopPropagation(),e.preventDefault(),this.select(),this.$element.focus()},mouseenter:function(t){this.mousedover=!0,this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")},mouseleave:function(e){this.mousedover=!1,!this.focused&&this.shown&&this.hide()}};var n=e.fn.typeahead;e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>',minLength:1},e.fn.typeahead.Constructor=t,e.fn.typeahead.noConflict=function(){return e.fn.typeahead=n,this},e(document).on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;n.typeahead(n.data())})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=e.extend({},e.fn.affix.defaults,n),this.$window=e(window).on("scroll.affix.data-api",e.proxy(this.checkPosition,this)).on("click.affix.data-api",e.proxy(function(){setTimeout(e.proxy(this.checkPosition,this),1)},this)),this.$element=e(t),this.checkPosition()};t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.bottom,o=i.top,u="affix affix-top affix-bottom",a;typeof i!="object"&&(s=o=i),typeof o=="function"&&(o=i.top()),typeof s=="function"&&(s=i.bottom()),a=this.unpin!=null&&n+this.unpin<=r.top?!1:s!=null&&r.top+this.$element.height()>=t-s?"bottom":o!=null&&n<=o?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))};var n=e.fn.affix;e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("affix"),s=typeof n=="object"&&n;i||r.data("affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.defaults={offset:0},e.fn.affix.noConflict=function(){return e.fn.affix=n,this},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery);
\ No newline at end of file
diff --git a/app/protected/.htaccess b/app/protected/.htaccess
deleted file mode 100644
index e019832..0000000
--- a/app/protected/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-deny from all
diff --git a/app/protected/config/assets.php b/app/protected/config/assets.php
deleted file mode 100644
index a3ba847..0000000
--- a/app/protected/config/assets.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-return array(
-	'app' => array(
-		'basePath' => '@wwwroot',
-		'baseUrl' => '@www',
-		'css' => array(
-			'css/bootstrap.min.css',
-			'css/bootstrap-responsive.min.css',
-			'css/site.css',
-		),
-		'js' => array(
-
-		),
-		'depends' => array(
-			'yii',
-		),
-	),
-);
diff --git a/app/protected/config/main.php b/app/protected/config/main.php
deleted file mode 100644
index 96e0986..0000000
--- a/app/protected/config/main.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-return array(
-	'id' => 'hello',
-	'basePath' => dirname(__DIR__),
-	'components' => array(
-		'cache' => array(
-			'class' => 'yii\caching\FileCache',
-		),
-		'user' => array(
-			'class' => 'yii\web\User',
-			'identityClass' => 'app\models\User',
-		),
-		'assetManager' => array(
-			'bundles' => require(__DIR__ . '/assets.php'),
-		),
-	),
-	'params' => array(
-		'adminEmail' => 'admin@example.com',
-	),
-);
diff --git a/app/protected/controllers/SiteController.php b/app/protected/controllers/SiteController.php
deleted file mode 100644
index d1186f6..0000000
--- a/app/protected/controllers/SiteController.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-use yii\web\Controller;
-use app\models\LoginForm;
-use app\models\ContactForm;
-
-class SiteController extends Controller
-{
-	public function actionIndex()
-	{
-		echo $this->render('index');
-	}
-
-	public function actionLogin()
-	{
-		$model = new LoginForm();
-		if ($this->populate($_POST, $model) && $model->login()) {
-			Yii::$app->response->redirect(array('site/index'));
-		} else {
-			echo $this->render('login', array(
-				'model' => $model,
-			));
-		}
-	}
-
-	public function actionLogout()
-	{
-		Yii::$app->getUser()->logout();
-		Yii::$app->getResponse()->redirect(array('site/index'));
-	}
-
-	public function actionContact()
-	{
-		$model = new ContactForm;
-		if ($this->populate($_POST, $model) && $model->contact(Yii::$app->params['adminEmail'])) {
-			Yii::$app->session->setFlash('contactFormSubmitted');
-			Yii::$app->response->refresh();
-		} else {
-			echo $this->render('contact', array(
-				'model' => $model,
-			));
-		}
-	}
-
-	public function actionAbout()
-	{
-		echo $this->render('about');
-	}
-}
diff --git a/app/protected/models/ContactForm.php b/app/protected/models/ContactForm.php
deleted file mode 100644
index 5124b2c..0000000
--- a/app/protected/models/ContactForm.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-namespace app\models;
-
-use yii\base\Model;
-
-/**
- * ContactForm is the model behind the contact form.
- */
-class ContactForm extends Model
-{
-	public $name;
-	public $email;
-	public $subject;
-	public $body;
-	public $verifyCode;
-
-	/**
-	 * @return array the validation rules.
-	 */
-	public function rules()
-	{
-		return array(
-			// name, email, subject and body are required
-			array('name, email, subject, body', 'required'),
-			// email has to be a valid email address
-			array('email', 'email'),
-			// verifyCode needs to be entered correctly
-			//array('verifyCode', 'captcha', 'allowEmpty' => !Captcha::checkRequirements()),
-		);
-	}
-
-	/**
-	 * @return array customized attribute labels
-	 */
-	public function attributeLabels()
-	{
-		return array(
-			'verifyCode' => 'Verification Code',
-		);
-	}
-
-	/**
-	 * Sends an email to the specified email address using the information collected by this model.
-	 * @param string $email the target email address
-	 * @return boolean whether the model passes validation
-	 */
-	public function contact($email)
-	{
-		if ($this->validate()) {
-			$name = '=?UTF-8?B?' . base64_encode($this->name) . '?=';
-			$subject = '=?UTF-8?B?' . base64_encode($this->subject) . '?=';
-			$headers = "From: $name <{$this->email}>\r\n" .
-				"Reply-To: {$this->email}\r\n" .
-				"MIME-Version: 1.0\r\n" .
-				"Content-type: text/plain; charset=UTF-8";
-			mail($email, $subject, $this->body, $headers);
-			return true;
-		} else {
-			return false;
-		}
-	}
-}
diff --git a/app/protected/models/LoginForm.php b/app/protected/models/LoginForm.php
deleted file mode 100644
index 5ba1dc6..0000000
--- a/app/protected/models/LoginForm.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace app\models;
-
-use Yii;
-use yii\base\Model;
-
-/**
- * LoginForm is the model behind the login form.
- */
-class LoginForm extends Model
-{
-	public $username;
-	public $password;
-	public $rememberMe = true;
-
-	/**
-	 * @return array the validation rules.
-	 */
-	public function rules()
-	{
-		return array(
-			// username and password are both required
-			array('username, password', 'required'),
-			// password is validated by validatePassword()
-			array('password', 'validatePassword'),
-			// rememberMe must be a boolean value
-			array('rememberMe', 'boolean'),
-		);
-	}
-
-	/**
-	 * Validates the password.
-	 * This method serves as the inline validation for password.
-	 */
-	public function validatePassword()
-	{
-		$user = User::findByUsername($this->username);
-		if (!$user || !$user->validatePassword($this->password)) {
-			$this->addError('password', 'Incorrect username or password.');
-		}
-	}
-
-	/**
-	 * Logs in a user using the provided username and password.
-	 * @return boolean whether the user is logged in successfully
-	 */
-	public function login()
-	{
-		if ($this->validate()) {
-			$user = User::findByUsername($this->username);
-			Yii::$app->user->login($user, $this->rememberMe ? 3600*24*30 : 0);
-			return true;
-		} else {
-			return false;
-		}
-	}
-}
diff --git a/app/protected/models/User.php b/app/protected/models/User.php
deleted file mode 100644
index afbf9f8..0000000
--- a/app/protected/models/User.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace app\models;
-
-class User extends \yii\base\Object implements \yii\web\Identity
-{
-	public $id;
-	public $username;
-	public $password;
-	public $authKey;
-
-	private static $users = array(
-		'100' => array(
-			'id' => '100',
-			'username' => 'admin',
-			'password' => 'admin',
-			'authKey' => 'test100key',
-		),
-		'101' => array(
-			'id' => '101',
-			'username' => 'demo',
-			'password' => 'demo',
-			'authKey' => 'test101key',
-		),
-	);
-
-	public static function findIdentity($id)
-	{
-		return isset(self::$users[$id]) ? new self(self::$users[$id]) : null;
-	}
-
-	public static function findByUsername($username)
-	{
-		foreach (self::$users as $user) {
-			if (strcasecmp($user['username'], $username) === 0) {
-				return new self($user);
-			}
-		}
-		return null;
-	}
-
-	public function getId()
-	{
-		return $this->id;
-	}
-
-	public function getAuthKey()
-	{
-		return $this->authKey;
-	}
-
-	public function validateAuthKey($authKey)
-	{
-		return $this->authKey === $authKey;
-	}
-
-	public function validatePassword($password)
-	{
-		return $this->password === $password;
-	}
-}
diff --git a/app/protected/runtime/.gitignore b/app/protected/runtime/.gitignore
deleted file mode 100644
index 72e8ffc..0000000
--- a/app/protected/runtime/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*
diff --git a/app/protected/views/layouts/main.php b/app/protected/views/layouts/main.php
deleted file mode 100644
index 8fb915a..0000000
--- a/app/protected/views/layouts/main.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * @var $this \yii\base\View
- * @var $content string
- */
-use yii\helpers\Html;
-$this->registerAssetBundle('app');
-?>
-<?php $this->beginPage(); ?>
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset="utf-8"/>
-	<title><?php echo Html::encode($this->title); ?></title>
-	<?php $this->head(); ?>
-</head>
-<body>
-<div class="container">
-	<?php $this->beginBody(); ?>
-	<div class="masthead">
-		<h3 class="muted">My Company</h3>
-
-		<div class="navbar">
-			<div class="navbar-inner">
-				<div class="container">
-					<ul class="nav">
-						<li><?php echo Html::a('Home', Yii::$app->homeUrl); ?></li>
-						<li><?php echo Html::a('About', array('/site/about')); ?></li>
-						<li><?php echo Html::a('Contact', array('/site/contact')); ?></li>
-						<?php if (Yii::$app->user->isGuest): ?>
-						<li><?php echo Html::a('Login', array('/site/login')); ?></li>
-						<?php else: ?>
-						<li><?php echo Html::a('Logout (' . Html::encode(Yii::$app->user->identity->username) . ')', array('/site/logout')); ?></li>
-						<?php endif; ?>
-					</ul>
-				</div>
-			</div>
-		</div>
-		<!-- /.navbar -->
-	</div>
-
-	<?php echo $content; ?>
-
-	<hr>
-
-	<div class="footer">
-		<p>&copy; My Company <?php echo date('Y'); ?></p>
-		<p>
-			<?php echo Yii::powered(); ?>
-			Template by <a href="http://twitter.github.io/bootstrap/">Twitter Bootstrap</a>
-		</p>
-	</div>
-	<?php $this->endBody(); ?>
-</div>
-</body>
-</html>
-<?php $this->endPage(); ?>
diff --git a/app/protected/views/site/about.php b/app/protected/views/site/about.php
deleted file mode 100644
index 7ebc5d5..0000000
--- a/app/protected/views/site/about.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-use yii\helpers\Html;
-/**
- * @var yii\base\View $this
- */
-$this->title = 'About';
-?>
-<h1><?php echo Html::encode($this->title); ?></h1>
-
-<p>
-	This is the About page. You may modify the following file to customize its content:
-</p>
-
-<code><?php echo __FILE__; ?></code>
-
diff --git a/app/protected/views/site/contact.php b/app/protected/views/site/contact.php
deleted file mode 100644
index 4ca40f1..0000000
--- a/app/protected/views/site/contact.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-use yii\helpers\Html;
-/**
- * @var yii\base\View $this
- * @var yii\widgets\ActiveForm $form
- * @var app\models\ContactForm $model
- */
-$this->title = 'Contact';
-?>
-<h1><?php echo Html::encode($this->title); ?></h1>
-
-<?php if(Yii::$app->session->hasFlash('contactFormSubmitted')): ?>
-<div class="alert alert-success">
-	Thank you for contacting us. We will respond to you as soon as possible.
-</div>
-<?php return; endif; ?>
-
-<p>
-	If you have business inquiries or other questions, please fill out the following form to contact us. Thank you.
-</p>
-
-<?php $form = $this->beginWidget('yii\widgets\ActiveForm', array(
-	'options' => array('class' => 'form-horizontal'),
-	'fieldConfig' => array('inputOptions' => array('class' => 'input-xlarge')),
-)); ?>
-	<?php echo $form->field($model, 'name')->textInput(); ?>
-	<?php echo $form->field($model, 'email')->textInput(); ?>
-	<?php echo $form->field($model, 'subject')->textInput(); ?>
-	<?php echo $form->field($model, 'body')->textArea(array('rows' => 6)); ?>
-	<div class="form-actions">
-		<?php echo Html::submitButton('Submit', null, null, array('class' => 'btn btn-primary')); ?>
-	</div>
-<?php $this->endWidget(); ?>
diff --git a/app/protected/views/site/index.php b/app/protected/views/site/index.php
deleted file mode 100644
index 158b61c..0000000
--- a/app/protected/views/site/index.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * @var yii\base\View $this
- */
-$this->title = 'Welcome';
-?>
-<div class="jumbotron">
-	<h1>Welcome!</h1>
-
-	<p class="lead">Cras justo odio, dapibus ac facilisis in, egestas eget quam. Fusce dapibus, tellus ac cursus
-		commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
-	<a class="btn btn-large btn-success" href="http://www.yiiframework.com">Get started with Yii</a>
-</div>
-
-<hr>
-
-<!-- Example row of columns -->
-<div class="row-fluid">
-	<div class="span4">
-		<h2>Heading</h2>
-
-		<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris
-			condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod.
-			Donec sed odio dui. </p>
-
-		<p><a class="btn" href="#">View details &raquo;</a></p>
-	</div>
-	<div class="span4">
-		<h2>Heading</h2>
-
-		<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris
-			condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod.
-			Donec sed odio dui. </p>
-
-		<p><a class="btn" href="#">View details &raquo;</a></p>
-	</div>
-	<div class="span4">
-		<h2>Heading</h2>
-
-		<p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta
-			felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum
-			massa.</p>
-
-		<p><a class="btn" href="#">View details &raquo;</a></p>
-	</div>
-</div>
-
diff --git a/app/protected/views/site/login.php b/app/protected/views/site/login.php
deleted file mode 100644
index 8672eeb..0000000
--- a/app/protected/views/site/login.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-use yii\helpers\Html;
-/**
- * @var yii\base\View $this
- * @var yii\widgets\ActiveForm $form
- * @var app\models\LoginForm $model
- */
-$this->title = 'Login';
-?>
-<h1><?php echo Html::encode($this->title); ?></h1>
-
-<p>Please fill out the following fields to login:</p>
-
-<?php $form = $this->beginWidget('yii\widgets\ActiveForm', array('options' => array('class' => 'form-horizontal'))); ?>
-	<?php echo $form->field($model, 'username')->textInput(); ?>
-	<?php echo $form->field($model, 'password')->passwordInput(); ?>
-	<?php echo $form->field($model, 'rememberMe')->checkbox(); ?>
-	<div class="form-actions">
-		<?php echo Html::submitButton('Login', null, null, array('class' => 'btn btn-primary')); ?>
-	</div>
-<?php $this->endWidget(); ?>
diff --git a/apps/bootstrap/assets/.gitignore b/apps/bootstrap/assets/.gitignore
new file mode 100644
index 0000000..72e8ffc
--- /dev/null
+++ b/apps/bootstrap/assets/.gitignore
@@ -0,0 +1 @@
+*
diff --git a/apps/bootstrap/css/bootstrap-responsive.css b/apps/bootstrap/css/bootstrap-responsive.css
new file mode 100644
index 0000000..fcd72f7
--- /dev/null
+++ b/apps/bootstrap/css/bootstrap-responsive.css
@@ -0,0 +1,1109 @@
+/*!
+ * Bootstrap Responsive v2.3.1
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+
+.clearfix {
+  *zoom: 1;
+}
+
+.clearfix:before,
+.clearfix:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.clearfix:after {
+  clear: both;
+}
+
+.hide-text {
+  font: 0/0 a;
+  color: transparent;
+  text-shadow: none;
+  background-color: transparent;
+  border: 0;
+}
+
+.input-block-level {
+  display: block;
+  width: 100%;
+  min-height: 30px;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+@-ms-viewport {
+  width: device-width;
+}
+
+.hidden {
+  display: none;
+  visibility: hidden;
+}
+
+.visible-phone {
+  display: none !important;
+}
+
+.visible-tablet {
+  display: none !important;
+}
+
+.hidden-desktop {
+  display: none !important;
+}
+
+.visible-desktop {
+  display: inherit !important;
+}
+
+@media (min-width: 768px) and (max-width: 979px) {
+  .hidden-desktop {
+    display: inherit !important;
+  }
+  .visible-desktop {
+    display: none !important ;
+  }
+  .visible-tablet {
+    display: inherit !important;
+  }
+  .hidden-tablet {
+    display: none !important;
+  }
+}
+
+@media (max-width: 767px) {
+  .hidden-desktop {
+    display: inherit !important;
+  }
+  .visible-desktop {
+    display: none !important;
+  }
+  .visible-phone {
+    display: inherit !important;
+  }
+  .hidden-phone {
+    display: none !important;
+  }
+}
+
+.visible-print {
+  display: none !important;
+}
+
+@media print {
+  .visible-print {
+    display: inherit !important;
+  }
+  .hidden-print {
+    display: none !important;
+  }
+}
+
+@media (min-width: 1200px) {
+  .row {
+    margin-left: -30px;
+    *zoom: 1;
+  }
+  .row:before,
+  .row:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row:after {
+    clear: both;
+  }
+  [class*="span"] {
+    float: left;
+    min-height: 1px;
+    margin-left: 30px;
+  }
+  .container,
+  .navbar-static-top .container,
+  .navbar-fixed-top .container,
+  .navbar-fixed-bottom .container {
+    width: 1170px;
+  }
+  .span12 {
+    width: 1170px;
+  }
+  .span11 {
+    width: 1070px;
+  }
+  .span10 {
+    width: 970px;
+  }
+  .span9 {
+    width: 870px;
+  }
+  .span8 {
+    width: 770px;
+  }
+  .span7 {
+    width: 670px;
+  }
+  .span6 {
+    width: 570px;
+  }
+  .span5 {
+    width: 470px;
+  }
+  .span4 {
+    width: 370px;
+  }
+  .span3 {
+    width: 270px;
+  }
+  .span2 {
+    width: 170px;
+  }
+  .span1 {
+    width: 70px;
+  }
+  .offset12 {
+    margin-left: 1230px;
+  }
+  .offset11 {
+    margin-left: 1130px;
+  }
+  .offset10 {
+    margin-left: 1030px;
+  }
+  .offset9 {
+    margin-left: 930px;
+  }
+  .offset8 {
+    margin-left: 830px;
+  }
+  .offset7 {
+    margin-left: 730px;
+  }
+  .offset6 {
+    margin-left: 630px;
+  }
+  .offset5 {
+    margin-left: 530px;
+  }
+  .offset4 {
+    margin-left: 430px;
+  }
+  .offset3 {
+    margin-left: 330px;
+  }
+  .offset2 {
+    margin-left: 230px;
+  }
+  .offset1 {
+    margin-left: 130px;
+  }
+  .row-fluid {
+    width: 100%;
+    *zoom: 1;
+  }
+  .row-fluid:before,
+  .row-fluid:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row-fluid:after {
+    clear: both;
+  }
+  .row-fluid [class*="span"] {
+    display: block;
+    float: left;
+    width: 100%;
+    min-height: 30px;
+    margin-left: 2.564102564102564%;
+    *margin-left: 2.5109110747408616%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .row-fluid [class*="span"]:first-child {
+    margin-left: 0;
+  }
+  .row-fluid .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 2.564102564102564%;
+  }
+  .row-fluid .span12 {
+    width: 100%;
+    *width: 99.94680851063829%;
+  }
+  .row-fluid .span11 {
+    width: 91.45299145299145%;
+    *width: 91.39979996362975%;
+  }
+  .row-fluid .span10 {
+    width: 82.90598290598291%;
+    *width: 82.8527914166212%;
+  }
+  .row-fluid .span9 {
+    width: 74.35897435897436%;
+    *width: 74.30578286961266%;
+  }
+  .row-fluid .span8 {
+    width: 65.81196581196582%;
+    *width: 65.75877432260411%;
+  }
+  .row-fluid .span7 {
+    width: 57.26495726495726%;
+    *width: 57.21176577559556%;
+  }
+  .row-fluid .span6 {
+    width: 48.717948717948715%;
+    *width: 48.664757228587014%;
+  }
+  .row-fluid .span5 {
+    width: 40.17094017094017%;
+    *width: 40.11774868157847%;
+  }
+  .row-fluid .span4 {
+    width: 31.623931623931625%;
+    *width: 31.570740134569924%;
+  }
+  .row-fluid .span3 {
+    width: 23.076923076923077%;
+    *width: 23.023731587561375%;
+  }
+  .row-fluid .span2 {
+    width: 14.52991452991453%;
+    *width: 14.476723040552828%;
+  }
+  .row-fluid .span1 {
+    width: 5.982905982905983%;
+    *width: 5.929714493544281%;
+  }
+  .row-fluid .offset12 {
+    margin-left: 105.12820512820512%;
+    *margin-left: 105.02182214948171%;
+  }
+  .row-fluid .offset12:first-child {
+    margin-left: 102.56410256410257%;
+    *margin-left: 102.45771958537915%;
+  }
+  .row-fluid .offset11 {
+    margin-left: 96.58119658119658%;
+    *margin-left: 96.47481360247316%;
+  }
+  .row-fluid .offset11:first-child {
+    margin-left: 94.01709401709402%;
+    *margin-left: 93.91071103837061%;
+  }
+  .row-fluid .offset10 {
+    margin-left: 88.03418803418803%;
+    *margin-left: 87.92780505546462%;
+  }
+  .row-fluid .offset10:first-child {
+    margin-left: 85.47008547008548%;
+    *margin-left: 85.36370249136206%;
+  }
+  .row-fluid .offset9 {
+    margin-left: 79.48717948717949%;
+    *margin-left: 79.38079650845607%;
+  }
+  .row-fluid .offset9:first-child {
+    margin-left: 76.92307692307693%;
+    *margin-left: 76.81669394435352%;
+  }
+  .row-fluid .offset8 {
+    margin-left: 70.94017094017094%;
+    *margin-left: 70.83378796144753%;
+  }
+  .row-fluid .offset8:first-child {
+    margin-left: 68.37606837606839%;
+    *margin-left: 68.26968539734497%;
+  }
+  .row-fluid .offset7 {
+    margin-left: 62.393162393162385%;
+    *margin-left: 62.28677941443899%;
+  }
+  .row-fluid .offset7:first-child {
+    margin-left: 59.82905982905982%;
+    *margin-left: 59.72267685033642%;
+  }
+  .row-fluid .offset6 {
+    margin-left: 53.84615384615384%;
+    *margin-left: 53.739770867430444%;
+  }
+  .row-fluid .offset6:first-child {
+    margin-left: 51.28205128205128%;
+    *margin-left: 51.175668303327875%;
+  }
+  .row-fluid .offset5 {
+    margin-left: 45.299145299145295%;
+    *margin-left: 45.1927623204219%;
+  }
+  .row-fluid .offset5:first-child {
+    margin-left: 42.73504273504273%;
+    *margin-left: 42.62865975631933%;
+  }
+  .row-fluid .offset4 {
+    margin-left: 36.75213675213675%;
+    *margin-left: 36.645753773413354%;
+  }
+  .row-fluid .offset4:first-child {
+    margin-left: 34.18803418803419%;
+    *margin-left: 34.081651209310785%;
+  }
+  .row-fluid .offset3 {
+    margin-left: 28.205128205128204%;
+    *margin-left: 28.0987452264048%;
+  }
+  .row-fluid .offset3:first-child {
+    margin-left: 25.641025641025642%;
+    *margin-left: 25.53464266230224%;
+  }
+  .row-fluid .offset2 {
+    margin-left: 19.65811965811966%;
+    *margin-left: 19.551736679396257%;
+  }
+  .row-fluid .offset2:first-child {
+    margin-left: 17.094017094017094%;
+    *margin-left: 16.98763411529369%;
+  }
+  .row-fluid .offset1 {
+    margin-left: 11.11111111111111%;
+    *margin-left: 11.004728132387708%;
+  }
+  .row-fluid .offset1:first-child {
+    margin-left: 8.547008547008547%;
+    *margin-left: 8.440625568285142%;
+  }
+  input,
+  textarea,
+  .uneditable-input {
+    margin-left: 0;
+  }
+  .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 30px;
+  }
+  input.span12,
+  textarea.span12,
+  .uneditable-input.span12 {
+    width: 1156px;
+  }
+  input.span11,
+  textarea.span11,
+  .uneditable-input.span11 {
+    width: 1056px;
+  }
+  input.span10,
+  textarea.span10,
+  .uneditable-input.span10 {
+    width: 956px;
+  }
+  input.span9,
+  textarea.span9,
+  .uneditable-input.span9 {
+    width: 856px;
+  }
+  input.span8,
+  textarea.span8,
+  .uneditable-input.span8 {
+    width: 756px;
+  }
+  input.span7,
+  textarea.span7,
+  .uneditable-input.span7 {
+    width: 656px;
+  }
+  input.span6,
+  textarea.span6,
+  .uneditable-input.span6 {
+    width: 556px;
+  }
+  input.span5,
+  textarea.span5,
+  .uneditable-input.span5 {
+    width: 456px;
+  }
+  input.span4,
+  textarea.span4,
+  .uneditable-input.span4 {
+    width: 356px;
+  }
+  input.span3,
+  textarea.span3,
+  .uneditable-input.span3 {
+    width: 256px;
+  }
+  input.span2,
+  textarea.span2,
+  .uneditable-input.span2 {
+    width: 156px;
+  }
+  input.span1,
+  textarea.span1,
+  .uneditable-input.span1 {
+    width: 56px;
+  }
+  .thumbnails {
+    margin-left: -30px;
+  }
+  .thumbnails > li {
+    margin-left: 30px;
+  }
+  .row-fluid .thumbnails {
+    margin-left: 0;
+  }
+}
+
+@media (min-width: 768px) and (max-width: 979px) {
+  .row {
+    margin-left: -20px;
+    *zoom: 1;
+  }
+  .row:before,
+  .row:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row:after {
+    clear: both;
+  }
+  [class*="span"] {
+    float: left;
+    min-height: 1px;
+    margin-left: 20px;
+  }
+  .container,
+  .navbar-static-top .container,
+  .navbar-fixed-top .container,
+  .navbar-fixed-bottom .container {
+    width: 724px;
+  }
+  .span12 {
+    width: 724px;
+  }
+  .span11 {
+    width: 662px;
+  }
+  .span10 {
+    width: 600px;
+  }
+  .span9 {
+    width: 538px;
+  }
+  .span8 {
+    width: 476px;
+  }
+  .span7 {
+    width: 414px;
+  }
+  .span6 {
+    width: 352px;
+  }
+  .span5 {
+    width: 290px;
+  }
+  .span4 {
+    width: 228px;
+  }
+  .span3 {
+    width: 166px;
+  }
+  .span2 {
+    width: 104px;
+  }
+  .span1 {
+    width: 42px;
+  }
+  .offset12 {
+    margin-left: 764px;
+  }
+  .offset11 {
+    margin-left: 702px;
+  }
+  .offset10 {
+    margin-left: 640px;
+  }
+  .offset9 {
+    margin-left: 578px;
+  }
+  .offset8 {
+    margin-left: 516px;
+  }
+  .offset7 {
+    margin-left: 454px;
+  }
+  .offset6 {
+    margin-left: 392px;
+  }
+  .offset5 {
+    margin-left: 330px;
+  }
+  .offset4 {
+    margin-left: 268px;
+  }
+  .offset3 {
+    margin-left: 206px;
+  }
+  .offset2 {
+    margin-left: 144px;
+  }
+  .offset1 {
+    margin-left: 82px;
+  }
+  .row-fluid {
+    width: 100%;
+    *zoom: 1;
+  }
+  .row-fluid:before,
+  .row-fluid:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row-fluid:after {
+    clear: both;
+  }
+  .row-fluid [class*="span"] {
+    display: block;
+    float: left;
+    width: 100%;
+    min-height: 30px;
+    margin-left: 2.7624309392265194%;
+    *margin-left: 2.709239449864817%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .row-fluid [class*="span"]:first-child {
+    margin-left: 0;
+  }
+  .row-fluid .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 2.7624309392265194%;
+  }
+  .row-fluid .span12 {
+    width: 100%;
+    *width: 99.94680851063829%;
+  }
+  .row-fluid .span11 {
+    width: 91.43646408839778%;
+    *width: 91.38327259903608%;
+  }
+  .row-fluid .span10 {
+    width: 82.87292817679558%;
+    *width: 82.81973668743387%;
+  }
+  .row-fluid .span9 {
+    width: 74.30939226519337%;
+    *width: 74.25620077583166%;
+  }
+  .row-fluid .span8 {
+    width: 65.74585635359117%;
+    *width: 65.69266486422946%;
+  }
+  .row-fluid .span7 {
+    width: 57.18232044198895%;
+    *width: 57.12912895262725%;
+  }
+  .row-fluid .span6 {
+    width: 48.61878453038674%;
+    *width: 48.56559304102504%;
+  }
+  .row-fluid .span5 {
+    width: 40.05524861878453%;
+    *width: 40.00205712942283%;
+  }
+  .row-fluid .span4 {
+    width: 31.491712707182323%;
+    *width: 31.43852121782062%;
+  }
+  .row-fluid .span3 {
+    width: 22.92817679558011%;
+    *width: 22.87498530621841%;
+  }
+  .row-fluid .span2 {
+    width: 14.3646408839779%;
+    *width: 14.311449394616199%;
+  }
+  .row-fluid .span1 {
+    width: 5.801104972375691%;
+    *width: 5.747913483013988%;
+  }
+  .row-fluid .offset12 {
+    margin-left: 105.52486187845304%;
+    *margin-left: 105.41847889972962%;
+  }
+  .row-fluid .offset12:first-child {
+    margin-left: 102.76243093922652%;
+    *margin-left: 102.6560479605031%;
+  }
+  .row-fluid .offset11 {
+    margin-left: 96.96132596685082%;
+    *margin-left: 96.8549429881274%;
+  }
+  .row-fluid .offset11:first-child {
+    margin-left: 94.1988950276243%;
+    *margin-left: 94.09251204890089%;
+  }
+  .row-fluid .offset10 {
+    margin-left: 88.39779005524862%;
+    *margin-left: 88.2914070765252%;
+  }
+  .row-fluid .offset10:first-child {
+    margin-left: 85.6353591160221%;
+    *margin-left: 85.52897613729868%;
+  }
+  .row-fluid .offset9 {
+    margin-left: 79.8342541436464%;
+    *margin-left: 79.72787116492299%;
+  }
+  .row-fluid .offset9:first-child {
+    margin-left: 77.07182320441989%;
+    *margin-left: 76.96544022569647%;
+  }
+  .row-fluid .offset8 {
+    margin-left: 71.2707182320442%;
+    *margin-left: 71.16433525332079%;
+  }
+  .row-fluid .offset8:first-child {
+    margin-left: 68.50828729281768%;
+    *margin-left: 68.40190431409427%;
+  }
+  .row-fluid .offset7 {
+    margin-left: 62.70718232044199%;
+    *margin-left: 62.600799341718584%;
+  }
+  .row-fluid .offset7:first-child {
+    margin-left: 59.94475138121547%;
+    *margin-left: 59.838368402492065%;
+  }
+  .row-fluid .offset6 {
+    margin-left: 54.14364640883978%;
+    *margin-left: 54.037263430116376%;
+  }
+  .row-fluid .offset6:first-child {
+    margin-left: 51.38121546961326%;
+    *margin-left: 51.27483249088986%;
+  }
+  .row-fluid .offset5 {
+    margin-left: 45.58011049723757%;
+    *margin-left: 45.47372751851417%;
+  }
+  .row-fluid .offset5:first-child {
+    margin-left: 42.81767955801105%;
+    *margin-left: 42.71129657928765%;
+  }
+  .row-fluid .offset4 {
+    margin-left: 37.01657458563536%;
+    *margin-left: 36.91019160691196%;
+  }
+  .row-fluid .offset4:first-child {
+    margin-left: 34.25414364640884%;
+    *margin-left: 34.14776066768544%;
+  }
+  .row-fluid .offset3 {
+    margin-left: 28.45303867403315%;
+    *margin-left: 28.346655695309746%;
+  }
+  .row-fluid .offset3:first-child {
+    margin-left: 25.69060773480663%;
+    *margin-left: 25.584224756083227%;
+  }
+  .row-fluid .offset2 {
+    margin-left: 19.88950276243094%;
+    *margin-left: 19.783119783707537%;
+  }
+  .row-fluid .offset2:first-child {
+    margin-left: 17.12707182320442%;
+    *margin-left: 17.02068884448102%;
+  }
+  .row-fluid .offset1 {
+    margin-left: 11.32596685082873%;
+    *margin-left: 11.219583872105325%;
+  }
+  .row-fluid .offset1:first-child {
+    margin-left: 8.56353591160221%;
+    *margin-left: 8.457152932878806%;
+  }
+  input,
+  textarea,
+  .uneditable-input {
+    margin-left: 0;
+  }
+  .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 20px;
+  }
+  input.span12,
+  textarea.span12,
+  .uneditable-input.span12 {
+    width: 710px;
+  }
+  input.span11,
+  textarea.span11,
+  .uneditable-input.span11 {
+    width: 648px;
+  }
+  input.span10,
+  textarea.span10,
+  .uneditable-input.span10 {
+    width: 586px;
+  }
+  input.span9,
+  textarea.span9,
+  .uneditable-input.span9 {
+    width: 524px;
+  }
+  input.span8,
+  textarea.span8,
+  .uneditable-input.span8 {
+    width: 462px;
+  }
+  input.span7,
+  textarea.span7,
+  .uneditable-input.span7 {
+    width: 400px;
+  }
+  input.span6,
+  textarea.span6,
+  .uneditable-input.span6 {
+    width: 338px;
+  }
+  input.span5,
+  textarea.span5,
+  .uneditable-input.span5 {
+    width: 276px;
+  }
+  input.span4,
+  textarea.span4,
+  .uneditable-input.span4 {
+    width: 214px;
+  }
+  input.span3,
+  textarea.span3,
+  .uneditable-input.span3 {
+    width: 152px;
+  }
+  input.span2,
+  textarea.span2,
+  .uneditable-input.span2 {
+    width: 90px;
+  }
+  input.span1,
+  textarea.span1,
+  .uneditable-input.span1 {
+    width: 28px;
+  }
+}
+
+@media (max-width: 767px) {
+  body {
+    padding-right: 20px;
+    padding-left: 20px;
+  }
+  .navbar-fixed-top,
+  .navbar-fixed-bottom,
+  .navbar-static-top {
+    margin-right: -20px;
+    margin-left: -20px;
+  }
+  .container-fluid {
+    padding: 0;
+  }
+  .dl-horizontal dt {
+    float: none;
+    width: auto;
+    clear: none;
+    text-align: left;
+  }
+  .dl-horizontal dd {
+    margin-left: 0;
+  }
+  .container {
+    width: auto;
+  }
+  .row-fluid {
+    width: 100%;
+  }
+  .row,
+  .thumbnails {
+    margin-left: 0;
+  }
+  .thumbnails > li {
+    float: none;
+    margin-left: 0;
+  }
+  [class*="span"],
+  .uneditable-input[class*="span"],
+  .row-fluid [class*="span"] {
+    display: block;
+    float: none;
+    width: 100%;
+    margin-left: 0;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .span12,
+  .row-fluid .span12 {
+    width: 100%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .row-fluid [class*="offset"]:first-child {
+    margin-left: 0;
+  }
+  .input-large,
+  .input-xlarge,
+  .input-xxlarge,
+  input[class*="span"],
+  select[class*="span"],
+  textarea[class*="span"],
+  .uneditable-input {
+    display: block;
+    width: 100%;
+    min-height: 30px;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .input-prepend input,
+  .input-append input,
+  .input-prepend input[class*="span"],
+  .input-append input[class*="span"] {
+    display: inline-block;
+    width: auto;
+  }
+  .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 0;
+  }
+  .modal {
+    position: fixed;
+    top: 20px;
+    right: 20px;
+    left: 20px;
+    width: auto;
+    margin: 0;
+  }
+  .modal.fade {
+    top: -100px;
+  }
+  .modal.fade.in {
+    top: 20px;
+  }
+}
+
+@media (max-width: 480px) {
+  .nav-collapse {
+    -webkit-transform: translate3d(0, 0, 0);
+  }
+  .page-header h1 small {
+    display: block;
+    line-height: 20px;
+  }
+  input[type="checkbox"],
+  input[type="radio"] {
+    border: 1px solid #ccc;
+  }
+  .form-horizontal .control-label {
+    float: none;
+    width: auto;
+    padding-top: 0;
+    text-align: left;
+  }
+  .form-horizontal .controls {
+    margin-left: 0;
+  }
+  .form-horizontal .control-list {
+    padding-top: 0;
+  }
+  .form-horizontal .form-actions {
+    padding-right: 10px;
+    padding-left: 10px;
+  }
+  .media .pull-left,
+  .media .pull-right {
+    display: block;
+    float: none;
+    margin-bottom: 10px;
+  }
+  .media-object {
+    margin-right: 0;
+    margin-left: 0;
+  }
+  .modal {
+    top: 10px;
+    right: 10px;
+    left: 10px;
+  }
+  .modal-header .close {
+    padding: 10px;
+    margin: -10px;
+  }
+  .carousel-caption {
+    position: static;
+  }
+}
+
+@media (max-width: 979px) {
+  body {
+    padding-top: 0;
+  }
+  .navbar-fixed-top,
+  .navbar-fixed-bottom {
+    position: static;
+  }
+  .navbar-fixed-top {
+    margin-bottom: 20px;
+  }
+  .navbar-fixed-bottom {
+    margin-top: 20px;
+  }
+  .navbar-fixed-top .navbar-inner,
+  .navbar-fixed-bottom .navbar-inner {
+    padding: 5px;
+  }
+  .navbar .container {
+    width: auto;
+    padding: 0;
+  }
+  .navbar .brand {
+    padding-right: 10px;
+    padding-left: 10px;
+    margin: 0 0 0 -5px;
+  }
+  .nav-collapse {
+    clear: both;
+  }
+  .nav-collapse .nav {
+    float: none;
+    margin: 0 0 10px;
+  }
+  .nav-collapse .nav > li {
+    float: none;
+  }
+  .nav-collapse .nav > li > a {
+    margin-bottom: 2px;
+  }
+  .nav-collapse .nav > .divider-vertical {
+    display: none;
+  }
+  .nav-collapse .nav .nav-header {
+    color: #777777;
+    text-shadow: none;
+  }
+  .nav-collapse .nav > li > a,
+  .nav-collapse .dropdown-menu a {
+    padding: 9px 15px;
+    font-weight: bold;
+    color: #777777;
+    -webkit-border-radius: 3px;
+       -moz-border-radius: 3px;
+            border-radius: 3px;
+  }
+  .nav-collapse .btn {
+    padding: 4px 10px 4px;
+    font-weight: normal;
+    -webkit-border-radius: 4px;
+       -moz-border-radius: 4px;
+            border-radius: 4px;
+  }
+  .nav-collapse .dropdown-menu li + li a {
+    margin-bottom: 2px;
+  }
+  .nav-collapse .nav > li > a:hover,
+  .nav-collapse .nav > li > a:focus,
+  .nav-collapse .dropdown-menu a:hover,
+  .nav-collapse .dropdown-menu a:focus {
+    background-color: #f2f2f2;
+  }
+  .navbar-inverse .nav-collapse .nav > li > a,
+  .navbar-inverse .nav-collapse .dropdown-menu a {
+    color: #999999;
+  }
+  .navbar-inverse .nav-collapse .nav > li > a:hover,
+  .navbar-inverse .nav-collapse .nav > li > a:focus,
+  .navbar-inverse .nav-collapse .dropdown-menu a:hover,
+  .navbar-inverse .nav-collapse .dropdown-menu a:focus {
+    background-color: #111111;
+  }
+  .nav-collapse.in .btn-group {
+    padding: 0;
+    margin-top: 5px;
+  }
+  .nav-collapse .dropdown-menu {
+    position: static;
+    top: auto;
+    left: auto;
+    display: none;
+    float: none;
+    max-width: none;
+    padding: 0;
+    margin: 0 15px;
+    background-color: transparent;
+    border: none;
+    -webkit-border-radius: 0;
+       -moz-border-radius: 0;
+            border-radius: 0;
+    -webkit-box-shadow: none;
+       -moz-box-shadow: none;
+            box-shadow: none;
+  }
+  .nav-collapse .open > .dropdown-menu {
+    display: block;
+  }
+  .nav-collapse .dropdown-menu:before,
+  .nav-collapse .dropdown-menu:after {
+    display: none;
+  }
+  .nav-collapse .dropdown-menu .divider {
+    display: none;
+  }
+  .nav-collapse .nav > li > .dropdown-menu:before,
+  .nav-collapse .nav > li > .dropdown-menu:after {
+    display: none;
+  }
+  .nav-collapse .navbar-form,
+  .nav-collapse .navbar-search {
+    float: none;
+    padding: 10px 15px;
+    margin: 10px 0;
+    border-top: 1px solid #f2f2f2;
+    border-bottom: 1px solid #f2f2f2;
+    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+       -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+            box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+  }
+  .navbar-inverse .nav-collapse .navbar-form,
+  .navbar-inverse .nav-collapse .navbar-search {
+    border-top-color: #111111;
+    border-bottom-color: #111111;
+  }
+  .navbar .nav-collapse .nav.pull-right {
+    float: none;
+    margin-left: 0;
+  }
+  .nav-collapse,
+  .nav-collapse.collapse {
+    height: 0;
+    overflow: hidden;
+  }
+  .navbar .btn-navbar {
+    display: block;
+  }
+  .navbar-static .navbar-inner {
+    padding-right: 10px;
+    padding-left: 10px;
+  }
+}
+
+@media (min-width: 980px) {
+  .nav-collapse.collapse {
+    height: auto !important;
+    overflow: visible !important;
+  }
+}
diff --git a/apps/bootstrap/css/bootstrap-responsive.min.css b/apps/bootstrap/css/bootstrap-responsive.min.css
new file mode 100644
index 0000000..d1b7f4b
--- /dev/null
+++ b/apps/bootstrap/css/bootstrap-responsive.min.css
@@ -0,0 +1,9 @@
+/*!
+ * Bootstrap Responsive v2.3.1
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}@-ms-viewport{width:device-width}.hidden{display:none;visibility:hidden}.visible-phone{display:none!important}.visible-tablet{display:none!important}.hidden-desktop{display:none!important}.visible-desktop{display:inherit!important}@media(min-width:768px) and (max-width:979px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-tablet{display:inherit!important}.hidden-tablet{display:none!important}}@media(max-width:767px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-phone{display:inherit!important}.hidden-phone{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:inherit!important}.hidden-print{display:none!important}}@media(min-width:1200px){.row{margin-left:-30px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:30px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:1170px}.span12{width:1170px}.span11{width:1070px}.span10{width:970px}.span9{width:870px}.span8{width:770px}.span7{width:670px}.span6{width:570px}.span5{width:470px}.span4{width:370px}.span3{width:270px}.span2{width:170px}.span1{width:70px}.offset12{margin-left:1230px}.offset11{margin-left:1130px}.offset10{margin-left:1030px}.offset9{margin-left:930px}.offset8{margin-left:830px}.offset7{margin-left:730px}.offset6{margin-left:630px}.offset5{margin-left:530px}.offset4{margin-left:430px}.offset3{margin-left:330px}.offset2{margin-left:230px}.offset1{margin-left:130px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.564102564102564%;*margin-left:2.5109110747408616%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.564102564102564%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.45299145299145%;*width:91.39979996362975%}.row-fluid .span10{width:82.90598290598291%;*width:82.8527914166212%}.row-fluid .span9{width:74.35897435897436%;*width:74.30578286961266%}.row-fluid .span8{width:65.81196581196582%;*width:65.75877432260411%}.row-fluid .span7{width:57.26495726495726%;*width:57.21176577559556%}.row-fluid .span6{width:48.717948717948715%;*width:48.664757228587014%}.row-fluid .span5{width:40.17094017094017%;*width:40.11774868157847%}.row-fluid .span4{width:31.623931623931625%;*width:31.570740134569924%}.row-fluid .span3{width:23.076923076923077%;*width:23.023731587561375%}.row-fluid .span2{width:14.52991452991453%;*width:14.476723040552828%}.row-fluid .span1{width:5.982905982905983%;*width:5.929714493544281%}.row-fluid .offset12{margin-left:105.12820512820512%;*margin-left:105.02182214948171%}.row-fluid .offset12:first-child{margin-left:102.56410256410257%;*margin-left:102.45771958537915%}.row-fluid .offset11{margin-left:96.58119658119658%;*margin-left:96.47481360247316%}.row-fluid .offset11:first-child{margin-left:94.01709401709402%;*margin-left:93.91071103837061%}.row-fluid .offset10{margin-left:88.03418803418803%;*margin-left:87.92780505546462%}.row-fluid .offset10:first-child{margin-left:85.47008547008548%;*margin-left:85.36370249136206%}.row-fluid .offset9{margin-left:79.48717948717949%;*margin-left:79.38079650845607%}.row-fluid .offset9:first-child{margin-left:76.92307692307693%;*margin-left:76.81669394435352%}.row-fluid .offset8{margin-left:70.94017094017094%;*margin-left:70.83378796144753%}.row-fluid .offset8:first-child{margin-left:68.37606837606839%;*margin-left:68.26968539734497%}.row-fluid .offset7{margin-left:62.393162393162385%;*margin-left:62.28677941443899%}.row-fluid .offset7:first-child{margin-left:59.82905982905982%;*margin-left:59.72267685033642%}.row-fluid .offset6{margin-left:53.84615384615384%;*margin-left:53.739770867430444%}.row-fluid .offset6:first-child{margin-left:51.28205128205128%;*margin-left:51.175668303327875%}.row-fluid .offset5{margin-left:45.299145299145295%;*margin-left:45.1927623204219%}.row-fluid .offset5:first-child{margin-left:42.73504273504273%;*margin-left:42.62865975631933%}.row-fluid .offset4{margin-left:36.75213675213675%;*margin-left:36.645753773413354%}.row-fluid .offset4:first-child{margin-left:34.18803418803419%;*margin-left:34.081651209310785%}.row-fluid .offset3{margin-left:28.205128205128204%;*margin-left:28.0987452264048%}.row-fluid .offset3:first-child{margin-left:25.641025641025642%;*margin-left:25.53464266230224%}.row-fluid .offset2{margin-left:19.65811965811966%;*margin-left:19.551736679396257%}.row-fluid .offset2:first-child{margin-left:17.094017094017094%;*margin-left:16.98763411529369%}.row-fluid .offset1{margin-left:11.11111111111111%;*margin-left:11.004728132387708%}.row-fluid .offset1:first-child{margin-left:8.547008547008547%;*margin-left:8.440625568285142%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:30px}input.span12,textarea.span12,.uneditable-input.span12{width:1156px}input.span11,textarea.span11,.uneditable-input.span11{width:1056px}input.span10,textarea.span10,.uneditable-input.span10{width:956px}input.span9,textarea.span9,.uneditable-input.span9{width:856px}input.span8,textarea.span8,.uneditable-input.span8{width:756px}input.span7,textarea.span7,.uneditable-input.span7{width:656px}input.span6,textarea.span6,.uneditable-input.span6{width:556px}input.span5,textarea.span5,.uneditable-input.span5{width:456px}input.span4,textarea.span4,.uneditable-input.span4{width:356px}input.span3,textarea.span3,.uneditable-input.span3{width:256px}input.span2,textarea.span2,.uneditable-input.span2{width:156px}input.span1,textarea.span1,.uneditable-input.span1{width:56px}.thumbnails{margin-left:-30px}.thumbnails>li{margin-left:30px}.row-fluid .thumbnails{margin-left:0}}@media(min-width:768px) and (max-width:979px){.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:724px}.span12{width:724px}.span11{width:662px}.span10{width:600px}.span9{width:538px}.span8{width:476px}.span7{width:414px}.span6{width:352px}.span5{width:290px}.span4{width:228px}.span3{width:166px}.span2{width:104px}.span1{width:42px}.offset12{margin-left:764px}.offset11{margin-left:702px}.offset10{margin-left:640px}.offset9{margin-left:578px}.offset8{margin-left:516px}.offset7{margin-left:454px}.offset6{margin-left:392px}.offset5{margin-left:330px}.offset4{margin-left:268px}.offset3{margin-left:206px}.offset2{margin-left:144px}.offset1{margin-left:82px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.7624309392265194%;*margin-left:2.709239449864817%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.7624309392265194%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.43646408839778%;*width:91.38327259903608%}.row-fluid .span10{width:82.87292817679558%;*width:82.81973668743387%}.row-fluid .span9{width:74.30939226519337%;*width:74.25620077583166%}.row-fluid .span8{width:65.74585635359117%;*width:65.69266486422946%}.row-fluid .span7{width:57.18232044198895%;*width:57.12912895262725%}.row-fluid .span6{width:48.61878453038674%;*width:48.56559304102504%}.row-fluid .span5{width:40.05524861878453%;*width:40.00205712942283%}.row-fluid .span4{width:31.491712707182323%;*width:31.43852121782062%}.row-fluid .span3{width:22.92817679558011%;*width:22.87498530621841%}.row-fluid .span2{width:14.3646408839779%;*width:14.311449394616199%}.row-fluid .span1{width:5.801104972375691%;*width:5.747913483013988%}.row-fluid .offset12{margin-left:105.52486187845304%;*margin-left:105.41847889972962%}.row-fluid .offset12:first-child{margin-left:102.76243093922652%;*margin-left:102.6560479605031%}.row-fluid .offset11{margin-left:96.96132596685082%;*margin-left:96.8549429881274%}.row-fluid .offset11:first-child{margin-left:94.1988950276243%;*margin-left:94.09251204890089%}.row-fluid .offset10{margin-left:88.39779005524862%;*margin-left:88.2914070765252%}.row-fluid .offset10:first-child{margin-left:85.6353591160221%;*margin-left:85.52897613729868%}.row-fluid .offset9{margin-left:79.8342541436464%;*margin-left:79.72787116492299%}.row-fluid .offset9:first-child{margin-left:77.07182320441989%;*margin-left:76.96544022569647%}.row-fluid .offset8{margin-left:71.2707182320442%;*margin-left:71.16433525332079%}.row-fluid .offset8:first-child{margin-left:68.50828729281768%;*margin-left:68.40190431409427%}.row-fluid .offset7{margin-left:62.70718232044199%;*margin-left:62.600799341718584%}.row-fluid .offset7:first-child{margin-left:59.94475138121547%;*margin-left:59.838368402492065%}.row-fluid .offset6{margin-left:54.14364640883978%;*margin-left:54.037263430116376%}.row-fluid .offset6:first-child{margin-left:51.38121546961326%;*margin-left:51.27483249088986%}.row-fluid .offset5{margin-left:45.58011049723757%;*margin-left:45.47372751851417%}.row-fluid .offset5:first-child{margin-left:42.81767955801105%;*margin-left:42.71129657928765%}.row-fluid .offset4{margin-left:37.01657458563536%;*margin-left:36.91019160691196%}.row-fluid .offset4:first-child{margin-left:34.25414364640884%;*margin-left:34.14776066768544%}.row-fluid .offset3{margin-left:28.45303867403315%;*margin-left:28.346655695309746%}.row-fluid .offset3:first-child{margin-left:25.69060773480663%;*margin-left:25.584224756083227%}.row-fluid .offset2{margin-left:19.88950276243094%;*margin-left:19.783119783707537%}.row-fluid .offset2:first-child{margin-left:17.12707182320442%;*margin-left:17.02068884448102%}.row-fluid .offset1{margin-left:11.32596685082873%;*margin-left:11.219583872105325%}.row-fluid .offset1:first-child{margin-left:8.56353591160221%;*margin-left:8.457152932878806%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:710px}input.span11,textarea.span11,.uneditable-input.span11{width:648px}input.span10,textarea.span10,.uneditable-input.span10{width:586px}input.span9,textarea.span9,.uneditable-input.span9{width:524px}input.span8,textarea.span8,.uneditable-input.span8{width:462px}input.span7,textarea.span7,.uneditable-input.span7{width:400px}input.span6,textarea.span6,.uneditable-input.span6{width:338px}input.span5,textarea.span5,.uneditable-input.span5{width:276px}input.span4,textarea.span4,.uneditable-input.span4{width:214px}input.span3,textarea.span3,.uneditable-input.span3{width:152px}input.span2,textarea.span2,.uneditable-input.span2{width:90px}input.span1,textarea.span1,.uneditable-input.span1{width:28px}}@media(max-width:767px){body{padding-right:20px;padding-left:20px}.navbar-fixed-top,.navbar-fixed-bottom,.navbar-static-top{margin-right:-20px;margin-left:-20px}.container-fluid{padding:0}.dl-horizontal dt{float:none;width:auto;clear:none;text-align:left}.dl-horizontal dd{margin-left:0}.container{width:auto}.row-fluid{width:100%}.row,.thumbnails{margin-left:0}.thumbnails>li{float:none;margin-left:0}[class*="span"],.uneditable-input[class*="span"],.row-fluid [class*="span"]{display:block;float:none;width:100%;margin-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.span12,.row-fluid .span12{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="offset"]:first-child{margin-left:0}.input-large,.input-xlarge,.input-xxlarge,input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.input-prepend input,.input-append input,.input-prepend input[class*="span"],.input-append input[class*="span"]{display:inline-block;width:auto}.controls-row [class*="span"]+[class*="span"]{margin-left:0}.modal{position:fixed;top:20px;right:20px;left:20px;width:auto;margin:0}.modal.fade{top:-100px}.modal.fade.in{top:20px}}@media(max-width:480px){.nav-collapse{-webkit-transform:translate3d(0,0,0)}.page-header h1 small{display:block;line-height:20px}input[type="checkbox"],input[type="radio"]{border:1px solid #ccc}.form-horizontal .control-label{float:none;width:auto;padding-top:0;text-align:left}.form-horizontal .controls{margin-left:0}.form-horizontal .control-list{padding-top:0}.form-horizontal .form-actions{padding-right:10px;padding-left:10px}.media .pull-left,.media .pull-right{display:block;float:none;margin-bottom:10px}.media-object{margin-right:0;margin-left:0}.modal{top:10px;right:10px;left:10px}.modal-header .close{padding:10px;margin:-10px}.carousel-caption{position:static}}@media(max-width:979px){body{padding-top:0}.navbar-fixed-top,.navbar-fixed-bottom{position:static}.navbar-fixed-top{margin-bottom:20px}.navbar-fixed-bottom{margin-top:20px}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding:5px}.navbar .container{width:auto;padding:0}.navbar .brand{padding-right:10px;padding-left:10px;margin:0 0 0 -5px}.nav-collapse{clear:both}.nav-collapse .nav{float:none;margin:0 0 10px}.nav-collapse .nav>li{float:none}.nav-collapse .nav>li>a{margin-bottom:2px}.nav-collapse .nav>.divider-vertical{display:none}.nav-collapse .nav .nav-header{color:#777;text-shadow:none}.nav-collapse .nav>li>a,.nav-collapse .dropdown-menu a{padding:9px 15px;font-weight:bold;color:#777;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.nav-collapse .btn{padding:4px 10px 4px;font-weight:normal;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.nav-collapse .dropdown-menu li+li a{margin-bottom:2px}.nav-collapse .nav>li>a:hover,.nav-collapse .nav>li>a:focus,.nav-collapse .dropdown-menu a:hover,.nav-collapse .dropdown-menu a:focus{background-color:#f2f2f2}.navbar-inverse .nav-collapse .nav>li>a,.navbar-inverse .nav-collapse .dropdown-menu a{color:#999}.navbar-inverse .nav-collapse .nav>li>a:hover,.navbar-inverse .nav-collapse .nav>li>a:focus,.navbar-inverse .nav-collapse .dropdown-menu a:hover,.navbar-inverse .nav-collapse .dropdown-menu a:focus{background-color:#111}.nav-collapse.in .btn-group{padding:0;margin-top:5px}.nav-collapse .dropdown-menu{position:static;top:auto;left:auto;display:none;float:none;max-width:none;padding:0;margin:0 15px;background-color:transparent;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.nav-collapse .open>.dropdown-menu{display:block}.nav-collapse .dropdown-menu:before,.nav-collapse .dropdown-menu:after{display:none}.nav-collapse .dropdown-menu .divider{display:none}.nav-collapse .nav>li>.dropdown-menu:before,.nav-collapse .nav>li>.dropdown-menu:after{display:none}.nav-collapse .navbar-form,.nav-collapse .navbar-search{float:none;padding:10px 15px;margin:10px 0;border-top:1px solid #f2f2f2;border-bottom:1px solid #f2f2f2;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}.navbar-inverse .nav-collapse .navbar-form,.navbar-inverse .nav-collapse .navbar-search{border-top-color:#111;border-bottom-color:#111}.navbar .nav-collapse .nav.pull-right{float:none;margin-left:0}.nav-collapse,.nav-collapse.collapse{height:0;overflow:hidden}.navbar .btn-navbar{display:block}.navbar-static .navbar-inner{padding-right:10px;padding-left:10px}}@media(min-width:980px){.nav-collapse.collapse{height:auto!important;overflow:visible!important}}
diff --git a/apps/bootstrap/css/bootstrap.css b/apps/bootstrap/css/bootstrap.css
new file mode 100644
index 0000000..2f56af3
--- /dev/null
+++ b/apps/bootstrap/css/bootstrap.css
@@ -0,0 +1,6158 @@
+/*!
+ * Bootstrap v2.3.1
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+
+.clearfix {
+  *zoom: 1;
+}
+
+.clearfix:before,
+.clearfix:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.clearfix:after {
+  clear: both;
+}
+
+.hide-text {
+  font: 0/0 a;
+  color: transparent;
+  text-shadow: none;
+  background-color: transparent;
+  border: 0;
+}
+
+.input-block-level {
+  display: block;
+  width: 100%;
+  min-height: 30px;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
+  display: block;
+}
+
+audio,
+canvas,
+video {
+  display: inline-block;
+  *display: inline;
+  *zoom: 1;
+}
+
+audio:not([controls]) {
+  display: none;
+}
+
+html {
+  font-size: 100%;
+  -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+}
+
+a:focus {
+  outline: thin dotted #333;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+
+a:hover,
+a:active {
+  outline: 0;
+}
+
+sub,
+sup {
+  position: relative;
+  font-size: 75%;
+  line-height: 0;
+  vertical-align: baseline;
+}
+
+sup {
+  top: -0.5em;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+img {
+  width: auto\9;
+  height: auto;
+  max-width: 100%;
+  vertical-align: middle;
+  border: 0;
+  -ms-interpolation-mode: bicubic;
+}
+
+#map_canvas img,
+.google-maps img {
+  max-width: none;
+}
+
+button,
+input,
+select,
+textarea {
+  margin: 0;
+  font-size: 100%;
+  vertical-align: middle;
+}
+
+button,
+input {
+  *overflow: visible;
+  line-height: normal;
+}
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+
+button,
+html input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+  cursor: pointer;
+  -webkit-appearance: button;
+}
+
+label,
+select,
+button,
+input[type="button"],
+input[type="reset"],
+input[type="submit"],
+input[type="radio"],
+input[type="checkbox"] {
+  cursor: pointer;
+}
+
+input[type="search"] {
+  -webkit-box-sizing: content-box;
+     -moz-box-sizing: content-box;
+          box-sizing: content-box;
+  -webkit-appearance: textfield;
+}
+
+input[type="search"]::-webkit-search-decoration,
+input[type="search"]::-webkit-search-cancel-button {
+  -webkit-appearance: none;
+}
+
+textarea {
+  overflow: auto;
+  vertical-align: top;
+}
+
+@media print {
+  * {
+    color: #000 !important;
+    text-shadow: none !important;
+    background: transparent !important;
+    box-shadow: none !important;
+  }
+  a,
+  a:visited {
+    text-decoration: underline;
+  }
+  a[href]:after {
+    content: " (" attr(href) ")";
+  }
+  abbr[title]:after {
+    content: " (" attr(title) ")";
+  }
+  .ir a:after,
+  a[href^="javascript:"]:after,
+  a[href^="#"]:after {
+    content: "";
+  }
+  pre,
+  blockquote {
+    border: 1px solid #999;
+    page-break-inside: avoid;
+  }
+  thead {
+    display: table-header-group;
+  }
+  tr,
+  img {
+    page-break-inside: avoid;
+  }
+  img {
+    max-width: 100% !important;
+  }
+  @page  {
+    margin: 0.5cm;
+  }
+  p,
+  h2,
+  h3 {
+    orphans: 3;
+    widows: 3;
+  }
+  h2,
+  h3 {
+    page-break-after: avoid;
+  }
+}
+
+body {
+  margin: 0;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 14px;
+  line-height: 20px;
+  color: #333333;
+  background-color: #ffffff;
+}
+
+a {
+  color: #0088cc;
+  text-decoration: none;
+}
+
+a:hover,
+a:focus {
+  color: #005580;
+  text-decoration: underline;
+}
+
+.img-rounded {
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.img-polaroid {
+  padding: 4px;
+  background-color: #fff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+          box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+
+.img-circle {
+  -webkit-border-radius: 500px;
+     -moz-border-radius: 500px;
+          border-radius: 500px;
+}
+
+.row {
+  margin-left: -20px;
+  *zoom: 1;
+}
+
+.row:before,
+.row:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.row:after {
+  clear: both;
+}
+
+[class*="span"] {
+  float: left;
+  min-height: 1px;
+  margin-left: 20px;
+}
+
+.container,
+.navbar-static-top .container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+  width: 940px;
+}
+
+.span12 {
+  width: 940px;
+}
+
+.span11 {
+  width: 860px;
+}
+
+.span10 {
+  width: 780px;
+}
+
+.span9 {
+  width: 700px;
+}
+
+.span8 {
+  width: 620px;
+}
+
+.span7 {
+  width: 540px;
+}
+
+.span6 {
+  width: 460px;
+}
+
+.span5 {
+  width: 380px;
+}
+
+.span4 {
+  width: 300px;
+}
+
+.span3 {
+  width: 220px;
+}
+
+.span2 {
+  width: 140px;
+}
+
+.span1 {
+  width: 60px;
+}
+
+.offset12 {
+  margin-left: 980px;
+}
+
+.offset11 {
+  margin-left: 900px;
+}
+
+.offset10 {
+  margin-left: 820px;
+}
+
+.offset9 {
+  margin-left: 740px;
+}
+
+.offset8 {
+  margin-left: 660px;
+}
+
+.offset7 {
+  margin-left: 580px;
+}
+
+.offset6 {
+  margin-left: 500px;
+}
+
+.offset5 {
+  margin-left: 420px;
+}
+
+.offset4 {
+  margin-left: 340px;
+}
+
+.offset3 {
+  margin-left: 260px;
+}
+
+.offset2 {
+  margin-left: 180px;
+}
+
+.offset1 {
+  margin-left: 100px;
+}
+
+.row-fluid {
+  width: 100%;
+  *zoom: 1;
+}
+
+.row-fluid:before,
+.row-fluid:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.row-fluid:after {
+  clear: both;
+}
+
+.row-fluid [class*="span"] {
+  display: block;
+  float: left;
+  width: 100%;
+  min-height: 30px;
+  margin-left: 2.127659574468085%;
+  *margin-left: 2.074468085106383%;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+.row-fluid [class*="span"]:first-child {
+  margin-left: 0;
+}
+
+.row-fluid .controls-row [class*="span"] + [class*="span"] {
+  margin-left: 2.127659574468085%;
+}
+
+.row-fluid .span12 {
+  width: 100%;
+  *width: 99.94680851063829%;
+}
+
+.row-fluid .span11 {
+  width: 91.48936170212765%;
+  *width: 91.43617021276594%;
+}
+
+.row-fluid .span10 {
+  width: 82.97872340425532%;
+  *width: 82.92553191489361%;
+}
+
+.row-fluid .span9 {
+  width: 74.46808510638297%;
+  *width: 74.41489361702126%;
+}
+
+.row-fluid .span8 {
+  width: 65.95744680851064%;
+  *width: 65.90425531914893%;
+}
+
+.row-fluid .span7 {
+  width: 57.44680851063829%;
+  *width: 57.39361702127659%;
+}
+
+.row-fluid .span6 {
+  width: 48.93617021276595%;
+  *width: 48.88297872340425%;
+}
+
+.row-fluid .span5 {
+  width: 40.42553191489362%;
+  *width: 40.37234042553192%;
+}
+
+.row-fluid .span4 {
+  width: 31.914893617021278%;
+  *width: 31.861702127659576%;
+}
+
+.row-fluid .span3 {
+  width: 23.404255319148934%;
+  *width: 23.351063829787233%;
+}
+
+.row-fluid .span2 {
+  width: 14.893617021276595%;
+  *width: 14.840425531914894%;
+}
+
+.row-fluid .span1 {
+  width: 6.382978723404255%;
+  *width: 6.329787234042553%;
+}
+
+.row-fluid .offset12 {
+  margin-left: 104.25531914893617%;
+  *margin-left: 104.14893617021275%;
+}
+
+.row-fluid .offset12:first-child {
+  margin-left: 102.12765957446808%;
+  *margin-left: 102.02127659574467%;
+}
+
+.row-fluid .offset11 {
+  margin-left: 95.74468085106382%;
+  *margin-left: 95.6382978723404%;
+}
+
+.row-fluid .offset11:first-child {
+  margin-left: 93.61702127659574%;
+  *margin-left: 93.51063829787232%;
+}
+
+.row-fluid .offset10 {
+  margin-left: 87.23404255319149%;
+  *margin-left: 87.12765957446807%;
+}
+
+.row-fluid .offset10:first-child {
+  margin-left: 85.1063829787234%;
+  *margin-left: 84.99999999999999%;
+}
+
+.row-fluid .offset9 {
+  margin-left: 78.72340425531914%;
+  *margin-left: 78.61702127659572%;
+}
+
+.row-fluid .offset9:first-child {
+  margin-left: 76.59574468085106%;
+  *margin-left: 76.48936170212764%;
+}
+
+.row-fluid .offset8 {
+  margin-left: 70.2127659574468%;
+  *margin-left: 70.10638297872339%;
+}
+
+.row-fluid .offset8:first-child {
+  margin-left: 68.08510638297872%;
+  *margin-left: 67.9787234042553%;
+}
+
+.row-fluid .offset7 {
+  margin-left: 61.70212765957446%;
+  *margin-left: 61.59574468085106%;
+}
+
+.row-fluid .offset7:first-child {
+  margin-left: 59.574468085106375%;
+  *margin-left: 59.46808510638297%;
+}
+
+.row-fluid .offset6 {
+  margin-left: 53.191489361702125%;
+  *margin-left: 53.085106382978715%;
+}
+
+.row-fluid .offset6:first-child {
+  margin-left: 51.063829787234035%;
+  *margin-left: 50.95744680851063%;
+}
+
+.row-fluid .offset5 {
+  margin-left: 44.68085106382979%;
+  *margin-left: 44.57446808510638%;
+}
+
+.row-fluid .offset5:first-child {
+  margin-left: 42.5531914893617%;
+  *margin-left: 42.4468085106383%;
+}
+
+.row-fluid .offset4 {
+  margin-left: 36.170212765957444%;
+  *margin-left: 36.06382978723405%;
+}
+
+.row-fluid .offset4:first-child {
+  margin-left: 34.04255319148936%;
+  *margin-left: 33.93617021276596%;
+}
+
+.row-fluid .offset3 {
+  margin-left: 27.659574468085104%;
+  *margin-left: 27.5531914893617%;
+}
+
+.row-fluid .offset3:first-child {
+  margin-left: 25.53191489361702%;
+  *margin-left: 25.425531914893618%;
+}
+
+.row-fluid .offset2 {
+  margin-left: 19.148936170212764%;
+  *margin-left: 19.04255319148936%;
+}
+
+.row-fluid .offset2:first-child {
+  margin-left: 17.02127659574468%;
+  *margin-left: 16.914893617021278%;
+}
+
+.row-fluid .offset1 {
+  margin-left: 10.638297872340425%;
+  *margin-left: 10.53191489361702%;
+}
+
+.row-fluid .offset1:first-child {
+  margin-left: 8.51063829787234%;
+  *margin-left: 8.404255319148938%;
+}
+
+[class*="span"].hide,
+.row-fluid [class*="span"].hide {
+  display: none;
+}
+
+[class*="span"].pull-right,
+.row-fluid [class*="span"].pull-right {
+  float: right;
+}
+
+.container {
+  margin-right: auto;
+  margin-left: auto;
+  *zoom: 1;
+}
+
+.container:before,
+.container:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.container:after {
+  clear: both;
+}
+
+.container-fluid {
+  padding-right: 20px;
+  padding-left: 20px;
+  *zoom: 1;
+}
+
+.container-fluid:before,
+.container-fluid:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.container-fluid:after {
+  clear: both;
+}
+
+p {
+  margin: 0 0 10px;
+}
+
+.lead {
+  margin-bottom: 20px;
+  font-size: 21px;
+  font-weight: 200;
+  line-height: 30px;
+}
+
+small {
+  font-size: 85%;
+}
+
+strong {
+  font-weight: bold;
+}
+
+em {
+  font-style: italic;
+}
+
+cite {
+  font-style: normal;
+}
+
+.muted {
+  color: #999999;
+}
+
+a.muted:hover,
+a.muted:focus {
+  color: #808080;
+}
+
+.text-warning {
+  color: #c09853;
+}
+
+a.text-warning:hover,
+a.text-warning:focus {
+  color: #a47e3c;
+}
+
+.text-error {
+  color: #b94a48;
+}
+
+a.text-error:hover,
+a.text-error:focus {
+  color: #953b39;
+}
+
+.text-info {
+  color: #3a87ad;
+}
+
+a.text-info:hover,
+a.text-info:focus {
+  color: #2d6987;
+}
+
+.text-success {
+  color: #468847;
+}
+
+a.text-success:hover,
+a.text-success:focus {
+  color: #356635;
+}
+
+.text-left {
+  text-align: left;
+}
+
+.text-right {
+  text-align: right;
+}
+
+.text-center {
+  text-align: center;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  margin: 10px 0;
+  font-family: inherit;
+  font-weight: bold;
+  line-height: 20px;
+  color: inherit;
+  text-rendering: optimizelegibility;
+}
+
+h1 small,
+h2 small,
+h3 small,
+h4 small,
+h5 small,
+h6 small {
+  font-weight: normal;
+  line-height: 1;
+  color: #999999;
+}
+
+h1,
+h2,
+h3 {
+  line-height: 40px;
+}
+
+h1 {
+  font-size: 38.5px;
+}
+
+h2 {
+  font-size: 31.5px;
+}
+
+h3 {
+  font-size: 24.5px;
+}
+
+h4 {
+  font-size: 17.5px;
+}
+
+h5 {
+  font-size: 14px;
+}
+
+h6 {
+  font-size: 11.9px;
+}
+
+h1 small {
+  font-size: 24.5px;
+}
+
+h2 small {
+  font-size: 17.5px;
+}
+
+h3 small {
+  font-size: 14px;
+}
+
+h4 small {
+  font-size: 14px;
+}
+
+.page-header {
+  padding-bottom: 9px;
+  margin: 20px 0 30px;
+  border-bottom: 1px solid #eeeeee;
+}
+
+ul,
+ol {
+  padding: 0;
+  margin: 0 0 10px 25px;
+}
+
+ul ul,
+ul ol,
+ol ol,
+ol ul {
+  margin-bottom: 0;
+}
+
+li {
+  line-height: 20px;
+}
+
+ul.unstyled,
+ol.unstyled {
+  margin-left: 0;
+  list-style: none;
+}
+
+ul.inline,
+ol.inline {
+  margin-left: 0;
+  list-style: none;
+}
+
+ul.inline > li,
+ol.inline > li {
+  display: inline-block;
+  *display: inline;
+  padding-right: 5px;
+  padding-left: 5px;
+  *zoom: 1;
+}
+
+dl {
+  margin-bottom: 20px;
+}
+
+dt,
+dd {
+  line-height: 20px;
+}
+
+dt {
+  font-weight: bold;
+}
+
+dd {
+  margin-left: 10px;
+}
+
+.dl-horizontal {
+  *zoom: 1;
+}
+
+.dl-horizontal:before,
+.dl-horizontal:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.dl-horizontal:after {
+  clear: both;
+}
+
+.dl-horizontal dt {
+  float: left;
+  width: 160px;
+  overflow: hidden;
+  clear: left;
+  text-align: right;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.dl-horizontal dd {
+  margin-left: 180px;
+}
+
+hr {
+  margin: 20px 0;
+  border: 0;
+  border-top: 1px solid #eeeeee;
+  border-bottom: 1px solid #ffffff;
+}
+
+abbr[title],
+abbr[data-original-title] {
+  cursor: help;
+  border-bottom: 1px dotted #999999;
+}
+
+abbr.initialism {
+  font-size: 90%;
+  text-transform: uppercase;
+}
+
+blockquote {
+  padding: 0 0 0 15px;
+  margin: 0 0 20px;
+  border-left: 5px solid #eeeeee;
+}
+
+blockquote p {
+  margin-bottom: 0;
+  font-size: 17.5px;
+  font-weight: 300;
+  line-height: 1.25;
+}
+
+blockquote small {
+  display: block;
+  line-height: 20px;
+  color: #999999;
+}
+
+blockquote small:before {
+  content: '\2014 \00A0';
+}
+
+blockquote.pull-right {
+  float: right;
+  padding-right: 15px;
+  padding-left: 0;
+  border-right: 5px solid #eeeeee;
+  border-left: 0;
+}
+
+blockquote.pull-right p,
+blockquote.pull-right small {
+  text-align: right;
+}
+
+blockquote.pull-right small:before {
+  content: '';
+}
+
+blockquote.pull-right small:after {
+  content: '\00A0 \2014';
+}
+
+q:before,
+q:after,
+blockquote:before,
+blockquote:after {
+  content: "";
+}
+
+address {
+  display: block;
+  margin-bottom: 20px;
+  font-style: normal;
+  line-height: 20px;
+}
+
+code,
+pre {
+  padding: 0 3px 2px;
+  font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+  font-size: 12px;
+  color: #333333;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+code {
+  padding: 2px 4px;
+  color: #d14;
+  white-space: nowrap;
+  background-color: #f7f7f9;
+  border: 1px solid #e1e1e8;
+}
+
+pre {
+  display: block;
+  padding: 9.5px;
+  margin: 0 0 10px;
+  font-size: 13px;
+  line-height: 20px;
+  word-break: break-all;
+  word-wrap: break-word;
+  white-space: pre;
+  white-space: pre-wrap;
+  background-color: #f5f5f5;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+pre.prettyprint {
+  margin-bottom: 20px;
+}
+
+pre code {
+  padding: 0;
+  color: inherit;
+  white-space: pre;
+  white-space: pre-wrap;
+  background-color: transparent;
+  border: 0;
+}
+
+.pre-scrollable {
+  max-height: 340px;
+  overflow-y: scroll;
+}
+
+form {
+  margin: 0 0 20px;
+}
+
+fieldset {
+  padding: 0;
+  margin: 0;
+  border: 0;
+}
+
+legend {
+  display: block;
+  width: 100%;
+  padding: 0;
+  margin-bottom: 20px;
+  font-size: 21px;
+  line-height: 40px;
+  color: #333333;
+  border: 0;
+  border-bottom: 1px solid #e5e5e5;
+}
+
+legend small {
+  font-size: 15px;
+  color: #999999;
+}
+
+label,
+input,
+button,
+select,
+textarea {
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 20px;
+}
+
+input,
+button,
+select,
+textarea {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
+label {
+  display: block;
+  margin-bottom: 5px;
+}
+
+select,
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+  display: inline-block;
+  height: 20px;
+  padding: 4px 6px;
+  margin-bottom: 10px;
+  font-size: 14px;
+  line-height: 20px;
+  color: #555555;
+  vertical-align: middle;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+input,
+textarea,
+.uneditable-input {
+  width: 206px;
+}
+
+textarea {
+  height: auto;
+}
+
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+  background-color: #ffffff;
+  border: 1px solid #cccccc;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
+     -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
+       -o-transition: border linear 0.2s, box-shadow linear 0.2s;
+          transition: border linear 0.2s, box-shadow linear 0.2s;
+}
+
+textarea:focus,
+input[type="text"]:focus,
+input[type="password"]:focus,
+input[type="datetime"]:focus,
+input[type="datetime-local"]:focus,
+input[type="date"]:focus,
+input[type="month"]:focus,
+input[type="time"]:focus,
+input[type="week"]:focus,
+input[type="number"]:focus,
+input[type="email"]:focus,
+input[type="url"]:focus,
+input[type="search"]:focus,
+input[type="tel"]:focus,
+input[type="color"]:focus,
+.uneditable-input:focus {
+  border-color: rgba(82, 168, 236, 0.8);
+  outline: 0;
+  outline: thin dotted \9;
+  /* IE6-9 */
+
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+}
+
+input[type="radio"],
+input[type="checkbox"] {
+  margin: 4px 0 0;
+  margin-top: 1px \9;
+  *margin-top: 0;
+  line-height: normal;
+}
+
+input[type="file"],
+input[type="image"],
+input[type="submit"],
+input[type="reset"],
+input[type="button"],
+input[type="radio"],
+input[type="checkbox"] {
+  width: auto;
+}
+
+select,
+input[type="file"] {
+  height: 30px;
+  /* In IE7, the height of the select element cannot be changed by height, only font-size */
+
+  *margin-top: 4px;
+  /* For IE7, add top margin to align select with labels */
+
+  line-height: 30px;
+}
+
+select {
+  width: 220px;
+  background-color: #ffffff;
+  border: 1px solid #cccccc;
+}
+
+select[multiple],
+select[size] {
+  height: auto;
+}
+
+select:focus,
+input[type="file"]:focus,
+input[type="radio"]:focus,
+input[type="checkbox"]:focus {
+  outline: thin dotted #333;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+
+.uneditable-input,
+.uneditable-textarea {
+  color: #999999;
+  cursor: not-allowed;
+  background-color: #fcfcfc;
+  border-color: #cccccc;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+}
+
+.uneditable-input {
+  overflow: hidden;
+  white-space: nowrap;
+}
+
+.uneditable-textarea {
+  width: auto;
+  height: auto;
+}
+
+input:-moz-placeholder,
+textarea:-moz-placeholder {
+  color: #999999;
+}
+
+input:-ms-input-placeholder,
+textarea:-ms-input-placeholder {
+  color: #999999;
+}
+
+input::-webkit-input-placeholder,
+textarea::-webkit-input-placeholder {
+  color: #999999;
+}
+
+.radio,
+.checkbox {
+  min-height: 20px;
+  padding-left: 20px;
+}
+
+.radio input[type="radio"],
+.checkbox input[type="checkbox"] {
+  float: left;
+  margin-left: -20px;
+}
+
+.controls > .radio:first-child,
+.controls > .checkbox:first-child {
+  padding-top: 5px;
+}
+
+.radio.inline,
+.checkbox.inline {
+  display: inline-block;
+  padding-top: 5px;
+  margin-bottom: 0;
+  vertical-align: middle;
+}
+
+.radio.inline + .radio.inline,
+.checkbox.inline + .checkbox.inline {
+  margin-left: 10px;
+}
+
+.input-mini {
+  width: 60px;
+}
+
+.input-small {
+  width: 90px;
+}
+
+.input-medium {
+  width: 150px;
+}
+
+.input-large {
+  width: 210px;
+}
+
+.input-xlarge {
+  width: 270px;
+}
+
+.input-xxlarge {
+  width: 530px;
+}
+
+input[class*="span"],
+select[class*="span"],
+textarea[class*="span"],
+.uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"] {
+  float: none;
+  margin-left: 0;
+}
+
+.input-append input[class*="span"],
+.input-append .uneditable-input[class*="span"],
+.input-prepend input[class*="span"],
+.input-prepend .uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"],
+.row-fluid .input-prepend [class*="span"],
+.row-fluid .input-append [class*="span"] {
+  display: inline-block;
+}
+
+input,
+textarea,
+.uneditable-input {
+  margin-left: 0;
+}
+
+.controls-row [class*="span"] + [class*="span"] {
+  margin-left: 20px;
+}
+
+input.span12,
+textarea.span12,
+.uneditable-input.span12 {
+  width: 926px;
+}
+
+input.span11,
+textarea.span11,
+.uneditable-input.span11 {
+  width: 846px;
+}
+
+input.span10,
+textarea.span10,
+.uneditable-input.span10 {
+  width: 766px;
+}
+
+input.span9,
+textarea.span9,
+.uneditable-input.span9 {
+  width: 686px;
+}
+
+input.span8,
+textarea.span8,
+.uneditable-input.span8 {
+  width: 606px;
+}
+
+input.span7,
+textarea.span7,
+.uneditable-input.span7 {
+  width: 526px;
+}
+
+input.span6,
+textarea.span6,
+.uneditable-input.span6 {
+  width: 446px;
+}
+
+input.span5,
+textarea.span5,
+.uneditable-input.span5 {
+  width: 366px;
+}
+
+input.span4,
+textarea.span4,
+.uneditable-input.span4 {
+  width: 286px;
+}
+
+input.span3,
+textarea.span3,
+.uneditable-input.span3 {
+  width: 206px;
+}
+
+input.span2,
+textarea.span2,
+.uneditable-input.span2 {
+  width: 126px;
+}
+
+input.span1,
+textarea.span1,
+.uneditable-input.span1 {
+  width: 46px;
+}
+
+.controls-row {
+  *zoom: 1;
+}
+
+.controls-row:before,
+.controls-row:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.controls-row:after {
+  clear: both;
+}
+
+.controls-row [class*="span"],
+.row-fluid .controls-row [class*="span"] {
+  float: left;
+}
+
+.controls-row .checkbox[class*="span"],
+.controls-row .radio[class*="span"] {
+  padding-top: 5px;
+}
+
+input[disabled],
+select[disabled],
+textarea[disabled],
+input[readonly],
+select[readonly],
+textarea[readonly] {
+  cursor: not-allowed;
+  background-color: #eeeeee;
+}
+
+input[type="radio"][disabled],
+input[type="checkbox"][disabled],
+input[type="radio"][readonly],
+input[type="checkbox"][readonly] {
+  background-color: transparent;
+}
+
+.control-group.warning .control-label,
+.control-group.warning .help-block,
+.control-group.warning .help-inline {
+  color: #c09853;
+}
+
+.control-group.warning .checkbox,
+.control-group.warning .radio,
+.control-group.warning input,
+.control-group.warning select,
+.control-group.warning textarea {
+  color: #c09853;
+}
+
+.control-group.warning input,
+.control-group.warning select,
+.control-group.warning textarea {
+  border-color: #c09853;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.control-group.warning input:focus,
+.control-group.warning select:focus,
+.control-group.warning textarea:focus {
+  border-color: #a47e3c;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+}
+
+.control-group.warning .input-prepend .add-on,
+.control-group.warning .input-append .add-on {
+  color: #c09853;
+  background-color: #fcf8e3;
+  border-color: #c09853;
+}
+
+.control-group.error .control-label,
+.control-group.error .help-block,
+.control-group.error .help-inline {
+  color: #b94a48;
+}
+
+.control-group.error .checkbox,
+.control-group.error .radio,
+.control-group.error input,
+.control-group.error select,
+.control-group.error textarea {
+  color: #b94a48;
+}
+
+.control-group.error input,
+.control-group.error select,
+.control-group.error textarea {
+  border-color: #b94a48;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.control-group.error input:focus,
+.control-group.error select:focus,
+.control-group.error textarea:focus {
+  border-color: #953b39;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+}
+
+.control-group.error .input-prepend .add-on,
+.control-group.error .input-append .add-on {
+  color: #b94a48;
+  background-color: #f2dede;
+  border-color: #b94a48;
+}
+
+.control-group.success .control-label,
+.control-group.success .help-block,
+.control-group.success .help-inline {
+  color: #468847;
+}
+
+.control-group.success .checkbox,
+.control-group.success .radio,
+.control-group.success input,
+.control-group.success select,
+.control-group.success textarea {
+  color: #468847;
+}
+
+.control-group.success input,
+.control-group.success select,
+.control-group.success textarea {
+  border-color: #468847;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.control-group.success input:focus,
+.control-group.success select:focus,
+.control-group.success textarea:focus {
+  border-color: #356635;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+}
+
+.control-group.success .input-prepend .add-on,
+.control-group.success .input-append .add-on {
+  color: #468847;
+  background-color: #dff0d8;
+  border-color: #468847;
+}
+
+.control-group.info .control-label,
+.control-group.info .help-block,
+.control-group.info .help-inline {
+  color: #3a87ad;
+}
+
+.control-group.info .checkbox,
+.control-group.info .radio,
+.control-group.info input,
+.control-group.info select,
+.control-group.info textarea {
+  color: #3a87ad;
+}
+
+.control-group.info input,
+.control-group.info select,
+.control-group.info textarea {
+  border-color: #3a87ad;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.control-group.info input:focus,
+.control-group.info select:focus,
+.control-group.info textarea:focus {
+  border-color: #2d6987;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
+}
+
+.control-group.info .input-prepend .add-on,
+.control-group.info .input-append .add-on {
+  color: #3a87ad;
+  background-color: #d9edf7;
+  border-color: #3a87ad;
+}
+
+input:focus:invalid,
+textarea:focus:invalid,
+select:focus:invalid {
+  color: #b94a48;
+  border-color: #ee5f5b;
+}
+
+input:focus:invalid:focus,
+textarea:focus:invalid:focus,
+select:focus:invalid:focus {
+  border-color: #e9322d;
+  -webkit-box-shadow: 0 0 6px #f8b9b7;
+     -moz-box-shadow: 0 0 6px #f8b9b7;
+          box-shadow: 0 0 6px #f8b9b7;
+}
+
+.form-actions {
+  padding: 19px 20px 20px;
+  margin-top: 20px;
+  margin-bottom: 20px;
+  background-color: #f5f5f5;
+  border-top: 1px solid #e5e5e5;
+  *zoom: 1;
+}
+
+.form-actions:before,
+.form-actions:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.form-actions:after {
+  clear: both;
+}
+
+.help-block,
+.help-inline {
+  color: #595959;
+}
+
+.help-block {
+  display: block;
+  margin-bottom: 10px;
+}
+
+.help-inline {
+  display: inline-block;
+  *display: inline;
+  padding-left: 5px;
+  vertical-align: middle;
+  *zoom: 1;
+}
+
+.input-append,
+.input-prepend {
+  display: inline-block;
+  margin-bottom: 10px;
+  font-size: 0;
+  white-space: nowrap;
+  vertical-align: middle;
+}
+
+.input-append input,
+.input-prepend input,
+.input-append select,
+.input-prepend select,
+.input-append .uneditable-input,
+.input-prepend .uneditable-input,
+.input-append .dropdown-menu,
+.input-prepend .dropdown-menu,
+.input-append .popover,
+.input-prepend .popover {
+  font-size: 14px;
+}
+
+.input-append input,
+.input-prepend input,
+.input-append select,
+.input-prepend select,
+.input-append .uneditable-input,
+.input-prepend .uneditable-input {
+  position: relative;
+  margin-bottom: 0;
+  *margin-left: 0;
+  vertical-align: top;
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.input-append input:focus,
+.input-prepend input:focus,
+.input-append select:focus,
+.input-prepend select:focus,
+.input-append .uneditable-input:focus,
+.input-prepend .uneditable-input:focus {
+  z-index: 2;
+}
+
+.input-append .add-on,
+.input-prepend .add-on {
+  display: inline-block;
+  width: auto;
+  height: 20px;
+  min-width: 16px;
+  padding: 4px 5px;
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 20px;
+  text-align: center;
+  text-shadow: 0 1px 0 #ffffff;
+  background-color: #eeeeee;
+  border: 1px solid #ccc;
+}
+
+.input-append .add-on,
+.input-prepend .add-on,
+.input-append .btn,
+.input-prepend .btn,
+.input-append .btn-group > .dropdown-toggle,
+.input-prepend .btn-group > .dropdown-toggle {
+  vertical-align: top;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.input-append .active,
+.input-prepend .active {
+  background-color: #a9dba9;
+  border-color: #46a546;
+}
+
+.input-prepend .add-on,
+.input-prepend .btn {
+  margin-right: -1px;
+}
+
+.input-prepend .add-on:first-child,
+.input-prepend .btn:first-child {
+  -webkit-border-radius: 4px 0 0 4px;
+     -moz-border-radius: 4px 0 0 4px;
+          border-radius: 4px 0 0 4px;
+}
+
+.input-append input,
+.input-append select,
+.input-append .uneditable-input {
+  -webkit-border-radius: 4px 0 0 4px;
+     -moz-border-radius: 4px 0 0 4px;
+          border-radius: 4px 0 0 4px;
+}
+
+.input-append input + .btn-group .btn:last-child,
+.input-append select + .btn-group .btn:last-child,
+.input-append .uneditable-input + .btn-group .btn:last-child {
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.input-append .add-on,
+.input-append .btn,
+.input-append .btn-group {
+  margin-left: -1px;
+}
+
+.input-append .add-on:last-child,
+.input-append .btn:last-child,
+.input-append .btn-group:last-child > .dropdown-toggle {
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.input-prepend.input-append input,
+.input-prepend.input-append select,
+.input-prepend.input-append .uneditable-input {
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.input-prepend.input-append input + .btn-group .btn,
+.input-prepend.input-append select + .btn-group .btn,
+.input-prepend.input-append .uneditable-input + .btn-group .btn {
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.input-prepend.input-append .add-on:first-child,
+.input-prepend.input-append .btn:first-child {
+  margin-right: -1px;
+  -webkit-border-radius: 4px 0 0 4px;
+     -moz-border-radius: 4px 0 0 4px;
+          border-radius: 4px 0 0 4px;
+}
+
+.input-prepend.input-append .add-on:last-child,
+.input-prepend.input-append .btn:last-child {
+  margin-left: -1px;
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.input-prepend.input-append .btn-group:first-child {
+  margin-left: 0;
+}
+
+input.search-query {
+  padding-right: 14px;
+  padding-right: 4px \9;
+  padding-left: 14px;
+  padding-left: 4px \9;
+  /* IE7-8 doesn't have border-radius, so don't indent the padding */
+
+  margin-bottom: 0;
+  -webkit-border-radius: 15px;
+     -moz-border-radius: 15px;
+          border-radius: 15px;
+}
+
+/* Allow for input prepend/append in search forms */
+
+.form-search .input-append .search-query,
+.form-search .input-prepend .search-query {
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.form-search .input-append .search-query {
+  -webkit-border-radius: 14px 0 0 14px;
+     -moz-border-radius: 14px 0 0 14px;
+          border-radius: 14px 0 0 14px;
+}
+
+.form-search .input-append .btn {
+  -webkit-border-radius: 0 14px 14px 0;
+     -moz-border-radius: 0 14px 14px 0;
+          border-radius: 0 14px 14px 0;
+}
+
+.form-search .input-prepend .search-query {
+  -webkit-border-radius: 0 14px 14px 0;
+     -moz-border-radius: 0 14px 14px 0;
+          border-radius: 0 14px 14px 0;
+}
+
+.form-search .input-prepend .btn {
+  -webkit-border-radius: 14px 0 0 14px;
+     -moz-border-radius: 14px 0 0 14px;
+          border-radius: 14px 0 0 14px;
+}
+
+.form-search input,
+.form-inline input,
+.form-horizontal input,
+.form-search textarea,
+.form-inline textarea,
+.form-horizontal textarea,
+.form-search select,
+.form-inline select,
+.form-horizontal select,
+.form-search .help-inline,
+.form-inline .help-inline,
+.form-horizontal .help-inline,
+.form-search .uneditable-input,
+.form-inline .uneditable-input,
+.form-horizontal .uneditable-input,
+.form-search .input-prepend,
+.form-inline .input-prepend,
+.form-horizontal .input-prepend,
+.form-search .input-append,
+.form-inline .input-append,
+.form-horizontal .input-append {
+  display: inline-block;
+  *display: inline;
+  margin-bottom: 0;
+  vertical-align: middle;
+  *zoom: 1;
+}
+
+.form-search .hide,
+.form-inline .hide,
+.form-horizontal .hide {
+  display: none;
+}
+
+.form-search label,
+.form-inline label,
+.form-search .btn-group,
+.form-inline .btn-group {
+  display: inline-block;
+}
+
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
+  margin-bottom: 0;
+}
+
+.form-search .radio,
+.form-search .checkbox,
+.form-inline .radio,
+.form-inline .checkbox {
+  padding-left: 0;
+  margin-bottom: 0;
+  vertical-align: middle;
+}
+
+.form-search .radio input[type="radio"],
+.form-search .checkbox input[type="checkbox"],
+.form-inline .radio input[type="radio"],
+.form-inline .checkbox input[type="checkbox"] {
+  float: left;
+  margin-right: 3px;
+  margin-left: 0;
+}
+
+.control-group {
+  margin-bottom: 10px;
+}
+
+legend + .control-group {
+  margin-top: 20px;
+  -webkit-margin-top-collapse: separate;
+}
+
+.form-horizontal .control-group {
+  margin-bottom: 20px;
+  *zoom: 1;
+}
+
+.form-horizontal .control-group:before,
+.form-horizontal .control-group:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.form-horizontal .control-group:after {
+  clear: both;
+}
+
+.form-horizontal .control-label {
+  float: left;
+  width: 160px;
+  padding-top: 5px;
+  text-align: right;
+}
+
+.form-horizontal .controls {
+  *display: inline-block;
+  *padding-left: 20px;
+  margin-left: 180px;
+  *margin-left: 0;
+}
+
+.form-horizontal .controls:first-child {
+  *padding-left: 180px;
+}
+
+.form-horizontal .help-block {
+  margin-bottom: 0;
+}
+
+.form-horizontal input + .help-block,
+.form-horizontal select + .help-block,
+.form-horizontal textarea + .help-block,
+.form-horizontal .uneditable-input + .help-block,
+.form-horizontal .input-prepend + .help-block,
+.form-horizontal .input-append + .help-block {
+  margin-top: 10px;
+}
+
+.form-horizontal .form-actions {
+  padding-left: 180px;
+}
+
+table {
+  max-width: 100%;
+  background-color: transparent;
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+.table {
+  width: 100%;
+  margin-bottom: 20px;
+}
+
+.table th,
+.table td {
+  padding: 8px;
+  line-height: 20px;
+  text-align: left;
+  vertical-align: top;
+  border-top: 1px solid #dddddd;
+}
+
+.table th {
+  font-weight: bold;
+}
+
+.table thead th {
+  vertical-align: bottom;
+}
+
+.table caption + thead tr:first-child th,
+.table caption + thead tr:first-child td,
+.table colgroup + thead tr:first-child th,
+.table colgroup + thead tr:first-child td,
+.table thead:first-child tr:first-child th,
+.table thead:first-child tr:first-child td {
+  border-top: 0;
+}
+
+.table tbody + tbody {
+  border-top: 2px solid #dddddd;
+}
+
+.table .table {
+  background-color: #ffffff;
+}
+
+.table-condensed th,
+.table-condensed td {
+  padding: 4px 5px;
+}
+
+.table-bordered {
+  border: 1px solid #dddddd;
+  border-collapse: separate;
+  *border-collapse: collapse;
+  border-left: 0;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.table-bordered th,
+.table-bordered td {
+  border-left: 1px solid #dddddd;
+}
+
+.table-bordered caption + thead tr:first-child th,
+.table-bordered caption + tbody tr:first-child th,
+.table-bordered caption + tbody tr:first-child td,
+.table-bordered colgroup + thead tr:first-child th,
+.table-bordered colgroup + tbody tr:first-child th,
+.table-bordered colgroup + tbody tr:first-child td,
+.table-bordered thead:first-child tr:first-child th,
+.table-bordered tbody:first-child tr:first-child th,
+.table-bordered tbody:first-child tr:first-child td {
+  border-top: 0;
+}
+
+.table-bordered thead:first-child tr:first-child > th:first-child,
+.table-bordered tbody:first-child tr:first-child > td:first-child,
+.table-bordered tbody:first-child tr:first-child > th:first-child {
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.table-bordered thead:first-child tr:first-child > th:last-child,
+.table-bordered tbody:first-child tr:first-child > td:last-child,
+.table-bordered tbody:first-child tr:first-child > th:last-child {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+}
+
+.table-bordered thead:last-child tr:last-child > th:first-child,
+.table-bordered tbody:last-child tr:last-child > td:first-child,
+.table-bordered tbody:last-child tr:last-child > th:first-child,
+.table-bordered tfoot:last-child tr:last-child > td:first-child,
+.table-bordered tfoot:last-child tr:last-child > th:first-child {
+  -webkit-border-bottom-left-radius: 4px;
+          border-bottom-left-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+}
+
+.table-bordered thead:last-child tr:last-child > th:last-child,
+.table-bordered tbody:last-child tr:last-child > td:last-child,
+.table-bordered tbody:last-child tr:last-child > th:last-child,
+.table-bordered tfoot:last-child tr:last-child > td:last-child,
+.table-bordered tfoot:last-child tr:last-child > th:last-child {
+  -webkit-border-bottom-right-radius: 4px;
+          border-bottom-right-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+}
+
+.table-bordered tfoot + tbody:last-child tr:last-child td:first-child {
+  -webkit-border-bottom-left-radius: 0;
+          border-bottom-left-radius: 0;
+  -moz-border-radius-bottomleft: 0;
+}
+
+.table-bordered tfoot + tbody:last-child tr:last-child td:last-child {
+  -webkit-border-bottom-right-radius: 0;
+          border-bottom-right-radius: 0;
+  -moz-border-radius-bottomright: 0;
+}
+
+.table-bordered caption + thead tr:first-child th:first-child,
+.table-bordered caption + tbody tr:first-child td:first-child,
+.table-bordered colgroup + thead tr:first-child th:first-child,
+.table-bordered colgroup + tbody tr:first-child td:first-child {
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.table-bordered caption + thead tr:first-child th:last-child,
+.table-bordered caption + tbody tr:first-child td:last-child,
+.table-bordered colgroup + thead tr:first-child th:last-child,
+.table-bordered colgroup + tbody tr:first-child td:last-child {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+}
+
+.table-striped tbody > tr:nth-child(odd) > td,
+.table-striped tbody > tr:nth-child(odd) > th {
+  background-color: #f9f9f9;
+}
+
+.table-hover tbody tr:hover > td,
+.table-hover tbody tr:hover > th {
+  background-color: #f5f5f5;
+}
+
+table td[class*="span"],
+table th[class*="span"],
+.row-fluid table td[class*="span"],
+.row-fluid table th[class*="span"] {
+  display: table-cell;
+  float: none;
+  margin-left: 0;
+}
+
+.table td.span1,
+.table th.span1 {
+  float: none;
+  width: 44px;
+  margin-left: 0;
+}
+
+.table td.span2,
+.table th.span2 {
+  float: none;
+  width: 124px;
+  margin-left: 0;
+}
+
+.table td.span3,
+.table th.span3 {
+  float: none;
+  width: 204px;
+  margin-left: 0;
+}
+
+.table td.span4,
+.table th.span4 {
+  float: none;
+  width: 284px;
+  margin-left: 0;
+}
+
+.table td.span5,
+.table th.span5 {
+  float: none;
+  width: 364px;
+  margin-left: 0;
+}
+
+.table td.span6,
+.table th.span6 {
+  float: none;
+  width: 444px;
+  margin-left: 0;
+}
+
+.table td.span7,
+.table th.span7 {
+  float: none;
+  width: 524px;
+  margin-left: 0;
+}
+
+.table td.span8,
+.table th.span8 {
+  float: none;
+  width: 604px;
+  margin-left: 0;
+}
+
+.table td.span9,
+.table th.span9 {
+  float: none;
+  width: 684px;
+  margin-left: 0;
+}
+
+.table td.span10,
+.table th.span10 {
+  float: none;
+  width: 764px;
+  margin-left: 0;
+}
+
+.table td.span11,
+.table th.span11 {
+  float: none;
+  width: 844px;
+  margin-left: 0;
+}
+
+.table td.span12,
+.table th.span12 {
+  float: none;
+  width: 924px;
+  margin-left: 0;
+}
+
+.table tbody tr.success > td {
+  background-color: #dff0d8;
+}
+
+.table tbody tr.error > td {
+  background-color: #f2dede;
+}
+
+.table tbody tr.warning > td {
+  background-color: #fcf8e3;
+}
+
+.table tbody tr.info > td {
+  background-color: #d9edf7;
+}
+
+.table-hover tbody tr.success:hover > td {
+  background-color: #d0e9c6;
+}
+
+.table-hover tbody tr.error:hover > td {
+  background-color: #ebcccc;
+}
+
+.table-hover tbody tr.warning:hover > td {
+  background-color: #faf2cc;
+}
+
+.table-hover tbody tr.info:hover > td {
+  background-color: #c4e3f3;
+}
+
+[class^="icon-"],
+[class*=" icon-"] {
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  margin-top: 1px;
+  *margin-right: .3em;
+  line-height: 14px;
+  vertical-align: text-top;
+  background-image: url("../img/glyphicons-halflings.png");
+  background-position: 14px 14px;
+  background-repeat: no-repeat;
+}
+
+/* White icons with optional class, or on hover/focus/active states of certain elements */
+
+.icon-white,
+.nav-pills > .active > a > [class^="icon-"],
+.nav-pills > .active > a > [class*=" icon-"],
+.nav-list > .active > a > [class^="icon-"],
+.nav-list > .active > a > [class*=" icon-"],
+.navbar-inverse .nav > .active > a > [class^="icon-"],
+.navbar-inverse .nav > .active > a > [class*=" icon-"],
+.dropdown-menu > li > a:hover > [class^="icon-"],
+.dropdown-menu > li > a:focus > [class^="icon-"],
+.dropdown-menu > li > a:hover > [class*=" icon-"],
+.dropdown-menu > li > a:focus > [class*=" icon-"],
+.dropdown-menu > .active > a > [class^="icon-"],
+.dropdown-menu > .active > a > [class*=" icon-"],
+.dropdown-submenu:hover > a > [class^="icon-"],
+.dropdown-submenu:focus > a > [class^="icon-"],
+.dropdown-submenu:hover > a > [class*=" icon-"],
+.dropdown-submenu:focus > a > [class*=" icon-"] {
+  background-image: url("../img/glyphicons-halflings-white.png");
+}
+
+.icon-glass {
+  background-position: 0      0;
+}
+
+.icon-music {
+  background-position: -24px 0;
+}
+
+.icon-search {
+  background-position: -48px 0;
+}
+
+.icon-envelope {
+  background-position: -72px 0;
+}
+
+.icon-heart {
+  background-position: -96px 0;
+}
+
+.icon-star {
+  background-position: -120px 0;
+}
+
+.icon-star-empty {
+  background-position: -144px 0;
+}
+
+.icon-user {
+  background-position: -168px 0;
+}
+
+.icon-film {
+  background-position: -192px 0;
+}
+
+.icon-th-large {
+  background-position: -216px 0;
+}
+
+.icon-th {
+  background-position: -240px 0;
+}
+
+.icon-th-list {
+  background-position: -264px 0;
+}
+
+.icon-ok {
+  background-position: -288px 0;
+}
+
+.icon-remove {
+  background-position: -312px 0;
+}
+
+.icon-zoom-in {
+  background-position: -336px 0;
+}
+
+.icon-zoom-out {
+  background-position: -360px 0;
+}
+
+.icon-off {
+  background-position: -384px 0;
+}
+
+.icon-signal {
+  background-position: -408px 0;
+}
+
+.icon-cog {
+  background-position: -432px 0;
+}
+
+.icon-trash {
+  background-position: -456px 0;
+}
+
+.icon-home {
+  background-position: 0 -24px;
+}
+
+.icon-file {
+  background-position: -24px -24px;
+}
+
+.icon-time {
+  background-position: -48px -24px;
+}
+
+.icon-road {
+  background-position: -72px -24px;
+}
+
+.icon-download-alt {
+  background-position: -96px -24px;
+}
+
+.icon-download {
+  background-position: -120px -24px;
+}
+
+.icon-upload {
+  background-position: -144px -24px;
+}
+
+.icon-inbox {
+  background-position: -168px -24px;
+}
+
+.icon-play-circle {
+  background-position: -192px -24px;
+}
+
+.icon-repeat {
+  background-position: -216px -24px;
+}
+
+.icon-refresh {
+  background-position: -240px -24px;
+}
+
+.icon-list-alt {
+  background-position: -264px -24px;
+}
+
+.icon-lock {
+  background-position: -287px -24px;
+}
+
+.icon-flag {
+  background-position: -312px -24px;
+}
+
+.icon-headphones {
+  background-position: -336px -24px;
+}
+
+.icon-volume-off {
+  background-position: -360px -24px;
+}
+
+.icon-volume-down {
+  background-position: -384px -24px;
+}
+
+.icon-volume-up {
+  background-position: -408px -24px;
+}
+
+.icon-qrcode {
+  background-position: -432px -24px;
+}
+
+.icon-barcode {
+  background-position: -456px -24px;
+}
+
+.icon-tag {
+  background-position: 0 -48px;
+}
+
+.icon-tags {
+  background-position: -25px -48px;
+}
+
+.icon-book {
+  background-position: -48px -48px;
+}
+
+.icon-bookmark {
+  background-position: -72px -48px;
+}
+
+.icon-print {
+  background-position: -96px -48px;
+}
+
+.icon-camera {
+  background-position: -120px -48px;
+}
+
+.icon-font {
+  background-position: -144px -48px;
+}
+
+.icon-bold {
+  background-position: -167px -48px;
+}
+
+.icon-italic {
+  background-position: -192px -48px;
+}
+
+.icon-text-height {
+  background-position: -216px -48px;
+}
+
+.icon-text-width {
+  background-position: -240px -48px;
+}
+
+.icon-align-left {
+  background-position: -264px -48px;
+}
+
+.icon-align-center {
+  background-position: -288px -48px;
+}
+
+.icon-align-right {
+  background-position: -312px -48px;
+}
+
+.icon-align-justify {
+  background-position: -336px -48px;
+}
+
+.icon-list {
+  background-position: -360px -48px;
+}
+
+.icon-indent-left {
+  background-position: -384px -48px;
+}
+
+.icon-indent-right {
+  background-position: -408px -48px;
+}
+
+.icon-facetime-video {
+  background-position: -432px -48px;
+}
+
+.icon-picture {
+  background-position: -456px -48px;
+}
+
+.icon-pencil {
+  background-position: 0 -72px;
+}
+
+.icon-map-marker {
+  background-position: -24px -72px;
+}
+
+.icon-adjust {
+  background-position: -48px -72px;
+}
+
+.icon-tint {
+  background-position: -72px -72px;
+}
+
+.icon-edit {
+  background-position: -96px -72px;
+}
+
+.icon-share {
+  background-position: -120px -72px;
+}
+
+.icon-check {
+  background-position: -144px -72px;
+}
+
+.icon-move {
+  background-position: -168px -72px;
+}
+
+.icon-step-backward {
+  background-position: -192px -72px;
+}
+
+.icon-fast-backward {
+  background-position: -216px -72px;
+}
+
+.icon-backward {
+  background-position: -240px -72px;
+}
+
+.icon-play {
+  background-position: -264px -72px;
+}
+
+.icon-pause {
+  background-position: -288px -72px;
+}
+
+.icon-stop {
+  background-position: -312px -72px;
+}
+
+.icon-forward {
+  background-position: -336px -72px;
+}
+
+.icon-fast-forward {
+  background-position: -360px -72px;
+}
+
+.icon-step-forward {
+  background-position: -384px -72px;
+}
+
+.icon-eject {
+  background-position: -408px -72px;
+}
+
+.icon-chevron-left {
+  background-position: -432px -72px;
+}
+
+.icon-chevron-right {
+  background-position: -456px -72px;
+}
+
+.icon-plus-sign {
+  background-position: 0 -96px;
+}
+
+.icon-minus-sign {
+  background-position: -24px -96px;
+}
+
+.icon-remove-sign {
+  background-position: -48px -96px;
+}
+
+.icon-ok-sign {
+  background-position: -72px -96px;
+}
+
+.icon-question-sign {
+  background-position: -96px -96px;
+}
+
+.icon-info-sign {
+  background-position: -120px -96px;
+}
+
+.icon-screenshot {
+  background-position: -144px -96px;
+}
+
+.icon-remove-circle {
+  background-position: -168px -96px;
+}
+
+.icon-ok-circle {
+  background-position: -192px -96px;
+}
+
+.icon-ban-circle {
+  background-position: -216px -96px;
+}
+
+.icon-arrow-left {
+  background-position: -240px -96px;
+}
+
+.icon-arrow-right {
+  background-position: -264px -96px;
+}
+
+.icon-arrow-up {
+  background-position: -289px -96px;
+}
+
+.icon-arrow-down {
+  background-position: -312px -96px;
+}
+
+.icon-share-alt {
+  background-position: -336px -96px;
+}
+
+.icon-resize-full {
+  background-position: -360px -96px;
+}
+
+.icon-resize-small {
+  background-position: -384px -96px;
+}
+
+.icon-plus {
+  background-position: -408px -96px;
+}
+
+.icon-minus {
+  background-position: -433px -96px;
+}
+
+.icon-asterisk {
+  background-position: -456px -96px;
+}
+
+.icon-exclamation-sign {
+  background-position: 0 -120px;
+}
+
+.icon-gift {
+  background-position: -24px -120px;
+}
+
+.icon-leaf {
+  background-position: -48px -120px;
+}
+
+.icon-fire {
+  background-position: -72px -120px;
+}
+
+.icon-eye-open {
+  background-position: -96px -120px;
+}
+
+.icon-eye-close {
+  background-position: -120px -120px;
+}
+
+.icon-warning-sign {
+  background-position: -144px -120px;
+}
+
+.icon-plane {
+  background-position: -168px -120px;
+}
+
+.icon-calendar {
+  background-position: -192px -120px;
+}
+
+.icon-random {
+  width: 16px;
+  background-position: -216px -120px;
+}
+
+.icon-comment {
+  background-position: -240px -120px;
+}
+
+.icon-magnet {
+  background-position: -264px -120px;
+}
+
+.icon-chevron-up {
+  background-position: -288px -120px;
+}
+
+.icon-chevron-down {
+  background-position: -313px -119px;
+}
+
+.icon-retweet {
+  background-position: -336px -120px;
+}
+
+.icon-shopping-cart {
+  background-position: -360px -120px;
+}
+
+.icon-folder-close {
+  width: 16px;
+  background-position: -384px -120px;
+}
+
+.icon-folder-open {
+  width: 16px;
+  background-position: -408px -120px;
+}
+
+.icon-resize-vertical {
+  background-position: -432px -119px;
+}
+
+.icon-resize-horizontal {
+  background-position: -456px -118px;
+}
+
+.icon-hdd {
+  background-position: 0 -144px;
+}
+
+.icon-bullhorn {
+  background-position: -24px -144px;
+}
+
+.icon-bell {
+  background-position: -48px -144px;
+}
+
+.icon-certificate {
+  background-position: -72px -144px;
+}
+
+.icon-thumbs-up {
+  background-position: -96px -144px;
+}
+
+.icon-thumbs-down {
+  background-position: -120px -144px;
+}
+
+.icon-hand-right {
+  background-position: -144px -144px;
+}
+
+.icon-hand-left {
+  background-position: -168px -144px;
+}
+
+.icon-hand-up {
+  background-position: -192px -144px;
+}
+
+.icon-hand-down {
+  background-position: -216px -144px;
+}
+
+.icon-circle-arrow-right {
+  background-position: -240px -144px;
+}
+
+.icon-circle-arrow-left {
+  background-position: -264px -144px;
+}
+
+.icon-circle-arrow-up {
+  background-position: -288px -144px;
+}
+
+.icon-circle-arrow-down {
+  background-position: -312px -144px;
+}
+
+.icon-globe {
+  background-position: -336px -144px;
+}
+
+.icon-wrench {
+  background-position: -360px -144px;
+}
+
+.icon-tasks {
+  background-position: -384px -144px;
+}
+
+.icon-filter {
+  background-position: -408px -144px;
+}
+
+.icon-briefcase {
+  background-position: -432px -144px;
+}
+
+.icon-fullscreen {
+  background-position: -456px -144px;
+}
+
+.dropup,
+.dropdown {
+  position: relative;
+}
+
+.dropdown-toggle {
+  *margin-bottom: -3px;
+}
+
+.dropdown-toggle:active,
+.open .dropdown-toggle {
+  outline: 0;
+}
+
+.caret {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  vertical-align: top;
+  border-top: 4px solid #000000;
+  border-right: 4px solid transparent;
+  border-left: 4px solid transparent;
+  content: "";
+}
+
+.dropdown .caret {
+  margin-top: 8px;
+  margin-left: 2px;
+}
+
+.dropdown-menu {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  z-index: 1000;
+  display: none;
+  float: left;
+  min-width: 160px;
+  padding: 5px 0;
+  margin: 2px 0 0;
+  list-style: none;
+  background-color: #ffffff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  *border-right-width: 2px;
+  *border-bottom-width: 2px;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding;
+          background-clip: padding-box;
+}
+
+.dropdown-menu.pull-right {
+  right: 0;
+  left: auto;
+}
+
+.dropdown-menu .divider {
+  *width: 100%;
+  height: 1px;
+  margin: 9px 1px;
+  *margin: -5px 0 5px;
+  overflow: hidden;
+  background-color: #e5e5e5;
+  border-bottom: 1px solid #ffffff;
+}
+
+.dropdown-menu > li > a {
+  display: block;
+  padding: 3px 20px;
+  clear: both;
+  font-weight: normal;
+  line-height: 20px;
+  color: #333333;
+  white-space: nowrap;
+}
+
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus,
+.dropdown-submenu:hover > a,
+.dropdown-submenu:focus > a {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #0081c2;
+  background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
+  background-image: -o-linear-gradient(top, #0088cc, #0077b3);
+  background-image: linear-gradient(to bottom, #0088cc, #0077b3);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
+}
+
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #0081c2;
+  background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
+  background-image: -o-linear-gradient(top, #0088cc, #0077b3);
+  background-image: linear-gradient(to bottom, #0088cc, #0077b3);
+  background-repeat: repeat-x;
+  outline: 0;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
+}
+
+.dropdown-menu > .disabled > a,
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  color: #999999;
+}
+
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  text-decoration: none;
+  cursor: default;
+  background-color: transparent;
+  background-image: none;
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.open {
+  *z-index: 1000;
+}
+
+.open > .dropdown-menu {
+  display: block;
+}
+
+.pull-right > .dropdown-menu {
+  right: 0;
+  left: auto;
+}
+
+.dropup .caret,
+.navbar-fixed-bottom .dropdown .caret {
+  border-top: 0;
+  border-bottom: 4px solid #000000;
+  content: "";
+}
+
+.dropup .dropdown-menu,
+.navbar-fixed-bottom .dropdown .dropdown-menu {
+  top: auto;
+  bottom: 100%;
+  margin-bottom: 1px;
+}
+
+.dropdown-submenu {
+  position: relative;
+}
+
+.dropdown-submenu > .dropdown-menu {
+  top: 0;
+  left: 100%;
+  margin-top: -6px;
+  margin-left: -1px;
+  -webkit-border-radius: 0 6px 6px 6px;
+     -moz-border-radius: 0 6px 6px 6px;
+          border-radius: 0 6px 6px 6px;
+}
+
+.dropdown-submenu:hover > .dropdown-menu {
+  display: block;
+}
+
+.dropup .dropdown-submenu > .dropdown-menu {
+  top: auto;
+  bottom: 0;
+  margin-top: 0;
+  margin-bottom: -2px;
+  -webkit-border-radius: 5px 5px 5px 0;
+     -moz-border-radius: 5px 5px 5px 0;
+          border-radius: 5px 5px 5px 0;
+}
+
+.dropdown-submenu > a:after {
+  display: block;
+  float: right;
+  width: 0;
+  height: 0;
+  margin-top: 5px;
+  margin-right: -10px;
+  border-color: transparent;
+  border-left-color: #cccccc;
+  border-style: solid;
+  border-width: 5px 0 5px 5px;
+  content: " ";
+}
+
+.dropdown-submenu:hover > a:after {
+  border-left-color: #ffffff;
+}
+
+.dropdown-submenu.pull-left {
+  float: none;
+}
+
+.dropdown-submenu.pull-left > .dropdown-menu {
+  left: -100%;
+  margin-left: 10px;
+  -webkit-border-radius: 6px 0 6px 6px;
+     -moz-border-radius: 6px 0 6px 6px;
+          border-radius: 6px 0 6px 6px;
+}
+
+.dropdown .dropdown-menu .nav-header {
+  padding-right: 20px;
+  padding-left: 20px;
+}
+
+.typeahead {
+  z-index: 1051;
+  margin-top: 2px;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.well {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: #f5f5f5;
+  border: 1px solid #e3e3e3;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+}
+
+.well blockquote {
+  border-color: #ddd;
+  border-color: rgba(0, 0, 0, 0.15);
+}
+
+.well-large {
+  padding: 24px;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.well-small {
+  padding: 9px;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+.fade {
+  opacity: 0;
+  -webkit-transition: opacity 0.15s linear;
+     -moz-transition: opacity 0.15s linear;
+       -o-transition: opacity 0.15s linear;
+          transition: opacity 0.15s linear;
+}
+
+.fade.in {
+  opacity: 1;
+}
+
+.collapse {
+  position: relative;
+  height: 0;
+  overflow: hidden;
+  -webkit-transition: height 0.35s ease;
+     -moz-transition: height 0.35s ease;
+       -o-transition: height 0.35s ease;
+          transition: height 0.35s ease;
+}
+
+.collapse.in {
+  height: auto;
+}
+
+.close {
+  float: right;
+  font-size: 20px;
+  font-weight: bold;
+  line-height: 20px;
+  color: #000000;
+  text-shadow: 0 1px 0 #ffffff;
+  opacity: 0.2;
+  filter: alpha(opacity=20);
+}
+
+.close:hover,
+.close:focus {
+  color: #000000;
+  text-decoration: none;
+  cursor: pointer;
+  opacity: 0.4;
+  filter: alpha(opacity=40);
+}
+
+button.close {
+  padding: 0;
+  cursor: pointer;
+  background: transparent;
+  border: 0;
+  -webkit-appearance: none;
+}
+
+.btn {
+  display: inline-block;
+  *display: inline;
+  padding: 4px 12px;
+  margin-bottom: 0;
+  *margin-left: .3em;
+  font-size: 14px;
+  line-height: 20px;
+  color: #333333;
+  text-align: center;
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+  vertical-align: middle;
+  cursor: pointer;
+  background-color: #f5f5f5;
+  *background-color: #e6e6e6;
+  background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
+  background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
+  background-repeat: repeat-x;
+  border: 1px solid #cccccc;
+  *border: 0;
+  border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  border-bottom-color: #b3b3b3;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  *zoom: 1;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn:hover,
+.btn:focus,
+.btn:active,
+.btn.active,
+.btn.disabled,
+.btn[disabled] {
+  color: #333333;
+  background-color: #e6e6e6;
+  *background-color: #d9d9d9;
+}
+
+.btn:active,
+.btn.active {
+  background-color: #cccccc \9;
+}
+
+.btn:first-child {
+  *margin-left: 0;
+}
+
+.btn:hover,
+.btn:focus {
+  color: #333333;
+  text-decoration: none;
+  background-position: 0 -15px;
+  -webkit-transition: background-position 0.1s linear;
+     -moz-transition: background-position 0.1s linear;
+       -o-transition: background-position 0.1s linear;
+          transition: background-position 0.1s linear;
+}
+
+.btn:focus {
+  outline: thin dotted #333;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+
+.btn.active,
+.btn:active {
+  background-image: none;
+  outline: 0;
+  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn.disabled,
+.btn[disabled] {
+  cursor: default;
+  background-image: none;
+  opacity: 0.65;
+  filter: alpha(opacity=65);
+  -webkit-box-shadow: none;
+     -moz-box-shadow: none;
+          box-shadow: none;
+}
+
+.btn-large {
+  padding: 11px 19px;
+  font-size: 17.5px;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.btn-large [class^="icon-"],
+.btn-large [class*=" icon-"] {
+  margin-top: 4px;
+}
+
+.btn-small {
+  padding: 2px 10px;
+  font-size: 11.9px;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+.btn-small [class^="icon-"],
+.btn-small [class*=" icon-"] {
+  margin-top: 0;
+}
+
+.btn-mini [class^="icon-"],
+.btn-mini [class*=" icon-"] {
+  margin-top: -1px;
+}
+
+.btn-mini {
+  padding: 0 6px;
+  font-size: 10.5px;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+.btn-block {
+  display: block;
+  width: 100%;
+  padding-right: 0;
+  padding-left: 0;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+.btn-block + .btn-block {
+  margin-top: 5px;
+}
+
+input[type="submit"].btn-block,
+input[type="reset"].btn-block,
+input[type="button"].btn-block {
+  width: 100%;
+}
+
+.btn-primary.active,
+.btn-warning.active,
+.btn-danger.active,
+.btn-success.active,
+.btn-info.active,
+.btn-inverse.active {
+  color: rgba(255, 255, 255, 0.75);
+}
+
+.btn-primary {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #006dcc;
+  *background-color: #0044cc;
+  background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -o-linear-gradient(top, #0088cc, #0044cc);
+  background-image: linear-gradient(to bottom, #0088cc, #0044cc);
+  background-repeat: repeat-x;
+  border-color: #0044cc #0044cc #002a80;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.btn-primary:hover,
+.btn-primary:focus,
+.btn-primary:active,
+.btn-primary.active,
+.btn-primary.disabled,
+.btn-primary[disabled] {
+  color: #ffffff;
+  background-color: #0044cc;
+  *background-color: #003bb3;
+}
+
+.btn-primary:active,
+.btn-primary.active {
+  background-color: #003399 \9;
+}
+
+.btn-warning {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #faa732;
+  *background-color: #f89406;
+  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
+  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
+  background-image: -o-linear-gradient(top, #fbb450, #f89406);
+  background-image: linear-gradient(to bottom, #fbb450, #f89406);
+  background-repeat: repeat-x;
+  border-color: #f89406 #f89406 #ad6704;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.btn-warning:hover,
+.btn-warning:focus,
+.btn-warning:active,
+.btn-warning.active,
+.btn-warning.disabled,
+.btn-warning[disabled] {
+  color: #ffffff;
+  background-color: #f89406;
+  *background-color: #df8505;
+}
+
+.btn-warning:active,
+.btn-warning.active {
+  background-color: #c67605 \9;
+}
+
+.btn-danger {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #da4f49;
+  *background-color: #bd362f;
+  background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: -o-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: linear-gradient(to bottom, #ee5f5b, #bd362f);
+  background-repeat: repeat-x;
+  border-color: #bd362f #bd362f #802420;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.btn-danger:hover,
+.btn-danger:focus,
+.btn-danger:active,
+.btn-danger.active,
+.btn-danger.disabled,
+.btn-danger[disabled] {
+  color: #ffffff;
+  background-color: #bd362f;
+  *background-color: #a9302a;
+}
+
+.btn-danger:active,
+.btn-danger.active {
+  background-color: #942a25 \9;
+}
+
+.btn-success {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #5bb75b;
+  *background-color: #51a351;
+  background-image: -moz-linear-gradient(top, #62c462, #51a351);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));
+  background-image: -webkit-linear-gradient(top, #62c462, #51a351);
+  background-image: -o-linear-gradient(top, #62c462, #51a351);
+  background-image: linear-gradient(to bottom, #62c462, #51a351);
+  background-repeat: repeat-x;
+  border-color: #51a351 #51a351 #387038;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.btn-success:hover,
+.btn-success:focus,
+.btn-success:active,
+.btn-success.active,
+.btn-success.disabled,
+.btn-success[disabled] {
+  color: #ffffff;
+  background-color: #51a351;
+  *background-color: #499249;
+}
+
+.btn-success:active,
+.btn-success.active {
+  background-color: #408140 \9;
+}
+
+.btn-info {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #49afcd;
+  *background-color: #2f96b4;
+  background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));
+  background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: -o-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: linear-gradient(to bottom, #5bc0de, #2f96b4);
+  background-repeat: repeat-x;
+  border-color: #2f96b4 #2f96b4 #1f6377;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.btn-info:hover,
+.btn-info:focus,
+.btn-info:active,
+.btn-info.active,
+.btn-info.disabled,
+.btn-info[disabled] {
+  color: #ffffff;
+  background-color: #2f96b4;
+  *background-color: #2a85a0;
+}
+
+.btn-info:active,
+.btn-info.active {
+  background-color: #24748c \9;
+}
+
+.btn-inverse {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #363636;
+  *background-color: #222222;
+  background-image: -moz-linear-gradient(top, #444444, #222222);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222));
+  background-image: -webkit-linear-gradient(top, #444444, #222222);
+  background-image: -o-linear-gradient(top, #444444, #222222);
+  background-image: linear-gradient(to bottom, #444444, #222222);
+  background-repeat: repeat-x;
+  border-color: #222222 #222222 #000000;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.btn-inverse:hover,
+.btn-inverse:focus,
+.btn-inverse:active,
+.btn-inverse.active,
+.btn-inverse.disabled,
+.btn-inverse[disabled] {
+  color: #ffffff;
+  background-color: #222222;
+  *background-color: #151515;
+}
+
+.btn-inverse:active,
+.btn-inverse.active {
+  background-color: #080808 \9;
+}
+
+button.btn,
+input[type="submit"].btn {
+  *padding-top: 3px;
+  *padding-bottom: 3px;
+}
+
+button.btn::-moz-focus-inner,
+input[type="submit"].btn::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+
+button.btn.btn-large,
+input[type="submit"].btn.btn-large {
+  *padding-top: 7px;
+  *padding-bottom: 7px;
+}
+
+button.btn.btn-small,
+input[type="submit"].btn.btn-small {
+  *padding-top: 3px;
+  *padding-bottom: 3px;
+}
+
+button.btn.btn-mini,
+input[type="submit"].btn.btn-mini {
+  *padding-top: 1px;
+  *padding-bottom: 1px;
+}
+
+.btn-link,
+.btn-link:active,
+.btn-link[disabled] {
+  background-color: transparent;
+  background-image: none;
+  -webkit-box-shadow: none;
+     -moz-box-shadow: none;
+          box-shadow: none;
+}
+
+.btn-link {
+  color: #0088cc;
+  cursor: pointer;
+  border-color: transparent;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.btn-link:hover,
+.btn-link:focus {
+  color: #005580;
+  text-decoration: underline;
+  background-color: transparent;
+}
+
+.btn-link[disabled]:hover,
+.btn-link[disabled]:focus {
+  color: #333333;
+  text-decoration: none;
+}
+
+.btn-group {
+  position: relative;
+  display: inline-block;
+  *display: inline;
+  *margin-left: .3em;
+  font-size: 0;
+  white-space: nowrap;
+  vertical-align: middle;
+  *zoom: 1;
+}
+
+.btn-group:first-child {
+  *margin-left: 0;
+}
+
+.btn-group + .btn-group {
+  margin-left: 5px;
+}
+
+.btn-toolbar {
+  margin-top: 10px;
+  margin-bottom: 10px;
+  font-size: 0;
+}
+
+.btn-toolbar > .btn + .btn,
+.btn-toolbar > .btn-group + .btn,
+.btn-toolbar > .btn + .btn-group {
+  margin-left: 5px;
+}
+
+.btn-group > .btn {
+  position: relative;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.btn-group > .btn + .btn {
+  margin-left: -1px;
+}
+
+.btn-group > .btn,
+.btn-group > .dropdown-menu,
+.btn-group > .popover {
+  font-size: 14px;
+}
+
+.btn-group > .btn-mini {
+  font-size: 10.5px;
+}
+
+.btn-group > .btn-small {
+  font-size: 11.9px;
+}
+
+.btn-group > .btn-large {
+  font-size: 17.5px;
+}
+
+.btn-group > .btn:first-child {
+  margin-left: 0;
+  -webkit-border-bottom-left-radius: 4px;
+          border-bottom-left-radius: 4px;
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.btn-group > .btn:last-child,
+.btn-group > .dropdown-toggle {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+          border-bottom-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -moz-border-radius-bottomright: 4px;
+}
+
+.btn-group > .btn.large:first-child {
+  margin-left: 0;
+  -webkit-border-bottom-left-radius: 6px;
+          border-bottom-left-radius: 6px;
+  -webkit-border-top-left-radius: 6px;
+          border-top-left-radius: 6px;
+  -moz-border-radius-bottomleft: 6px;
+  -moz-border-radius-topleft: 6px;
+}
+
+.btn-group > .btn.large:last-child,
+.btn-group > .large.dropdown-toggle {
+  -webkit-border-top-right-radius: 6px;
+          border-top-right-radius: 6px;
+  -webkit-border-bottom-right-radius: 6px;
+          border-bottom-right-radius: 6px;
+  -moz-border-radius-topright: 6px;
+  -moz-border-radius-bottomright: 6px;
+}
+
+.btn-group > .btn:hover,
+.btn-group > .btn:focus,
+.btn-group > .btn:active,
+.btn-group > .btn.active {
+  z-index: 2;
+}
+
+.btn-group .dropdown-toggle:active,
+.btn-group.open .dropdown-toggle {
+  outline: 0;
+}
+
+.btn-group > .btn + .dropdown-toggle {
+  *padding-top: 5px;
+  padding-right: 8px;
+  *padding-bottom: 5px;
+  padding-left: 8px;
+  -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn-group > .btn-mini + .dropdown-toggle {
+  *padding-top: 2px;
+  padding-right: 5px;
+  *padding-bottom: 2px;
+  padding-left: 5px;
+}
+
+.btn-group > .btn-small + .dropdown-toggle {
+  *padding-top: 5px;
+  *padding-bottom: 4px;
+}
+
+.btn-group > .btn-large + .dropdown-toggle {
+  *padding-top: 7px;
+  padding-right: 12px;
+  *padding-bottom: 7px;
+  padding-left: 12px;
+}
+
+.btn-group.open .dropdown-toggle {
+  background-image: none;
+  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn-group.open .btn.dropdown-toggle {
+  background-color: #e6e6e6;
+}
+
+.btn-group.open .btn-primary.dropdown-toggle {
+  background-color: #0044cc;
+}
+
+.btn-group.open .btn-warning.dropdown-toggle {
+  background-color: #f89406;
+}
+
+.btn-group.open .btn-danger.dropdown-toggle {
+  background-color: #bd362f;
+}
+
+.btn-group.open .btn-success.dropdown-toggle {
+  background-color: #51a351;
+}
+
+.btn-group.open .btn-info.dropdown-toggle {
+  background-color: #2f96b4;
+}
+
+.btn-group.open .btn-inverse.dropdown-toggle {
+  background-color: #222222;
+}
+
+.btn .caret {
+  margin-top: 8px;
+  margin-left: 0;
+}
+
+.btn-large .caret {
+  margin-top: 6px;
+}
+
+.btn-large .caret {
+  border-top-width: 5px;
+  border-right-width: 5px;
+  border-left-width: 5px;
+}
+
+.btn-mini .caret,
+.btn-small .caret {
+  margin-top: 8px;
+}
+
+.dropup .btn-large .caret {
+  border-bottom-width: 5px;
+}
+
+.btn-primary .caret,
+.btn-warning .caret,
+.btn-danger .caret,
+.btn-info .caret,
+.btn-success .caret,
+.btn-inverse .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+}
+
+.btn-group-vertical {
+  display: inline-block;
+  *display: inline;
+  /* IE7 inline-block hack */
+
+  *zoom: 1;
+}
+
+.btn-group-vertical > .btn {
+  display: block;
+  float: none;
+  max-width: 100%;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.btn-group-vertical > .btn + .btn {
+  margin-top: -1px;
+  margin-left: 0;
+}
+
+.btn-group-vertical > .btn:first-child {
+  -webkit-border-radius: 4px 4px 0 0;
+     -moz-border-radius: 4px 4px 0 0;
+          border-radius: 4px 4px 0 0;
+}
+
+.btn-group-vertical > .btn:last-child {
+  -webkit-border-radius: 0 0 4px 4px;
+     -moz-border-radius: 0 0 4px 4px;
+          border-radius: 0 0 4px 4px;
+}
+
+.btn-group-vertical > .btn-large:first-child {
+  -webkit-border-radius: 6px 6px 0 0;
+     -moz-border-radius: 6px 6px 0 0;
+          border-radius: 6px 6px 0 0;
+}
+
+.btn-group-vertical > .btn-large:last-child {
+  -webkit-border-radius: 0 0 6px 6px;
+     -moz-border-radius: 0 0 6px 6px;
+          border-radius: 0 0 6px 6px;
+}
+
+.alert {
+  padding: 8px 35px 8px 14px;
+  margin-bottom: 20px;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  background-color: #fcf8e3;
+  border: 1px solid #fbeed5;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.alert,
+.alert h4 {
+  color: #c09853;
+}
+
+.alert h4 {
+  margin: 0;
+}
+
+.alert .close {
+  position: relative;
+  top: -2px;
+  right: -21px;
+  line-height: 20px;
+}
+
+.alert-success {
+  color: #468847;
+  background-color: #dff0d8;
+  border-color: #d6e9c6;
+}
+
+.alert-success h4 {
+  color: #468847;
+}
+
+.alert-danger,
+.alert-error {
+  color: #b94a48;
+  background-color: #f2dede;
+  border-color: #eed3d7;
+}
+
+.alert-danger h4,
+.alert-error h4 {
+  color: #b94a48;
+}
+
+.alert-info {
+  color: #3a87ad;
+  background-color: #d9edf7;
+  border-color: #bce8f1;
+}
+
+.alert-info h4 {
+  color: #3a87ad;
+}
+
+.alert-block {
+  padding-top: 14px;
+  padding-bottom: 14px;
+}
+
+.alert-block > p,
+.alert-block > ul {
+  margin-bottom: 0;
+}
+
+.alert-block p + p {
+  margin-top: 5px;
+}
+
+.nav {
+  margin-bottom: 20px;
+  margin-left: 0;
+  list-style: none;
+}
+
+.nav > li > a {
+  display: block;
+}
+
+.nav > li > a:hover,
+.nav > li > a:focus {
+  text-decoration: none;
+  background-color: #eeeeee;
+}
+
+.nav > li > a > img {
+  max-width: none;
+}
+
+.nav > .pull-right {
+  float: right;
+}
+
+.nav-header {
+  display: block;
+  padding: 3px 15px;
+  font-size: 11px;
+  font-weight: bold;
+  line-height: 20px;
+  color: #999999;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  text-transform: uppercase;
+}
+
+.nav li + .nav-header {
+  margin-top: 9px;
+}
+
+.nav-list {
+  padding-right: 15px;
+  padding-left: 15px;
+  margin-bottom: 0;
+}
+
+.nav-list > li > a,
+.nav-list .nav-header {
+  margin-right: -15px;
+  margin-left: -15px;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+}
+
+.nav-list > li > a {
+  padding: 3px 15px;
+}
+
+.nav-list > .active > a,
+.nav-list > .active > a:hover,
+.nav-list > .active > a:focus {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
+  background-color: #0088cc;
+}
+
+.nav-list [class^="icon-"],
+.nav-list [class*=" icon-"] {
+  margin-right: 2px;
+}
+
+.nav-list .divider {
+  *width: 100%;
+  height: 1px;
+  margin: 9px 1px;
+  *margin: -5px 0 5px;
+  overflow: hidden;
+  background-color: #e5e5e5;
+  border-bottom: 1px solid #ffffff;
+}
+
+.nav-tabs,
+.nav-pills {
+  *zoom: 1;
+}
+
+.nav-tabs:before,
+.nav-pills:before,
+.nav-tabs:after,
+.nav-pills:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.nav-tabs:after,
+.nav-pills:after {
+  clear: both;
+}
+
+.nav-tabs > li,
+.nav-pills > li {
+  float: left;
+}
+
+.nav-tabs > li > a,
+.nav-pills > li > a {
+  padding-right: 12px;
+  padding-left: 12px;
+  margin-right: 2px;
+  line-height: 14px;
+}
+
+.nav-tabs {
+  border-bottom: 1px solid #ddd;
+}
+
+.nav-tabs > li {
+  margin-bottom: -1px;
+}
+
+.nav-tabs > li > a {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  line-height: 20px;
+  border: 1px solid transparent;
+  -webkit-border-radius: 4px 4px 0 0;
+     -moz-border-radius: 4px 4px 0 0;
+          border-radius: 4px 4px 0 0;
+}
+
+.nav-tabs > li > a:hover,
+.nav-tabs > li > a:focus {
+  border-color: #eeeeee #eeeeee #dddddd;
+}
+
+.nav-tabs > .active > a,
+.nav-tabs > .active > a:hover,
+.nav-tabs > .active > a:focus {
+  color: #555555;
+  cursor: default;
+  background-color: #ffffff;
+  border: 1px solid #ddd;
+  border-bottom-color: transparent;
+}
+
+.nav-pills > li > a {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+  -webkit-border-radius: 5px;
+     -moz-border-radius: 5px;
+          border-radius: 5px;
+}
+
+.nav-pills > .active > a,
+.nav-pills > .active > a:hover,
+.nav-pills > .active > a:focus {
+  color: #ffffff;
+  background-color: #0088cc;
+}
+
+.nav-stacked > li {
+  float: none;
+}
+
+.nav-stacked > li > a {
+  margin-right: 0;
+}
+
+.nav-tabs.nav-stacked {
+  border-bottom: 0;
+}
+
+.nav-tabs.nav-stacked > li > a {
+  border: 1px solid #ddd;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.nav-tabs.nav-stacked > li:first-child > a {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.nav-tabs.nav-stacked > li:last-child > a {
+  -webkit-border-bottom-right-radius: 4px;
+          border-bottom-right-radius: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+          border-bottom-left-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+  -moz-border-radius-bottomleft: 4px;
+}
+
+.nav-tabs.nav-stacked > li > a:hover,
+.nav-tabs.nav-stacked > li > a:focus {
+  z-index: 2;
+  border-color: #ddd;
+}
+
+.nav-pills.nav-stacked > li > a {
+  margin-bottom: 3px;
+}
+
+.nav-pills.nav-stacked > li:last-child > a {
+  margin-bottom: 1px;
+}
+
+.nav-tabs .dropdown-menu {
+  -webkit-border-radius: 0 0 6px 6px;
+     -moz-border-radius: 0 0 6px 6px;
+          border-radius: 0 0 6px 6px;
+}
+
+.nav-pills .dropdown-menu {
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.nav .dropdown-toggle .caret {
+  margin-top: 6px;
+  border-top-color: #0088cc;
+  border-bottom-color: #0088cc;
+}
+
+.nav .dropdown-toggle:hover .caret,
+.nav .dropdown-toggle:focus .caret {
+  border-top-color: #005580;
+  border-bottom-color: #005580;
+}
+
+/* move down carets for tabs */
+
+.nav-tabs .dropdown-toggle .caret {
+  margin-top: 8px;
+}
+
+.nav .active .dropdown-toggle .caret {
+  border-top-color: #fff;
+  border-bottom-color: #fff;
+}
+
+.nav-tabs .active .dropdown-toggle .caret {
+  border-top-color: #555555;
+  border-bottom-color: #555555;
+}
+
+.nav > .dropdown.active > a:hover,
+.nav > .dropdown.active > a:focus {
+  cursor: pointer;
+}
+
+.nav-tabs .open .dropdown-toggle,
+.nav-pills .open .dropdown-toggle,
+.nav > li.dropdown.open.active > a:hover,
+.nav > li.dropdown.open.active > a:focus {
+  color: #ffffff;
+  background-color: #999999;
+  border-color: #999999;
+}
+
+.nav li.dropdown.open .caret,
+.nav li.dropdown.open.active .caret,
+.nav li.dropdown.open a:hover .caret,
+.nav li.dropdown.open a:focus .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+  opacity: 1;
+  filter: alpha(opacity=100);
+}
+
+.tabs-stacked .open > a:hover,
+.tabs-stacked .open > a:focus {
+  border-color: #999999;
+}
+
+.tabbable {
+  *zoom: 1;
+}
+
+.tabbable:before,
+.tabbable:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.tabbable:after {
+  clear: both;
+}
+
+.tab-content {
+  overflow: auto;
+}
+
+.tabs-below > .nav-tabs,
+.tabs-right > .nav-tabs,
+.tabs-left > .nav-tabs {
+  border-bottom: 0;
+}
+
+.tab-content > .tab-pane,
+.pill-content > .pill-pane {
+  display: none;
+}
+
+.tab-content > .active,
+.pill-content > .active {
+  display: block;
+}
+
+.tabs-below > .nav-tabs {
+  border-top: 1px solid #ddd;
+}
+
+.tabs-below > .nav-tabs > li {
+  margin-top: -1px;
+  margin-bottom: 0;
+}
+
+.tabs-below > .nav-tabs > li > a {
+  -webkit-border-radius: 0 0 4px 4px;
+     -moz-border-radius: 0 0 4px 4px;
+          border-radius: 0 0 4px 4px;
+}
+
+.tabs-below > .nav-tabs > li > a:hover,
+.tabs-below > .nav-tabs > li > a:focus {
+  border-top-color: #ddd;
+  border-bottom-color: transparent;
+}
+
+.tabs-below > .nav-tabs > .active > a,
+.tabs-below > .nav-tabs > .active > a:hover,
+.tabs-below > .nav-tabs > .active > a:focus {
+  border-color: transparent #ddd #ddd #ddd;
+}
+
+.tabs-left > .nav-tabs > li,
+.tabs-right > .nav-tabs > li {
+  float: none;
+}
+
+.tabs-left > .nav-tabs > li > a,
+.tabs-right > .nav-tabs > li > a {
+  min-width: 74px;
+  margin-right: 0;
+  margin-bottom: 3px;
+}
+
+.tabs-left > .nav-tabs {
+  float: left;
+  margin-right: 19px;
+  border-right: 1px solid #ddd;
+}
+
+.tabs-left > .nav-tabs > li > a {
+  margin-right: -1px;
+  -webkit-border-radius: 4px 0 0 4px;
+     -moz-border-radius: 4px 0 0 4px;
+          border-radius: 4px 0 0 4px;
+}
+
+.tabs-left > .nav-tabs > li > a:hover,
+.tabs-left > .nav-tabs > li > a:focus {
+  border-color: #eeeeee #dddddd #eeeeee #eeeeee;
+}
+
+.tabs-left > .nav-tabs .active > a,
+.tabs-left > .nav-tabs .active > a:hover,
+.tabs-left > .nav-tabs .active > a:focus {
+  border-color: #ddd transparent #ddd #ddd;
+  *border-right-color: #ffffff;
+}
+
+.tabs-right > .nav-tabs {
+  float: right;
+  margin-left: 19px;
+  border-left: 1px solid #ddd;
+}
+
+.tabs-right > .nav-tabs > li > a {
+  margin-left: -1px;
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.tabs-right > .nav-tabs > li > a:hover,
+.tabs-right > .nav-tabs > li > a:focus {
+  border-color: #eeeeee #eeeeee #eeeeee #dddddd;
+}
+
+.tabs-right > .nav-tabs .active > a,
+.tabs-right > .nav-tabs .active > a:hover,
+.tabs-right > .nav-tabs .active > a:focus {
+  border-color: #ddd #ddd #ddd transparent;
+  *border-left-color: #ffffff;
+}
+
+.nav > .disabled > a {
+  color: #999999;
+}
+
+.nav > .disabled > a:hover,
+.nav > .disabled > a:focus {
+  text-decoration: none;
+  cursor: default;
+  background-color: transparent;
+}
+
+.navbar {
+  *position: relative;
+  *z-index: 2;
+  margin-bottom: 20px;
+  overflow: visible;
+}
+
+.navbar-inner {
+  min-height: 40px;
+  padding-right: 20px;
+  padding-left: 20px;
+  background-color: #fafafa;
+  background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2));
+  background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2);
+  background-image: -o-linear-gradient(top, #ffffff, #f2f2f2);
+  background-image: linear-gradient(to bottom, #ffffff, #f2f2f2);
+  background-repeat: repeat-x;
+  border: 1px solid #d4d4d4;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
+  *zoom: 1;
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
+     -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
+          box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
+}
+
+.navbar-inner:before,
+.navbar-inner:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.navbar-inner:after {
+  clear: both;
+}
+
+.navbar .container {
+  width: auto;
+}
+
+.nav-collapse.collapse {
+  height: auto;
+  overflow: visible;
+}
+
+.navbar .brand {
+  display: block;
+  float: left;
+  padding: 10px 20px 10px;
+  margin-left: -20px;
+  font-size: 20px;
+  font-weight: 200;
+  color: #777777;
+  text-shadow: 0 1px 0 #ffffff;
+}
+
+.navbar .brand:hover,
+.navbar .brand:focus {
+  text-decoration: none;
+}
+
+.navbar-text {
+  margin-bottom: 0;
+  line-height: 40px;
+  color: #777777;
+}
+
+.navbar-link {
+  color: #777777;
+}
+
+.navbar-link:hover,
+.navbar-link:focus {
+  color: #333333;
+}
+
+.navbar .divider-vertical {
+  height: 40px;
+  margin: 0 9px;
+  border-right: 1px solid #ffffff;
+  border-left: 1px solid #f2f2f2;
+}
+
+.navbar .btn,
+.navbar .btn-group {
+  margin-top: 5px;
+}
+
+.navbar .btn-group .btn,
+.navbar .input-prepend .btn,
+.navbar .input-append .btn,
+.navbar .input-prepend .btn-group,
+.navbar .input-append .btn-group {
+  margin-top: 0;
+}
+
+.navbar-form {
+  margin-bottom: 0;
+  *zoom: 1;
+}
+
+.navbar-form:before,
+.navbar-form:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.navbar-form:after {
+  clear: both;
+}
+
+.navbar-form input,
+.navbar-form select,
+.navbar-form .radio,
+.navbar-form .checkbox {
+  margin-top: 5px;
+}
+
+.navbar-form input,
+.navbar-form select,
+.navbar-form .btn {
+  display: inline-block;
+  margin-bottom: 0;
+}
+
+.navbar-form input[type="image"],
+.navbar-form input[type="checkbox"],
+.navbar-form input[type="radio"] {
+  margin-top: 3px;
+}
+
+.navbar-form .input-append,
+.navbar-form .input-prepend {
+  margin-top: 5px;
+  white-space: nowrap;
+}
+
+.navbar-form .input-append input,
+.navbar-form .input-prepend input {
+  margin-top: 0;
+}
+
+.navbar-search {
+  position: relative;
+  float: left;
+  margin-top: 5px;
+  margin-bottom: 0;
+}
+
+.navbar-search .search-query {
+  padding: 4px 14px;
+  margin-bottom: 0;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  font-weight: normal;
+  line-height: 1;
+  -webkit-border-radius: 15px;
+     -moz-border-radius: 15px;
+          border-radius: 15px;
+}
+
+.navbar-static-top {
+  position: static;
+  margin-bottom: 0;
+}
+
+.navbar-static-top .navbar-inner {
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+  position: fixed;
+  right: 0;
+  left: 0;
+  z-index: 1030;
+  margin-bottom: 0;
+}
+
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner {
+  border-width: 0 0 1px;
+}
+
+.navbar-fixed-bottom .navbar-inner {
+  border-width: 1px 0 0;
+}
+
+.navbar-fixed-top .navbar-inner,
+.navbar-fixed-bottom .navbar-inner {
+  padding-right: 0;
+  padding-left: 0;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.navbar-static-top .container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+  width: 940px;
+}
+
+.navbar-fixed-top {
+  top: 0;
+}
+
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner {
+  -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
+          box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
+}
+
+.navbar-fixed-bottom {
+  bottom: 0;
+}
+
+.navbar-fixed-bottom .navbar-inner {
+  -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
+          box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
+}
+
+.navbar .nav {
+  position: relative;
+  left: 0;
+  display: block;
+  float: left;
+  margin: 0 10px 0 0;
+}
+
+.navbar .nav.pull-right {
+  float: right;
+  margin-right: 0;
+}
+
+.navbar .nav > li {
+  float: left;
+}
+
+.navbar .nav > li > a {
+  float: none;
+  padding: 10px 15px 10px;
+  color: #777777;
+  text-decoration: none;
+  text-shadow: 0 1px 0 #ffffff;
+}
+
+.navbar .nav .dropdown-toggle .caret {
+  margin-top: 8px;
+}
+
+.navbar .nav > li > a:focus,
+.navbar .nav > li > a:hover {
+  color: #333333;
+  text-decoration: none;
+  background-color: transparent;
+}
+
+.navbar .nav > .active > a,
+.navbar .nav > .active > a:hover,
+.navbar .nav > .active > a:focus {
+  color: #555555;
+  text-decoration: none;
+  background-color: #e5e5e5;
+  -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
+     -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
+          box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
+}
+
+.navbar .btn-navbar {
+  display: none;
+  float: right;
+  padding: 7px 10px;
+  margin-right: 5px;
+  margin-left: 5px;
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #ededed;
+  *background-color: #e5e5e5;
+  background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5));
+  background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5);
+  background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5);
+  background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5);
+  background-repeat: repeat-x;
+  border-color: #e5e5e5 #e5e5e5 #bfbfbf;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+     -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+}
+
+.navbar .btn-navbar:hover,
+.navbar .btn-navbar:focus,
+.navbar .btn-navbar:active,
+.navbar .btn-navbar.active,
+.navbar .btn-navbar.disabled,
+.navbar .btn-navbar[disabled] {
+  color: #ffffff;
+  background-color: #e5e5e5;
+  *background-color: #d9d9d9;
+}
+
+.navbar .btn-navbar:active,
+.navbar .btn-navbar.active {
+  background-color: #cccccc \9;
+}
+
+.navbar .btn-navbar .icon-bar {
+  display: block;
+  width: 18px;
+  height: 2px;
+  background-color: #f5f5f5;
+  -webkit-border-radius: 1px;
+     -moz-border-radius: 1px;
+          border-radius: 1px;
+  -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+     -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+          box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.btn-navbar .icon-bar + .icon-bar {
+  margin-top: 3px;
+}
+
+.navbar .nav > li > .dropdown-menu:before {
+  position: absolute;
+  top: -7px;
+  left: 9px;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.navbar .nav > li > .dropdown-menu:after {
+  position: absolute;
+  top: -6px;
+  left: 10px;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #ffffff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
+.navbar-fixed-bottom .nav > li > .dropdown-menu:before {
+  top: auto;
+  bottom: -7px;
+  border-top: 7px solid #ccc;
+  border-bottom: 0;
+  border-top-color: rgba(0, 0, 0, 0.2);
+}
+
+.navbar-fixed-bottom .nav > li > .dropdown-menu:after {
+  top: auto;
+  bottom: -6px;
+  border-top: 6px solid #ffffff;
+  border-bottom: 0;
+}
+
+.navbar .nav li.dropdown > a:hover .caret,
+.navbar .nav li.dropdown > a:focus .caret {
+  border-top-color: #333333;
+  border-bottom-color: #333333;
+}
+
+.navbar .nav li.dropdown.open > .dropdown-toggle,
+.navbar .nav li.dropdown.active > .dropdown-toggle,
+.navbar .nav li.dropdown.open.active > .dropdown-toggle {
+  color: #555555;
+  background-color: #e5e5e5;
+}
+
+.navbar .nav li.dropdown > .dropdown-toggle .caret {
+  border-top-color: #777777;
+  border-bottom-color: #777777;
+}
+
+.navbar .nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar .nav li.dropdown.active > .dropdown-toggle .caret,
+.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret {
+  border-top-color: #555555;
+  border-bottom-color: #555555;
+}
+
+.navbar .pull-right > li > .dropdown-menu,
+.navbar .nav > li > .dropdown-menu.pull-right {
+  right: 0;
+  left: auto;
+}
+
+.navbar .pull-right > li > .dropdown-menu:before,
+.navbar .nav > li > .dropdown-menu.pull-right:before {
+  right: 12px;
+  left: auto;
+}
+
+.navbar .pull-right > li > .dropdown-menu:after,
+.navbar .nav > li > .dropdown-menu.pull-right:after {
+  right: 13px;
+  left: auto;
+}
+
+.navbar .pull-right > li > .dropdown-menu .dropdown-menu,
+.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu {
+  right: 100%;
+  left: auto;
+  margin-right: -1px;
+  margin-left: 0;
+  -webkit-border-radius: 6px 0 6px 6px;
+     -moz-border-radius: 6px 0 6px 6px;
+          border-radius: 6px 0 6px 6px;
+}
+
+.navbar-inverse .navbar-inner {
+  background-color: #1b1b1b;
+  background-image: -moz-linear-gradient(top, #222222, #111111);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111));
+  background-image: -webkit-linear-gradient(top, #222222, #111111);
+  background-image: -o-linear-gradient(top, #222222, #111111);
+  background-image: linear-gradient(to bottom, #222222, #111111);
+  background-repeat: repeat-x;
+  border-color: #252525;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
+}
+
+.navbar-inverse .brand,
+.navbar-inverse .nav > li > a {
+  color: #999999;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.navbar-inverse .brand:hover,
+.navbar-inverse .nav > li > a:hover,
+.navbar-inverse .brand:focus,
+.navbar-inverse .nav > li > a:focus {
+  color: #ffffff;
+}
+
+.navbar-inverse .brand {
+  color: #999999;
+}
+
+.navbar-inverse .navbar-text {
+  color: #999999;
+}
+
+.navbar-inverse .nav > li > a:focus,
+.navbar-inverse .nav > li > a:hover {
+  color: #ffffff;
+  background-color: transparent;
+}
+
+.navbar-inverse .nav .active > a,
+.navbar-inverse .nav .active > a:hover,
+.navbar-inverse .nav .active > a:focus {
+  color: #ffffff;
+  background-color: #111111;
+}
+
+.navbar-inverse .navbar-link {
+  color: #999999;
+}
+
+.navbar-inverse .navbar-link:hover,
+.navbar-inverse .navbar-link:focus {
+  color: #ffffff;
+}
+
+.navbar-inverse .divider-vertical {
+  border-right-color: #222222;
+  border-left-color: #111111;
+}
+
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle,
+.navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
+.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
+  color: #ffffff;
+  background-color: #111111;
+}
+
+.navbar-inverse .nav li.dropdown > a:hover .caret,
+.navbar-inverse .nav li.dropdown > a:focus .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+}
+
+.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret {
+  border-top-color: #999999;
+  border-bottom-color: #999999;
+}
+
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret,
+.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+}
+
+.navbar-inverse .navbar-search .search-query {
+  color: #ffffff;
+  background-color: #515151;
+  border-color: #111111;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
+     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
+          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
+  -webkit-transition: none;
+     -moz-transition: none;
+       -o-transition: none;
+          transition: none;
+}
+
+.navbar-inverse .navbar-search .search-query:-moz-placeholder {
+  color: #cccccc;
+}
+
+.navbar-inverse .navbar-search .search-query:-ms-input-placeholder {
+  color: #cccccc;
+}
+
+.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder {
+  color: #cccccc;
+}
+
+.navbar-inverse .navbar-search .search-query:focus,
+.navbar-inverse .navbar-search .search-query.focused {
+  padding: 5px 15px;
+  color: #333333;
+  text-shadow: 0 1px 0 #ffffff;
+  background-color: #ffffff;
+  border: 0;
+  outline: 0;
+  -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+     -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+          box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+}
+
+.navbar-inverse .btn-navbar {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #0e0e0e;
+  *background-color: #040404;
+  background-image: -moz-linear-gradient(top, #151515, #040404);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404));
+  background-image: -webkit-linear-gradient(top, #151515, #040404);
+  background-image: -o-linear-gradient(top, #151515, #040404);
+  background-image: linear-gradient(to bottom, #151515, #040404);
+  background-repeat: repeat-x;
+  border-color: #040404 #040404 #000000;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.navbar-inverse .btn-navbar:hover,
+.navbar-inverse .btn-navbar:focus,
+.navbar-inverse .btn-navbar:active,
+.navbar-inverse .btn-navbar.active,
+.navbar-inverse .btn-navbar.disabled,
+.navbar-inverse .btn-navbar[disabled] {
+  color: #ffffff;
+  background-color: #040404;
+  *background-color: #000000;
+}
+
+.navbar-inverse .btn-navbar:active,
+.navbar-inverse .btn-navbar.active {
+  background-color: #000000 \9;
+}
+
+.breadcrumb {
+  padding: 8px 15px;
+  margin: 0 0 20px;
+  list-style: none;
+  background-color: #f5f5f5;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.breadcrumb > li {
+  display: inline-block;
+  *display: inline;
+  text-shadow: 0 1px 0 #ffffff;
+  *zoom: 1;
+}
+
+.breadcrumb > li > .divider {
+  padding: 0 5px;
+  color: #ccc;
+}
+
+.breadcrumb > .active {
+  color: #999999;
+}
+
+.pagination {
+  margin: 20px 0;
+}
+
+.pagination ul {
+  display: inline-block;
+  *display: inline;
+  margin-bottom: 0;
+  margin-left: 0;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  *zoom: 1;
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.pagination ul > li {
+  display: inline;
+}
+
+.pagination ul > li > a,
+.pagination ul > li > span {
+  float: left;
+  padding: 4px 12px;
+  line-height: 20px;
+  text-decoration: none;
+  background-color: #ffffff;
+  border: 1px solid #dddddd;
+  border-left-width: 0;
+}
+
+.pagination ul > li > a:hover,
+.pagination ul > li > a:focus,
+.pagination ul > .active > a,
+.pagination ul > .active > span {
+  background-color: #f5f5f5;
+}
+
+.pagination ul > .active > a,
+.pagination ul > .active > span {
+  color: #999999;
+  cursor: default;
+}
+
+.pagination ul > .disabled > span,
+.pagination ul > .disabled > a,
+.pagination ul > .disabled > a:hover,
+.pagination ul > .disabled > a:focus {
+  color: #999999;
+  cursor: default;
+  background-color: transparent;
+}
+
+.pagination ul > li:first-child > a,
+.pagination ul > li:first-child > span {
+  border-left-width: 1px;
+  -webkit-border-bottom-left-radius: 4px;
+          border-bottom-left-radius: 4px;
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.pagination ul > li:last-child > a,
+.pagination ul > li:last-child > span {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+          border-bottom-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -moz-border-radius-bottomright: 4px;
+}
+
+.pagination-centered {
+  text-align: center;
+}
+
+.pagination-right {
+  text-align: right;
+}
+
+.pagination-large ul > li > a,
+.pagination-large ul > li > span {
+  padding: 11px 19px;
+  font-size: 17.5px;
+}
+
+.pagination-large ul > li:first-child > a,
+.pagination-large ul > li:first-child > span {
+  -webkit-border-bottom-left-radius: 6px;
+          border-bottom-left-radius: 6px;
+  -webkit-border-top-left-radius: 6px;
+          border-top-left-radius: 6px;
+  -moz-border-radius-bottomleft: 6px;
+  -moz-border-radius-topleft: 6px;
+}
+
+.pagination-large ul > li:last-child > a,
+.pagination-large ul > li:last-child > span {
+  -webkit-border-top-right-radius: 6px;
+          border-top-right-radius: 6px;
+  -webkit-border-bottom-right-radius: 6px;
+          border-bottom-right-radius: 6px;
+  -moz-border-radius-topright: 6px;
+  -moz-border-radius-bottomright: 6px;
+}
+
+.pagination-mini ul > li:first-child > a,
+.pagination-small ul > li:first-child > a,
+.pagination-mini ul > li:first-child > span,
+.pagination-small ul > li:first-child > span {
+  -webkit-border-bottom-left-radius: 3px;
+          border-bottom-left-radius: 3px;
+  -webkit-border-top-left-radius: 3px;
+          border-top-left-radius: 3px;
+  -moz-border-radius-bottomleft: 3px;
+  -moz-border-radius-topleft: 3px;
+}
+
+.pagination-mini ul > li:last-child > a,
+.pagination-small ul > li:last-child > a,
+.pagination-mini ul > li:last-child > span,
+.pagination-small ul > li:last-child > span {
+  -webkit-border-top-right-radius: 3px;
+          border-top-right-radius: 3px;
+  -webkit-border-bottom-right-radius: 3px;
+          border-bottom-right-radius: 3px;
+  -moz-border-radius-topright: 3px;
+  -moz-border-radius-bottomright: 3px;
+}
+
+.pagination-small ul > li > a,
+.pagination-small ul > li > span {
+  padding: 2px 10px;
+  font-size: 11.9px;
+}
+
+.pagination-mini ul > li > a,
+.pagination-mini ul > li > span {
+  padding: 0 6px;
+  font-size: 10.5px;
+}
+
+.pager {
+  margin: 20px 0;
+  text-align: center;
+  list-style: none;
+  *zoom: 1;
+}
+
+.pager:before,
+.pager:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.pager:after {
+  clear: both;
+}
+
+.pager li {
+  display: inline;
+}
+
+.pager li > a,
+.pager li > span {
+  display: inline-block;
+  padding: 5px 14px;
+  background-color: #fff;
+  border: 1px solid #ddd;
+  -webkit-border-radius: 15px;
+     -moz-border-radius: 15px;
+          border-radius: 15px;
+}
+
+.pager li > a:hover,
+.pager li > a:focus {
+  text-decoration: none;
+  background-color: #f5f5f5;
+}
+
+.pager .next > a,
+.pager .next > span {
+  float: right;
+}
+
+.pager .previous > a,
+.pager .previous > span {
+  float: left;
+}
+
+.pager .disabled > a,
+.pager .disabled > a:hover,
+.pager .disabled > a:focus,
+.pager .disabled > span {
+  color: #999999;
+  cursor: default;
+  background-color: #fff;
+}
+
+.modal-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1040;
+  background-color: #000000;
+}
+
+.modal-backdrop.fade {
+  opacity: 0;
+}
+
+.modal-backdrop,
+.modal-backdrop.fade.in {
+  opacity: 0.8;
+  filter: alpha(opacity=80);
+}
+
+.modal {
+  position: fixed;
+  top: 10%;
+  left: 50%;
+  z-index: 1050;
+  width: 560px;
+  margin-left: -280px;
+  background-color: #ffffff;
+  border: 1px solid #999;
+  border: 1px solid rgba(0, 0, 0, 0.3);
+  *border: 1px solid #999;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+  outline: none;
+  -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+     -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+          box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding-box;
+          background-clip: padding-box;
+}
+
+.modal.fade {
+  top: -25%;
+  -webkit-transition: opacity 0.3s linear, top 0.3s ease-out;
+     -moz-transition: opacity 0.3s linear, top 0.3s ease-out;
+       -o-transition: opacity 0.3s linear, top 0.3s ease-out;
+          transition: opacity 0.3s linear, top 0.3s ease-out;
+}
+
+.modal.fade.in {
+  top: 10%;
+}
+
+.modal-header {
+  padding: 9px 15px;
+  border-bottom: 1px solid #eee;
+}
+
+.modal-header .close {
+  margin-top: 2px;
+}
+
+.modal-header h3 {
+  margin: 0;
+  line-height: 30px;
+}
+
+.modal-body {
+  position: relative;
+  max-height: 400px;
+  padding: 15px;
+  overflow-y: auto;
+}
+
+.modal-form {
+  margin-bottom: 0;
+}
+
+.modal-footer {
+  padding: 14px 15px 15px;
+  margin-bottom: 0;
+  text-align: right;
+  background-color: #f5f5f5;
+  border-top: 1px solid #ddd;
+  -webkit-border-radius: 0 0 6px 6px;
+     -moz-border-radius: 0 0 6px 6px;
+          border-radius: 0 0 6px 6px;
+  *zoom: 1;
+  -webkit-box-shadow: inset 0 1px 0 #ffffff;
+     -moz-box-shadow: inset 0 1px 0 #ffffff;
+          box-shadow: inset 0 1px 0 #ffffff;
+}
+
+.modal-footer:before,
+.modal-footer:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.modal-footer:after {
+  clear: both;
+}
+
+.modal-footer .btn + .btn {
+  margin-bottom: 0;
+  margin-left: 5px;
+}
+
+.modal-footer .btn-group .btn + .btn {
+  margin-left: -1px;
+}
+
+.modal-footer .btn-block + .btn-block {
+  margin-left: 0;
+}
+
+.tooltip {
+  position: absolute;
+  z-index: 1030;
+  display: block;
+  font-size: 11px;
+  line-height: 1.4;
+  opacity: 0;
+  filter: alpha(opacity=0);
+  visibility: visible;
+}
+
+.tooltip.in {
+  opacity: 0.8;
+  filter: alpha(opacity=80);
+}
+
+.tooltip.top {
+  padding: 5px 0;
+  margin-top: -3px;
+}
+
+.tooltip.right {
+  padding: 0 5px;
+  margin-left: 3px;
+}
+
+.tooltip.bottom {
+  padding: 5px 0;
+  margin-top: 3px;
+}
+
+.tooltip.left {
+  padding: 0 5px;
+  margin-left: -3px;
+}
+
+.tooltip-inner {
+  max-width: 200px;
+  padding: 8px;
+  color: #ffffff;
+  text-align: center;
+  text-decoration: none;
+  background-color: #000000;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.tooltip-arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+}
+
+.tooltip.top .tooltip-arrow {
+  bottom: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-top-color: #000000;
+  border-width: 5px 5px 0;
+}
+
+.tooltip.right .tooltip-arrow {
+  top: 50%;
+  left: 0;
+  margin-top: -5px;
+  border-right-color: #000000;
+  border-width: 5px 5px 5px 0;
+}
+
+.tooltip.left .tooltip-arrow {
+  top: 50%;
+  right: 0;
+  margin-top: -5px;
+  border-left-color: #000000;
+  border-width: 5px 0 5px 5px;
+}
+
+.tooltip.bottom .tooltip-arrow {
+  top: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-bottom-color: #000000;
+  border-width: 0 5px 5px;
+}
+
+.popover {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 1010;
+  display: none;
+  max-width: 276px;
+  padding: 1px;
+  text-align: left;
+  white-space: normal;
+  background-color: #ffffff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding;
+          background-clip: padding-box;
+}
+
+.popover.top {
+  margin-top: -10px;
+}
+
+.popover.right {
+  margin-left: 10px;
+}
+
+.popover.bottom {
+  margin-top: 10px;
+}
+
+.popover.left {
+  margin-left: -10px;
+}
+
+.popover-title {
+  padding: 8px 14px;
+  margin: 0;
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 18px;
+  background-color: #f7f7f7;
+  border-bottom: 1px solid #ebebeb;
+  -webkit-border-radius: 5px 5px 0 0;
+     -moz-border-radius: 5px 5px 0 0;
+          border-radius: 5px 5px 0 0;
+}
+
+.popover-title:empty {
+  display: none;
+}
+
+.popover-content {
+  padding: 9px 14px;
+}
+
+.popover .arrow,
+.popover .arrow:after {
+  position: absolute;
+  display: block;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+}
+
+.popover .arrow {
+  border-width: 11px;
+}
+
+.popover .arrow:after {
+  border-width: 10px;
+  content: "";
+}
+
+.popover.top .arrow {
+  bottom: -11px;
+  left: 50%;
+  margin-left: -11px;
+  border-top-color: #999;
+  border-top-color: rgba(0, 0, 0, 0.25);
+  border-bottom-width: 0;
+}
+
+.popover.top .arrow:after {
+  bottom: 1px;
+  margin-left: -10px;
+  border-top-color: #ffffff;
+  border-bottom-width: 0;
+}
+
+.popover.right .arrow {
+  top: 50%;
+  left: -11px;
+  margin-top: -11px;
+  border-right-color: #999;
+  border-right-color: rgba(0, 0, 0, 0.25);
+  border-left-width: 0;
+}
+
+.popover.right .arrow:after {
+  bottom: -10px;
+  left: 1px;
+  border-right-color: #ffffff;
+  border-left-width: 0;
+}
+
+.popover.bottom .arrow {
+  top: -11px;
+  left: 50%;
+  margin-left: -11px;
+  border-bottom-color: #999;
+  border-bottom-color: rgba(0, 0, 0, 0.25);
+  border-top-width: 0;
+}
+
+.popover.bottom .arrow:after {
+  top: 1px;
+  margin-left: -10px;
+  border-bottom-color: #ffffff;
+  border-top-width: 0;
+}
+
+.popover.left .arrow {
+  top: 50%;
+  right: -11px;
+  margin-top: -11px;
+  border-left-color: #999;
+  border-left-color: rgba(0, 0, 0, 0.25);
+  border-right-width: 0;
+}
+
+.popover.left .arrow:after {
+  right: 1px;
+  bottom: -10px;
+  border-left-color: #ffffff;
+  border-right-width: 0;
+}
+
+.thumbnails {
+  margin-left: -20px;
+  list-style: none;
+  *zoom: 1;
+}
+
+.thumbnails:before,
+.thumbnails:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.thumbnails:after {
+  clear: both;
+}
+
+.row-fluid .thumbnails {
+  margin-left: 0;
+}
+
+.thumbnails > li {
+  float: left;
+  margin-bottom: 20px;
+  margin-left: 20px;
+}
+
+.thumbnail {
+  display: block;
+  padding: 4px;
+  line-height: 20px;
+  border: 1px solid #ddd;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
+     -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
+          box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
+  -webkit-transition: all 0.2s ease-in-out;
+     -moz-transition: all 0.2s ease-in-out;
+       -o-transition: all 0.2s ease-in-out;
+          transition: all 0.2s ease-in-out;
+}
+
+a.thumbnail:hover,
+a.thumbnail:focus {
+  border-color: #0088cc;
+  -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+     -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+          box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+}
+
+.thumbnail > img {
+  display: block;
+  max-width: 100%;
+  margin-right: auto;
+  margin-left: auto;
+}
+
+.thumbnail .caption {
+  padding: 9px;
+  color: #555555;
+}
+
+.media,
+.media-body {
+  overflow: hidden;
+  *overflow: visible;
+  zoom: 1;
+}
+
+.media,
+.media .media {
+  margin-top: 15px;
+}
+
+.media:first-child {
+  margin-top: 0;
+}
+
+.media-object {
+  display: block;
+}
+
+.media-heading {
+  margin: 0 0 5px;
+}
+
+.media > .pull-left {
+  margin-right: 10px;
+}
+
+.media > .pull-right {
+  margin-left: 10px;
+}
+
+.media-list {
+  margin-left: 0;
+  list-style: none;
+}
+
+.label,
+.badge {
+  display: inline-block;
+  padding: 2px 4px;
+  font-size: 11.844px;
+  font-weight: bold;
+  line-height: 14px;
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  white-space: nowrap;
+  vertical-align: baseline;
+  background-color: #999999;
+}
+
+.label {
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+.badge {
+  padding-right: 9px;
+  padding-left: 9px;
+  -webkit-border-radius: 9px;
+     -moz-border-radius: 9px;
+          border-radius: 9px;
+}
+
+.label:empty,
+.badge:empty {
+  display: none;
+}
+
+a.label:hover,
+a.label:focus,
+a.badge:hover,
+a.badge:focus {
+  color: #ffffff;
+  text-decoration: none;
+  cursor: pointer;
+}
+
+.label-important,
+.badge-important {
+  background-color: #b94a48;
+}
+
+.label-important[href],
+.badge-important[href] {
+  background-color: #953b39;
+}
+
+.label-warning,
+.badge-warning {
+  background-color: #f89406;
+}
+
+.label-warning[href],
+.badge-warning[href] {
+  background-color: #c67605;
+}
+
+.label-success,
+.badge-success {
+  background-color: #468847;
+}
+
+.label-success[href],
+.badge-success[href] {
+  background-color: #356635;
+}
+
+.label-info,
+.badge-info {
+  background-color: #3a87ad;
+}
+
+.label-info[href],
+.badge-info[href] {
+  background-color: #2d6987;
+}
+
+.label-inverse,
+.badge-inverse {
+  background-color: #333333;
+}
+
+.label-inverse[href],
+.badge-inverse[href] {
+  background-color: #1a1a1a;
+}
+
+.btn .label,
+.btn .badge {
+  position: relative;
+  top: -1px;
+}
+
+.btn-mini .label,
+.btn-mini .badge {
+  top: 0;
+}
+
+@-webkit-keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+
+@-moz-keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+
+@-ms-keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+
+@-o-keyframes progress-bar-stripes {
+  from {
+    background-position: 0 0;
+  }
+  to {
+    background-position: 40px 0;
+  }
+}
+
+@keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+
+.progress {
+  height: 20px;
+  margin-bottom: 20px;
+  overflow: hidden;
+  background-color: #f7f7f7;
+  background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));
+  background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9);
+  background-repeat: repeat-x;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+}
+
+.progress .bar {
+  float: left;
+  width: 0;
+  height: 100%;
+  font-size: 12px;
+  color: #ffffff;
+  text-align: center;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #0e90d2;
+  background-image: -moz-linear-gradient(top, #149bdf, #0480be);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));
+  background-image: -webkit-linear-gradient(top, #149bdf, #0480be);
+  background-image: -o-linear-gradient(top, #149bdf, #0480be);
+  background-image: linear-gradient(to bottom, #149bdf, #0480be);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);
+  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+     -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+  -webkit-transition: width 0.6s ease;
+     -moz-transition: width 0.6s ease;
+       -o-transition: width 0.6s ease;
+          transition: width 0.6s ease;
+}
+
+.progress .bar + .bar {
+  -webkit-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+     -moz-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+          box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+}
+
+.progress-striped .bar {
+  background-color: #149bdf;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  -webkit-background-size: 40px 40px;
+     -moz-background-size: 40px 40px;
+       -o-background-size: 40px 40px;
+          background-size: 40px 40px;
+}
+
+.progress.active .bar {
+  -webkit-animation: progress-bar-stripes 2s linear infinite;
+     -moz-animation: progress-bar-stripes 2s linear infinite;
+      -ms-animation: progress-bar-stripes 2s linear infinite;
+       -o-animation: progress-bar-stripes 2s linear infinite;
+          animation: progress-bar-stripes 2s linear infinite;
+}
+
+.progress-danger .bar,
+.progress .bar-danger {
+  background-color: #dd514c;
+  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: linear-gradient(to bottom, #ee5f5b, #c43c35);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0);
+}
+
+.progress-danger.progress-striped .bar,
+.progress-striped .bar-danger {
+  background-color: #ee5f5b;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+
+.progress-success .bar,
+.progress .bar-success {
+  background-color: #5eb95e;
+  background-image: -moz-linear-gradient(top, #62c462, #57a957);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
+  background-image: -webkit-linear-gradient(top, #62c462, #57a957);
+  background-image: -o-linear-gradient(top, #62c462, #57a957);
+  background-image: linear-gradient(to bottom, #62c462, #57a957);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0);
+}
+
+.progress-success.progress-striped .bar,
+.progress-striped .bar-success {
+  background-color: #62c462;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+
+.progress-info .bar,
+.progress .bar-info {
+  background-color: #4bb1cf;
+  background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));
+  background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: linear-gradient(to bottom, #5bc0de, #339bb9);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0);
+}
+
+.progress-info.progress-striped .bar,
+.progress-striped .bar-info {
+  background-color: #5bc0de;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+
+.progress-warning .bar,
+.progress .bar-warning {
+  background-color: #faa732;
+  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
+  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
+  background-image: -o-linear-gradient(top, #fbb450, #f89406);
+  background-image: linear-gradient(to bottom, #fbb450, #f89406);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
+}
+
+.progress-warning.progress-striped .bar,
+.progress-striped .bar-warning {
+  background-color: #fbb450;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+
+.accordion {
+  margin-bottom: 20px;
+}
+
+.accordion-group {
+  margin-bottom: 2px;
+  border: 1px solid #e5e5e5;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.accordion-heading {
+  border-bottom: 0;
+}
+
+.accordion-heading .accordion-toggle {
+  display: block;
+  padding: 8px 15px;
+}
+
+.accordion-toggle {
+  cursor: pointer;
+}
+
+.accordion-inner {
+  padding: 9px 15px;
+  border-top: 1px solid #e5e5e5;
+}
+
+.carousel {
+  position: relative;
+  margin-bottom: 20px;
+  line-height: 1;
+}
+
+.carousel-inner {
+  position: relative;
+  width: 100%;
+  overflow: hidden;
+}
+
+.carousel-inner > .item {
+  position: relative;
+  display: none;
+  -webkit-transition: 0.6s ease-in-out left;
+     -moz-transition: 0.6s ease-in-out left;
+       -o-transition: 0.6s ease-in-out left;
+          transition: 0.6s ease-in-out left;
+}
+
+.carousel-inner > .item > img,
+.carousel-inner > .item > a > img {
+  display: block;
+  line-height: 1;
+}
+
+.carousel-inner > .active,
+.carousel-inner > .next,
+.carousel-inner > .prev {
+  display: block;
+}
+
+.carousel-inner > .active {
+  left: 0;
+}
+
+.carousel-inner > .next,
+.carousel-inner > .prev {
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+
+.carousel-inner > .next {
+  left: 100%;
+}
+
+.carousel-inner > .prev {
+  left: -100%;
+}
+
+.carousel-inner > .next.left,
+.carousel-inner > .prev.right {
+  left: 0;
+}
+
+.carousel-inner > .active.left {
+  left: -100%;
+}
+
+.carousel-inner > .active.right {
+  left: 100%;
+}
+
+.carousel-control {
+  position: absolute;
+  top: 40%;
+  left: 15px;
+  width: 40px;
+  height: 40px;
+  margin-top: -20px;
+  font-size: 60px;
+  font-weight: 100;
+  line-height: 30px;
+  color: #ffffff;
+  text-align: center;
+  background: #222222;
+  border: 3px solid #ffffff;
+  -webkit-border-radius: 23px;
+     -moz-border-radius: 23px;
+          border-radius: 23px;
+  opacity: 0.5;
+  filter: alpha(opacity=50);
+}
+
+.carousel-control.right {
+  right: 15px;
+  left: auto;
+}
+
+.carousel-control:hover,
+.carousel-control:focus {
+  color: #ffffff;
+  text-decoration: none;
+  opacity: 0.9;
+  filter: alpha(opacity=90);
+}
+
+.carousel-indicators {
+  position: absolute;
+  top: 15px;
+  right: 15px;
+  z-index: 5;
+  margin: 0;
+  list-style: none;
+}
+
+.carousel-indicators li {
+  display: block;
+  float: left;
+  width: 10px;
+  height: 10px;
+  margin-left: 5px;
+  text-indent: -999px;
+  background-color: #ccc;
+  background-color: rgba(255, 255, 255, 0.25);
+  border-radius: 5px;
+}
+
+.carousel-indicators .active {
+  background-color: #fff;
+}
+
+.carousel-caption {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  padding: 15px;
+  background: #333333;
+  background: rgba(0, 0, 0, 0.75);
+}
+
+.carousel-caption h4,
+.carousel-caption p {
+  line-height: 20px;
+  color: #ffffff;
+}
+
+.carousel-caption h4 {
+  margin: 0 0 5px;
+}
+
+.carousel-caption p {
+  margin-bottom: 0;
+}
+
+.hero-unit {
+  padding: 60px;
+  margin-bottom: 30px;
+  font-size: 18px;
+  font-weight: 200;
+  line-height: 30px;
+  color: inherit;
+  background-color: #eeeeee;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.hero-unit h1 {
+  margin-bottom: 0;
+  font-size: 60px;
+  line-height: 1;
+  letter-spacing: -1px;
+  color: inherit;
+}
+
+.hero-unit li {
+  line-height: 30px;
+}
+
+.pull-right {
+  float: right;
+}
+
+.pull-left {
+  float: left;
+}
+
+.hide {
+  display: none;
+}
+
+.show {
+  display: block;
+}
+
+.invisible {
+  visibility: hidden;
+}
+
+.affix {
+  position: fixed;
+}
diff --git a/apps/bootstrap/css/bootstrap.min.css b/apps/bootstrap/css/bootstrap.min.css
new file mode 100644
index 0000000..c10c7f4
--- /dev/null
+++ b/apps/bootstrap/css/bootstrap.min.css
@@ -0,0 +1,9 @@
+/*!
+ * Bootstrap v2.3.1
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}a:hover,a:active{outline:0}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{width:auto\9;height:auto;max-width:100%;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic}#map_canvas img,.google-maps img{max-width:none}button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle}button,input{*overflow:visible;line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}button,html input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}label,select,button,input[type="button"],input[type="reset"],input[type="submit"],input[type="radio"],input[type="checkbox"]{cursor:pointer}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}textarea{overflow:auto;vertical-align:top}@media print{*{color:#000!important;text-shadow:none!important;background:transparent!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}@page{margin:.5cm}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}}body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:20px;color:#333;background-color:#fff}a{color:#08c;text-decoration:none}a:hover,a:focus{color:#005580;text-decoration:underline}.img-rounded{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.img-polaroid{padding:4px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.1);box-shadow:0 1px 3px rgba(0,0,0,0.1)}.img-circle{-webkit-border-radius:500px;-moz-border-radius:500px;border-radius:500px}.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.span12{width:940px}.span11{width:860px}.span10{width:780px}.span9{width:700px}.span8{width:620px}.span7{width:540px}.span6{width:460px}.span5{width:380px}.span4{width:300px}.span3{width:220px}.span2{width:140px}.span1{width:60px}.offset12{margin-left:980px}.offset11{margin-left:900px}.offset10{margin-left:820px}.offset9{margin-left:740px}.offset8{margin-left:660px}.offset7{margin-left:580px}.offset6{margin-left:500px}.offset5{margin-left:420px}.offset4{margin-left:340px}.offset3{margin-left:260px}.offset2{margin-left:180px}.offset1{margin-left:100px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.127659574468085%;*margin-left:2.074468085106383%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.127659574468085%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.48936170212765%;*width:91.43617021276594%}.row-fluid .span10{width:82.97872340425532%;*width:82.92553191489361%}.row-fluid .span9{width:74.46808510638297%;*width:74.41489361702126%}.row-fluid .span8{width:65.95744680851064%;*width:65.90425531914893%}.row-fluid .span7{width:57.44680851063829%;*width:57.39361702127659%}.row-fluid .span6{width:48.93617021276595%;*width:48.88297872340425%}.row-fluid .span5{width:40.42553191489362%;*width:40.37234042553192%}.row-fluid .span4{width:31.914893617021278%;*width:31.861702127659576%}.row-fluid .span3{width:23.404255319148934%;*width:23.351063829787233%}.row-fluid .span2{width:14.893617021276595%;*width:14.840425531914894%}.row-fluid .span1{width:6.382978723404255%;*width:6.329787234042553%}.row-fluid .offset12{margin-left:104.25531914893617%;*margin-left:104.14893617021275%}.row-fluid .offset12:first-child{margin-left:102.12765957446808%;*margin-left:102.02127659574467%}.row-fluid .offset11{margin-left:95.74468085106382%;*margin-left:95.6382978723404%}.row-fluid .offset11:first-child{margin-left:93.61702127659574%;*margin-left:93.51063829787232%}.row-fluid .offset10{margin-left:87.23404255319149%;*margin-left:87.12765957446807%}.row-fluid .offset10:first-child{margin-left:85.1063829787234%;*margin-left:84.99999999999999%}.row-fluid .offset9{margin-left:78.72340425531914%;*margin-left:78.61702127659572%}.row-fluid .offset9:first-child{margin-left:76.59574468085106%;*margin-left:76.48936170212764%}.row-fluid .offset8{margin-left:70.2127659574468%;*margin-left:70.10638297872339%}.row-fluid .offset8:first-child{margin-left:68.08510638297872%;*margin-left:67.9787234042553%}.row-fluid .offset7{margin-left:61.70212765957446%;*margin-left:61.59574468085106%}.row-fluid .offset7:first-child{margin-left:59.574468085106375%;*margin-left:59.46808510638297%}.row-fluid .offset6{margin-left:53.191489361702125%;*margin-left:53.085106382978715%}.row-fluid .offset6:first-child{margin-left:51.063829787234035%;*margin-left:50.95744680851063%}.row-fluid .offset5{margin-left:44.68085106382979%;*margin-left:44.57446808510638%}.row-fluid .offset5:first-child{margin-left:42.5531914893617%;*margin-left:42.4468085106383%}.row-fluid .offset4{margin-left:36.170212765957444%;*margin-left:36.06382978723405%}.row-fluid .offset4:first-child{margin-left:34.04255319148936%;*margin-left:33.93617021276596%}.row-fluid .offset3{margin-left:27.659574468085104%;*margin-left:27.5531914893617%}.row-fluid .offset3:first-child{margin-left:25.53191489361702%;*margin-left:25.425531914893618%}.row-fluid .offset2{margin-left:19.148936170212764%;*margin-left:19.04255319148936%}.row-fluid .offset2:first-child{margin-left:17.02127659574468%;*margin-left:16.914893617021278%}.row-fluid .offset1{margin-left:10.638297872340425%;*margin-left:10.53191489361702%}.row-fluid .offset1:first-child{margin-left:8.51063829787234%;*margin-left:8.404255319148938%}[class*="span"].hide,.row-fluid [class*="span"].hide{display:none}[class*="span"].pull-right,.row-fluid [class*="span"].pull-right{float:right}.container{margin-right:auto;margin-left:auto;*zoom:1}.container:before,.container:after{display:table;line-height:0;content:""}.container:after{clear:both}.container-fluid{padding-right:20px;padding-left:20px;*zoom:1}.container-fluid:before,.container-fluid:after{display:table;line-height:0;content:""}.container-fluid:after{clear:both}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:21px;font-weight:200;line-height:30px}small{font-size:85%}strong{font-weight:bold}em{font-style:italic}cite{font-style:normal}.muted{color:#999}a.muted:hover,a.muted:focus{color:#808080}.text-warning{color:#c09853}a.text-warning:hover,a.text-warning:focus{color:#a47e3c}.text-error{color:#b94a48}a.text-error:hover,a.text-error:focus{color:#953b39}.text-info{color:#3a87ad}a.text-info:hover,a.text-info:focus{color:#2d6987}.text-success{color:#468847}a.text-success:hover,a.text-success:focus{color:#356635}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}h1,h2,h3,h4,h5,h6{margin:10px 0;font-family:inherit;font-weight:bold;line-height:20px;color:inherit;text-rendering:optimizelegibility}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;line-height:1;color:#999}h1,h2,h3{line-height:40px}h1{font-size:38.5px}h2{font-size:31.5px}h3{font-size:24.5px}h4{font-size:17.5px}h5{font-size:14px}h6{font-size:11.9px}h1 small{font-size:24.5px}h2 small{font-size:17.5px}h3 small{font-size:14px}h4 small{font-size:14px}.page-header{padding-bottom:9px;margin:20px 0 30px;border-bottom:1px solid #eee}ul,ol{padding:0;margin:0 0 10px 25px}ul ul,ul ol,ol ol,ol ul{margin-bottom:0}li{line-height:20px}ul.unstyled,ol.unstyled{margin-left:0;list-style:none}ul.inline,ol.inline{margin-left:0;list-style:none}ul.inline>li,ol.inline>li{display:inline-block;*display:inline;padding-right:5px;padding-left:5px;*zoom:1}dl{margin-bottom:20px}dt,dd{line-height:20px}dt{font-weight:bold}dd{margin-left:10px}.dl-horizontal{*zoom:1}.dl-horizontal:before,.dl-horizontal:after{display:table;line-height:0;content:""}.dl-horizontal:after{clear:both}.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}hr{margin:20px 0;border:0;border-top:1px solid #eee;border-bottom:1px solid #fff}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}abbr.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:0 0 0 15px;margin:0 0 20px;border-left:5px solid #eee}blockquote p{margin-bottom:0;font-size:17.5px;font-weight:300;line-height:1.25}blockquote small{display:block;line-height:20px;color:#999}blockquote small:before{content:'\2014 \00A0'}blockquote.pull-right{float:right;padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0}blockquote.pull-right p,blockquote.pull-right small{text-align:right}blockquote.pull-right small:before{content:''}blockquote.pull-right small:after{content:'\00A0 \2014'}q:before,q:after,blockquote:before,blockquote:after{content:""}address{display:block;margin-bottom:20px;font-style:normal;line-height:20px}code,pre{padding:0 3px 2px;font-family:Monaco,Menlo,Consolas,"Courier New",monospace;font-size:12px;color:#333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}code{padding:2px 4px;color:#d14;white-space:nowrap;background-color:#f7f7f9;border:1px solid #e1e1e8}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:20px;word-break:break-all;word-wrap:break-word;white-space:pre;white-space:pre-wrap;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}pre.prettyprint{margin-bottom:20px}pre code{padding:0;color:inherit;white-space:pre;white-space:pre-wrap;background-color:transparent;border:0}.pre-scrollable{max-height:340px;overflow-y:scroll}form{margin:0 0 20px}fieldset{padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:40px;color:#333;border:0;border-bottom:1px solid #e5e5e5}legend small{font-size:15px;color:#999}label,input,button,select,textarea{font-size:14px;font-weight:normal;line-height:20px}input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif}label{display:block;margin-bottom:5px}select,textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{display:inline-block;height:20px;padding:4px 6px;margin-bottom:10px;font-size:14px;line-height:20px;color:#555;vertical-align:middle;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}input,textarea,.uneditable-input{width:206px}textarea{height:auto}textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{background-color:#fff;border:1px solid #ccc;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border linear .2s,box-shadow linear .2s;-moz-transition:border linear .2s,box-shadow linear .2s;-o-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s}textarea:focus,input[type="text"]:focus,input[type="password"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus,.uneditable-input:focus{border-color:rgba(82,168,236,0.8);outline:0;outline:thin dotted \9;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;*margin-top:0;line-height:normal}input[type="file"],input[type="image"],input[type="submit"],input[type="reset"],input[type="button"],input[type="radio"],input[type="checkbox"]{width:auto}select,input[type="file"]{height:30px;*margin-top:4px;line-height:30px}select{width:220px;background-color:#fff;border:1px solid #ccc}select[multiple],select[size]{height:auto}select:focus,input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.uneditable-input,.uneditable-textarea{color:#999;cursor:not-allowed;background-color:#fcfcfc;border-color:#ccc;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);box-shadow:inset 0 1px 2px rgba(0,0,0,0.025)}.uneditable-input{overflow:hidden;white-space:nowrap}.uneditable-textarea{width:auto;height:auto}input:-moz-placeholder,textarea:-moz-placeholder{color:#999}input:-ms-input-placeholder,textarea:-ms-input-placeholder{color:#999}input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{color:#999}.radio,.checkbox{min-height:20px;padding-left:20px}.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-20px}.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px}.radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle}.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px}.input-mini{width:60px}.input-small{width:90px}.input-medium{width:150px}.input-large{width:210px}.input-xlarge{width:270px}.input-xxlarge{width:530px}input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"]{float:none;margin-left:0}.input-append input[class*="span"],.input-append .uneditable-input[class*="span"],.input-prepend input[class*="span"],.input-prepend .uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"],.row-fluid .input-prepend [class*="span"],.row-fluid .input-append [class*="span"]{display:inline-block}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:926px}input.span11,textarea.span11,.uneditable-input.span11{width:846px}input.span10,textarea.span10,.uneditable-input.span10{width:766px}input.span9,textarea.span9,.uneditable-input.span9{width:686px}input.span8,textarea.span8,.uneditable-input.span8{width:606px}input.span7,textarea.span7,.uneditable-input.span7{width:526px}input.span6,textarea.span6,.uneditable-input.span6{width:446px}input.span5,textarea.span5,.uneditable-input.span5{width:366px}input.span4,textarea.span4,.uneditable-input.span4{width:286px}input.span3,textarea.span3,.uneditable-input.span3{width:206px}input.span2,textarea.span2,.uneditable-input.span2{width:126px}input.span1,textarea.span1,.uneditable-input.span1{width:46px}.controls-row{*zoom:1}.controls-row:before,.controls-row:after{display:table;line-height:0;content:""}.controls-row:after{clear:both}.controls-row [class*="span"],.row-fluid .controls-row [class*="span"]{float:left}.controls-row .checkbox[class*="span"],.controls-row .radio[class*="span"]{padding-top:5px}input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#eee}input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio"][readonly],input[type="checkbox"][readonly]{background-color:transparent}.control-group.warning .control-label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853}.control-group.warning .checkbox,.control-group.warning .radio,.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853}.control-group.warning input,.control-group.warning select,.control-group.warning textarea{border-color:#c09853;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e}.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853}.control-group.error .control-label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48}.control-group.error .checkbox,.control-group.error .radio,.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48}.control-group.error input,.control-group.error select,.control-group.error textarea{border-color:#b94a48;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392}.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48}.control-group.success .control-label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847}.control-group.success .checkbox,.control-group.success .radio,.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847}.control-group.success input,.control-group.success select,.control-group.success textarea{border-color:#468847;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b}.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847}.control-group.info .control-label,.control-group.info .help-block,.control-group.info .help-inline{color:#3a87ad}.control-group.info .checkbox,.control-group.info .radio,.control-group.info input,.control-group.info select,.control-group.info textarea{color:#3a87ad}.control-group.info input,.control-group.info select,.control-group.info textarea{border-color:#3a87ad;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.info input:focus,.control-group.info select:focus,.control-group.info textarea:focus{border-color:#2d6987;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3}.control-group.info .input-prepend .add-on,.control-group.info .input-append .add-on{color:#3a87ad;background-color:#d9edf7;border-color:#3a87ad}input:focus:invalid,textarea:focus:invalid,select:focus:invalid{color:#b94a48;border-color:#ee5f5b}input:focus:invalid:focus,textarea:focus:invalid:focus,select:focus:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7}.form-actions{padding:19px 20px 20px;margin-top:20px;margin-bottom:20px;background-color:#f5f5f5;border-top:1px solid #e5e5e5;*zoom:1}.form-actions:before,.form-actions:after{display:table;line-height:0;content:""}.form-actions:after{clear:both}.help-block,.help-inline{color:#595959}.help-block{display:block;margin-bottom:10px}.help-inline{display:inline-block;*display:inline;padding-left:5px;vertical-align:middle;*zoom:1}.input-append,.input-prepend{display:inline-block;margin-bottom:10px;font-size:0;white-space:nowrap;vertical-align:middle}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input,.input-append .dropdown-menu,.input-prepend .dropdown-menu,.input-append .popover,.input-prepend .popover{font-size:14px}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input{position:relative;margin-bottom:0;*margin-left:0;vertical-align:top;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-append input:focus,.input-prepend input:focus,.input-append select:focus,.input-prepend select:focus,.input-append .uneditable-input:focus,.input-prepend .uneditable-input:focus{z-index:2}.input-append .add-on,.input-prepend .add-on{display:inline-block;width:auto;height:20px;min-width:16px;padding:4px 5px;font-size:14px;font-weight:normal;line-height:20px;text-align:center;text-shadow:0 1px 0 #fff;background-color:#eee;border:1px solid #ccc}.input-append .add-on,.input-prepend .add-on,.input-append .btn,.input-prepend .btn,.input-append .btn-group>.dropdown-toggle,.input-prepend .btn-group>.dropdown-toggle{vertical-align:top;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-append .active,.input-prepend .active{background-color:#a9dba9;border-color:#46a546}.input-prepend .add-on,.input-prepend .btn{margin-right:-1px}.input-prepend .add-on:first-child,.input-prepend .btn:first-child{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-append input,.input-append select,.input-append .uneditable-input{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-append input+.btn-group .btn:last-child,.input-append select+.btn-group .btn:last-child,.input-append .uneditable-input+.btn-group .btn:last-child{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-append .add-on,.input-append .btn,.input-append .btn-group{margin-left:-1px}.input-append .add-on:last-child,.input-append .btn:last-child,.input-append .btn-group:last-child>.dropdown-toggle{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append input,.input-prepend.input-append select,.input-prepend.input-append .uneditable-input{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-prepend.input-append input+.btn-group .btn,.input-prepend.input-append select+.btn-group .btn,.input-prepend.input-append .uneditable-input+.btn-group .btn{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append .add-on:first-child,.input-prepend.input-append .btn:first-child{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-prepend.input-append .add-on:last-child,.input-prepend.input-append .btn:last-child{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append .btn-group:first-child{margin-left:0}input.search-query{padding-right:14px;padding-right:4px \9;padding-left:14px;padding-left:4px \9;margin-bottom:0;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.form-search .input-append .search-query,.form-search .input-prepend .search-query{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.form-search .input-append .search-query{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px}.form-search .input-append .btn{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0}.form-search .input-prepend .search-query{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0}.form-search .input-prepend .btn{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px}.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input,.form-search .input-prepend,.form-inline .input-prepend,.form-horizontal .input-prepend,.form-search .input-append,.form-inline .input-append,.form-horizontal .input-append{display:inline-block;*display:inline;margin-bottom:0;vertical-align:middle;*zoom:1}.form-search .hide,.form-inline .hide,.form-horizontal .hide{display:none}.form-search label,.form-inline label,.form-search .btn-group,.form-inline .btn-group{display:inline-block}.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{margin-bottom:0}.form-search .radio,.form-search .checkbox,.form-inline .radio,.form-inline .checkbox{padding-left:0;margin-bottom:0;vertical-align:middle}.form-search .radio input[type="radio"],.form-search .checkbox input[type="checkbox"],.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:left;margin-right:3px;margin-left:0}.control-group{margin-bottom:10px}legend+.control-group{margin-top:20px;-webkit-margin-top-collapse:separate}.form-horizontal .control-group{margin-bottom:20px;*zoom:1}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;line-height:0;content:""}.form-horizontal .control-group:after{clear:both}.form-horizontal .control-label{float:left;width:160px;padding-top:5px;text-align:right}.form-horizontal .controls{*display:inline-block;*padding-left:20px;margin-left:180px;*margin-left:0}.form-horizontal .controls:first-child{*padding-left:180px}.form-horizontal .help-block{margin-bottom:0}.form-horizontal input+.help-block,.form-horizontal select+.help-block,.form-horizontal textarea+.help-block,.form-horizontal .uneditable-input+.help-block,.form-horizontal .input-prepend+.help-block,.form-horizontal .input-append+.help-block{margin-top:10px}.form-horizontal .form-actions{padding-left:180px}table{max-width:100%;background-color:transparent;border-collapse:collapse;border-spacing:0}.table{width:100%;margin-bottom:20px}.table th,.table td{padding:8px;line-height:20px;text-align:left;vertical-align:top;border-top:1px solid #ddd}.table th{font-weight:bold}.table thead th{vertical-align:bottom}.table caption+thead tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0}.table tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed th,.table-condensed td{padding:4px 5px}.table-bordered{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapse;border-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.table-bordered th,.table-bordered td{border-left:1px solid #ddd}.table-bordered caption+thead tr:first-child th,.table-bordered caption+tbody tr:first-child th,.table-bordered caption+tbody tr:first-child td,.table-bordered colgroup+thead tr:first-child th,.table-bordered colgroup+tbody tr:first-child th,.table-bordered colgroup+tbody tr:first-child td,.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0}.table-bordered thead:first-child tr:first-child>th:first-child,.table-bordered tbody:first-child tr:first-child>td:first-child,.table-bordered tbody:first-child tr:first-child>th:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px}.table-bordered thead:first-child tr:first-child>th:last-child,.table-bordered tbody:first-child tr:first-child>td:last-child,.table-bordered tbody:first-child tr:first-child>th:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px}.table-bordered thead:last-child tr:last-child>th:first-child,.table-bordered tbody:last-child tr:last-child>td:first-child,.table-bordered tbody:last-child tr:last-child>th:first-child,.table-bordered tfoot:last-child tr:last-child>td:first-child,.table-bordered tfoot:last-child tr:last-child>th:first-child{-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px}.table-bordered thead:last-child tr:last-child>th:last-child,.table-bordered tbody:last-child tr:last-child>td:last-child,.table-bordered tbody:last-child tr:last-child>th:last-child,.table-bordered tfoot:last-child tr:last-child>td:last-child,.table-bordered tfoot:last-child tr:last-child>th:last-child{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px}.table-bordered tfoot+tbody:last-child tr:last-child td:first-child{-webkit-border-bottom-left-radius:0;border-bottom-left-radius:0;-moz-border-radius-bottomleft:0}.table-bordered tfoot+tbody:last-child tr:last-child td:last-child{-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;-moz-border-radius-bottomright:0}.table-bordered caption+thead tr:first-child th:first-child,.table-bordered caption+tbody tr:first-child td:first-child,.table-bordered colgroup+thead tr:first-child th:first-child,.table-bordered colgroup+tbody tr:first-child td:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px}.table-bordered caption+thead tr:first-child th:last-child,.table-bordered caption+tbody tr:first-child td:last-child,.table-bordered colgroup+thead tr:first-child th:last-child,.table-bordered colgroup+tbody tr:first-child td:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px}.table-striped tbody>tr:nth-child(odd)>td,.table-striped tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover tbody tr:hover>td,.table-hover tbody tr:hover>th{background-color:#f5f5f5}table td[class*="span"],table th[class*="span"],.row-fluid table td[class*="span"],.row-fluid table th[class*="span"]{display:table-cell;float:none;margin-left:0}.table td.span1,.table th.span1{float:none;width:44px;margin-left:0}.table td.span2,.table th.span2{float:none;width:124px;margin-left:0}.table td.span3,.table th.span3{float:none;width:204px;margin-left:0}.table td.span4,.table th.span4{float:none;width:284px;margin-left:0}.table td.span5,.table th.span5{float:none;width:364px;margin-left:0}.table td.span6,.table th.span6{float:none;width:444px;margin-left:0}.table td.span7,.table th.span7{float:none;width:524px;margin-left:0}.table td.span8,.table th.span8{float:none;width:604px;margin-left:0}.table td.span9,.table th.span9{float:none;width:684px;margin-left:0}.table td.span10,.table th.span10{float:none;width:764px;margin-left:0}.table td.span11,.table th.span11{float:none;width:844px;margin-left:0}.table td.span12,.table th.span12{float:none;width:924px;margin-left:0}.table tbody tr.success>td{background-color:#dff0d8}.table tbody tr.error>td{background-color:#f2dede}.table tbody tr.warning>td{background-color:#fcf8e3}.table tbody tr.info>td{background-color:#d9edf7}.table-hover tbody tr.success:hover>td{background-color:#d0e9c6}.table-hover tbody tr.error:hover>td{background-color:#ebcccc}.table-hover tbody tr.warning:hover>td{background-color:#faf2cc}.table-hover tbody tr.info:hover>td{background-color:#c4e3f3}[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;margin-top:1px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat}.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:focus>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>li>a:focus>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:focus>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"],.dropdown-submenu:focus>a>[class*=" icon-"]{background-image:url("../img/glyphicons-halflings-white.png")}.icon-glass{background-position:0 0}.icon-music{background-position:-24px 0}.icon-search{background-position:-48px 0}.icon-envelope{background-position:-72px 0}.icon-heart{background-position:-96px 0}.icon-star{background-position:-120px 0}.icon-star-empty{background-position:-144px 0}.icon-user{background-position:-168px 0}.icon-film{background-position:-192px 0}.icon-th-large{background-position:-216px 0}.icon-th{background-position:-240px 0}.icon-th-list{background-position:-264px 0}.icon-ok{background-position:-288px 0}.icon-remove{background-position:-312px 0}.icon-zoom-in{background-position:-336px 0}.icon-zoom-out{background-position:-360px 0}.icon-off{background-position:-384px 0}.icon-signal{background-position:-408px 0}.icon-cog{background-position:-432px 0}.icon-trash{background-position:-456px 0}.icon-home{background-position:0 -24px}.icon-file{background-position:-24px -24px}.icon-time{background-position:-48px -24px}.icon-road{background-position:-72px -24px}.icon-download-alt{background-position:-96px -24px}.icon-download{background-position:-120px -24px}.icon-upload{background-position:-144px -24px}.icon-inbox{background-position:-168px -24px}.icon-play-circle{background-position:-192px -24px}.icon-repeat{background-position:-216px -24px}.icon-refresh{background-position:-240px -24px}.icon-list-alt{background-position:-264px -24px}.icon-lock{background-position:-287px -24px}.icon-flag{background-position:-312px -24px}.icon-headphones{background-position:-336px -24px}.icon-volume-off{background-position:-360px -24px}.icon-volume-down{background-position:-384px -24px}.icon-volume-up{background-position:-408px -24px}.icon-qrcode{background-position:-432px -24px}.icon-barcode{background-position:-456px -24px}.icon-tag{background-position:0 -48px}.icon-tags{background-position:-25px -48px}.icon-book{background-position:-48px -48px}.icon-bookmark{background-position:-72px -48px}.icon-print{background-position:-96px -48px}.icon-camera{background-position:-120px -48px}.icon-font{background-position:-144px -48px}.icon-bold{background-position:-167px -48px}.icon-italic{background-position:-192px -48px}.icon-text-height{background-position:-216px -48px}.icon-text-width{background-position:-240px -48px}.icon-align-left{background-position:-264px -48px}.icon-align-center{background-position:-288px -48px}.icon-align-right{background-position:-312px -48px}.icon-align-justify{background-position:-336px -48px}.icon-list{background-position:-360px -48px}.icon-indent-left{background-position:-384px -48px}.icon-indent-right{background-position:-408px -48px}.icon-facetime-video{background-position:-432px -48px}.icon-picture{background-position:-456px -48px}.icon-pencil{background-position:0 -72px}.icon-map-marker{background-position:-24px -72px}.icon-adjust{background-position:-48px -72px}.icon-tint{background-position:-72px -72px}.icon-edit{background-position:-96px -72px}.icon-share{background-position:-120px -72px}.icon-check{background-position:-144px -72px}.icon-move{background-position:-168px -72px}.icon-step-backward{background-position:-192px -72px}.icon-fast-backward{background-position:-216px -72px}.icon-backward{background-position:-240px -72px}.icon-play{background-position:-264px -72px}.icon-pause{background-position:-288px -72px}.icon-stop{background-position:-312px -72px}.icon-forward{background-position:-336px -72px}.icon-fast-forward{background-position:-360px -72px}.icon-step-forward{background-position:-384px -72px}.icon-eject{background-position:-408px -72px}.icon-chevron-left{background-position:-432px -72px}.icon-chevron-right{background-position:-456px -72px}.icon-plus-sign{background-position:0 -96px}.icon-minus-sign{background-position:-24px -96px}.icon-remove-sign{background-position:-48px -96px}.icon-ok-sign{background-position:-72px -96px}.icon-question-sign{background-position:-96px -96px}.icon-info-sign{background-position:-120px -96px}.icon-screenshot{background-position:-144px -96px}.icon-remove-circle{background-position:-168px -96px}.icon-ok-circle{background-position:-192px -96px}.icon-ban-circle{background-position:-216px -96px}.icon-arrow-left{background-position:-240px -96px}.icon-arrow-right{background-position:-264px -96px}.icon-arrow-up{background-position:-289px -96px}.icon-arrow-down{background-position:-312px -96px}.icon-share-alt{background-position:-336px -96px}.icon-resize-full{background-position:-360px -96px}.icon-resize-small{background-position:-384px -96px}.icon-plus{background-position:-408px -96px}.icon-minus{background-position:-433px -96px}.icon-asterisk{background-position:-456px -96px}.icon-exclamation-sign{background-position:0 -120px}.icon-gift{background-position:-24px -120px}.icon-leaf{background-position:-48px -120px}.icon-fire{background-position:-72px -120px}.icon-eye-open{background-position:-96px -120px}.icon-eye-close{background-position:-120px -120px}.icon-warning-sign{background-position:-144px -120px}.icon-plane{background-position:-168px -120px}.icon-calendar{background-position:-192px -120px}.icon-random{width:16px;background-position:-216px -120px}.icon-comment{background-position:-240px -120px}.icon-magnet{background-position:-264px -120px}.icon-chevron-up{background-position:-288px -120px}.icon-chevron-down{background-position:-313px -119px}.icon-retweet{background-position:-336px -120px}.icon-shopping-cart{background-position:-360px -120px}.icon-folder-close{width:16px;background-position:-384px -120px}.icon-folder-open{width:16px;background-position:-408px -120px}.icon-resize-vertical{background-position:-432px -119px}.icon-resize-horizontal{background-position:-456px -118px}.icon-hdd{background-position:0 -144px}.icon-bullhorn{background-position:-24px -144px}.icon-bell{background-position:-48px -144px}.icon-certificate{background-position:-72px -144px}.icon-thumbs-up{background-position:-96px -144px}.icon-thumbs-down{background-position:-120px -144px}.icon-hand-right{background-position:-144px -144px}.icon-hand-left{background-position:-168px -144px}.icon-hand-up{background-position:-192px -144px}.icon-hand-down{background-position:-216px -144px}.icon-circle-arrow-right{background-position:-240px -144px}.icon-circle-arrow-left{background-position:-264px -144px}.icon-circle-arrow-up{background-position:-288px -144px}.icon-circle-arrow-down{background-position:-312px -144px}.icon-globe{background-position:-336px -144px}.icon-wrench{background-position:-360px -144px}.icon-tasks{background-position:-384px -144px}.icon-filter{background-position:-408px -144px}.icon-briefcase{background-position:-432px -144px}.icon-fullscreen{background-position:-456px -144px}.dropup,.dropdown{position:relative}.dropdown-toggle{*margin-bottom:-3px}.dropdown-toggle:active,.open .dropdown-toggle{outline:0}.caret{display:inline-block;width:0;height:0;vertical-align:top;border-top:4px solid #000;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.dropdown .caret{margin-top:8px;margin-left:2px}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus,.dropdown-submenu:hover>a,.dropdown-submenu:focus>a{color:#fff;text-decoration:none;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0)}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;outline:0;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0)}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;cursor:default;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open{*z-index:1000}.open>.dropdown-menu{display:block}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}.dropdown-submenu{position:relative}.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px}.dropdown-submenu:hover>.dropdown-menu{display:block}.dropup .dropdown-submenu>.dropdown-menu{top:auto;bottom:0;margin-top:0;margin-bottom:-2px;-webkit-border-radius:5px 5px 5px 0;-moz-border-radius:5px 5px 5px 0;border-radius:5px 5px 5px 0}.dropdown-submenu>a:after{display:block;float:right;width:0;height:0;margin-top:5px;margin-right:-10px;border-color:transparent;border-left-color:#ccc;border-style:solid;border-width:5px 0 5px 5px;content:" "}.dropdown-submenu:hover>a:after{border-left-color:#fff}.dropdown-submenu.pull-left{float:none}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.dropdown .dropdown-menu .nav-header{padding-right:20px;padding-left:20px}.typeahead{z-index:1051;margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.fade{opacity:0;-webkit-transition:opacity .15s linear;-moz-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;-moz-transition:height .35s ease;-o-transition:height .35s ease;transition:height .35s ease}.collapse.in{height:auto}.close{float:right;font-size:20px;font-weight:bold;line-height:20px;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.4;filter:alpha(opacity=40)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.btn{display:inline-block;*display:inline;padding:4px 12px;margin-bottom:0;*margin-left:.3em;font-size:14px;line-height:20px;color:#333;text-align:center;text-shadow:0 1px 1px rgba(255,255,255,0.75);vertical-align:middle;cursor:pointer;background-color:#f5f5f5;*background-color:#e6e6e6;background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(to bottom,#fff,#e6e6e6);background-repeat:repeat-x;border:1px solid #ccc;*border:0;border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe6e6e6',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);*zoom:1;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn:hover,.btn:focus,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333;background-color:#e6e6e6;*background-color:#d9d9d9}.btn:active,.btn.active{background-color:#ccc \9}.btn:first-child{*margin-left:0}.btn:hover,.btn:focus{color:#333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn.disabled,.btn[disabled]{cursor:default;background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-large{padding:11px 19px;font-size:17.5px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.btn-large [class^="icon-"],.btn-large [class*=" icon-"]{margin-top:4px}.btn-small{padding:2px 10px;font-size:11.9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-small [class^="icon-"],.btn-small [class*=" icon-"]{margin-top:0}.btn-mini [class^="icon-"],.btn-mini [class*=" icon-"]{margin-top:-1px}.btn-mini{padding:0 6px;font-size:10.5px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-block{display:block;width:100%;padding-right:0;padding-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255,255,255,0.75)}.btn-primary{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#006dcc;*background-color:#04c;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;border-color:#04c #04c #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#fff;background-color:#04c;*background-color:#003bb3}.btn-primary:active,.btn-primary.active{background-color:#039 \9}.btn-warning{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#faa732;*background-color:#f89406;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;border-color:#f89406 #f89406 #ad6704;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#fff;background-color:#f89406;*background-color:#df8505}.btn-warning:active,.btn-warning.active{background-color:#c67605 \9}.btn-danger{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#da4f49;*background-color:#bd362f;background-image:-moz-linear-gradient(top,#ee5f5b,#bd362f);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#bd362f));background-image:-webkit-linear-gradient(top,#ee5f5b,#bd362f);background-image:-o-linear-gradient(top,#ee5f5b,#bd362f);background-image:linear-gradient(to bottom,#ee5f5b,#bd362f);background-repeat:repeat-x;border-color:#bd362f #bd362f #802420;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffbd362f',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#fff;background-color:#bd362f;*background-color:#a9302a}.btn-danger:active,.btn-danger.active{background-color:#942a25 \9}.btn-success{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#5bb75b;*background-color:#51a351;background-image:-moz-linear-gradient(top,#62c462,#51a351);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));background-image:-webkit-linear-gradient(top,#62c462,#51a351);background-image:-o-linear-gradient(top,#62c462,#51a351);background-image:linear-gradient(to bottom,#62c462,#51a351);background-repeat:repeat-x;border-color:#51a351 #51a351 #387038;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff51a351',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#fff;background-color:#51a351;*background-color:#499249}.btn-success:active,.btn-success.active{background-color:#408140 \9}.btn-info{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#49afcd;*background-color:#2f96b4;background-image:-moz-linear-gradient(top,#5bc0de,#2f96b4);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#2f96b4));background-image:-webkit-linear-gradient(top,#5bc0de,#2f96b4);background-image:-o-linear-gradient(top,#5bc0de,#2f96b4);background-image:linear-gradient(to bottom,#5bc0de,#2f96b4);background-repeat:repeat-x;border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff2f96b4',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{color:#fff;background-color:#2f96b4;*background-color:#2a85a0}.btn-info:active,.btn-info.active{background-color:#24748c \9}.btn-inverse{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#363636;*background-color:#222;background-image:-moz-linear-gradient(top,#444,#222);background-image:-webkit-gradient(linear,0 0,0 100%,from(#444),to(#222));background-image:-webkit-linear-gradient(top,#444,#222);background-image:-o-linear-gradient(top,#444,#222);background-image:linear-gradient(to bottom,#444,#222);background-repeat:repeat-x;border-color:#222 #222 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444',endColorstr='#ff222222',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-inverse:hover,.btn-inverse:focus,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#fff;background-color:#222;*background-color:#151515}.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9}button.btn,input[type="submit"].btn{*padding-top:3px;*padding-bottom:3px}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0}button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px}button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px}button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px}.btn-link,.btn-link:active,.btn-link[disabled]{background-color:transparent;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-link{color:#08c;cursor:pointer;border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-link:hover,.btn-link:focus{color:#005580;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,.btn-link[disabled]:focus{color:#333;text-decoration:none}.btn-group{position:relative;display:inline-block;*display:inline;*margin-left:.3em;font-size:0;white-space:nowrap;vertical-align:middle;*zoom:1}.btn-group:first-child{*margin-left:0}.btn-group+.btn-group{margin-left:5px}.btn-toolbar{margin-top:10px;margin-bottom:10px;font-size:0}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group{margin-left:5px}.btn-group>.btn{position:relative;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group>.btn+.btn{margin-left:-1px}.btn-group>.btn,.btn-group>.dropdown-menu,.btn-group>.popover{font-size:14px}.btn-group>.btn-mini{font-size:10.5px}.btn-group>.btn-small{font-size:11.9px}.btn-group>.btn-large{font-size:17.5px}.btn-group>.btn:first-child{margin-left:0;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px}.btn-group>.btn:last-child,.btn-group>.dropdown-toggle{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}.btn-group>.btn.large:first-child{margin-left:0;-webkit-border-bottom-left-radius:6px;border-bottom-left-radius:6px;-webkit-border-top-left-radius:6px;border-top-left-radius:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topleft:6px}.btn-group>.btn.large:last-child,.btn-group>.large.dropdown-toggle{-webkit-border-top-right-radius:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;border-bottom-right-radius:6px;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px}.btn-group>.btn:hover,.btn-group>.btn:focus,.btn-group>.btn:active,.btn-group>.btn.active{z-index:2}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{*padding-top:5px;padding-right:8px;*padding-bottom:5px;padding-left:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn-group>.btn-mini+.dropdown-toggle{*padding-top:2px;padding-right:5px;*padding-bottom:2px;padding-left:5px}.btn-group>.btn-small+.dropdown-toggle{*padding-top:5px;*padding-bottom:4px}.btn-group>.btn-large+.dropdown-toggle{*padding-top:7px;padding-right:12px;*padding-bottom:7px;padding-left:12px}.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn-group.open .btn.dropdown-toggle{background-color:#e6e6e6}.btn-group.open .btn-primary.dropdown-toggle{background-color:#04c}.btn-group.open .btn-warning.dropdown-toggle{background-color:#f89406}.btn-group.open .btn-danger.dropdown-toggle{background-color:#bd362f}.btn-group.open .btn-success.dropdown-toggle{background-color:#51a351}.btn-group.open .btn-info.dropdown-toggle{background-color:#2f96b4}.btn-group.open .btn-inverse.dropdown-toggle{background-color:#222}.btn .caret{margin-top:8px;margin-left:0}.btn-large .caret{margin-top:6px}.btn-large .caret{border-top-width:5px;border-right-width:5px;border-left-width:5px}.btn-mini .caret,.btn-small .caret{margin-top:8px}.dropup .btn-large .caret{border-bottom-width:5px}.btn-primary .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret,.btn-inverse .caret{border-top-color:#fff;border-bottom-color:#fff}.btn-group-vertical{display:inline-block;*display:inline;*zoom:1}.btn-group-vertical>.btn{display:block;float:none;max-width:100%;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group-vertical>.btn+.btn{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:first-child{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.btn-group-vertical>.btn:last-child{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.btn-group-vertical>.btn-large:first-child{-webkit-border-radius:6px 6px 0 0;-moz-border-radius:6px 6px 0 0;border-radius:6px 6px 0 0}.btn-group-vertical>.btn-large:last-child{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.alert{padding:8px 35px 8px 14px;margin-bottom:20px;text-shadow:0 1px 0 rgba(255,255,255,0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.alert,.alert h4{color:#c09853}.alert h4{margin:0}.alert .close{position:relative;top:-2px;right:-21px;line-height:20px}.alert-success{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.alert-success h4{color:#468847}.alert-danger,.alert-error{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.alert-danger h4,.alert-error h4{color:#b94a48}.alert-info{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.alert-info h4{color:#3a87ad}.alert-block{padding-top:14px;padding-bottom:14px}.alert-block>p,.alert-block>ul{margin-bottom:0}.alert-block p+p{margin-top:5px}.nav{margin-bottom:20px;margin-left:0;list-style:none}.nav>li>a{display:block}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li>a>img{max-width:none}.nav>.pull-right{float:right}.nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:20px;color:#999;text-shadow:0 1px 0 rgba(255,255,255,0.5);text-transform:uppercase}.nav li+.nav-header{margin-top:9px}.nav-list{padding-right:15px;padding-left:15px;margin-bottom:0}.nav-list>li>a,.nav-list .nav-header{margin-right:-15px;margin-left:-15px;text-shadow:0 1px 0 rgba(255,255,255,0.5)}.nav-list>li>a{padding:3px 15px}.nav-list>.active>a,.nav-list>.active>a:hover,.nav-list>.active>a:focus{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.2);background-color:#08c}.nav-list [class^="icon-"],.nav-list [class*=" icon-"]{margin-right:2px}.nav-list .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.nav-tabs,.nav-pills{*zoom:1}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;line-height:0;content:""}.nav-tabs:after,.nav-pills:after{clear:both}.nav-tabs>li,.nav-pills>li{float:left}.nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{margin-bottom:-1px}.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:20px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover,.nav-tabs>li>a:focus{border-color:#eee #eee #ddd}.nav-tabs>.active>a,.nav-tabs>.active>a:hover,.nav-tabs>.active>a:focus{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.nav-pills>.active>a,.nav-pills>.active>a:hover,.nav-pills>.active>a:focus{color:#fff;background-color:#08c}.nav-stacked>li{float:none}.nav-stacked>li>a{margin-right:0}.nav-tabs.nav-stacked{border-bottom:0}.nav-tabs.nav-stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.nav-tabs.nav-stacked>li:first-child>a{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-topleft:4px}.nav-tabs.nav-stacked>li:last-child>a{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomright:4px;-moz-border-radius-bottomleft:4px}.nav-tabs.nav-stacked>li>a:hover,.nav-tabs.nav-stacked>li>a:focus{z-index:2;border-color:#ddd}.nav-pills.nav-stacked>li>a{margin-bottom:3px}.nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px}.nav-tabs .dropdown-menu{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.nav-pills .dropdown-menu{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.nav .dropdown-toggle .caret{margin-top:6px;border-top-color:#08c;border-bottom-color:#08c}.nav .dropdown-toggle:hover .caret,.nav .dropdown-toggle:focus .caret{border-top-color:#005580;border-bottom-color:#005580}.nav-tabs .dropdown-toggle .caret{margin-top:8px}.nav .active .dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff}.nav-tabs .active .dropdown-toggle .caret{border-top-color:#555;border-bottom-color:#555}.nav>.dropdown.active>a:hover,.nav>.dropdown.active>a:focus{cursor:pointer}.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover,.nav>li.dropdown.open.active>a:focus{color:#fff;background-color:#999;border-color:#999}.nav li.dropdown.open .caret,.nav li.dropdown.open.active .caret,.nav li.dropdown.open a:hover .caret,.nav li.dropdown.open a:focus .caret{border-top-color:#fff;border-bottom-color:#fff;opacity:1;filter:alpha(opacity=100)}.tabs-stacked .open>a:hover,.tabs-stacked .open>a:focus{border-color:#999}.tabbable{*zoom:1}.tabbable:before,.tabbable:after{display:table;line-height:0;content:""}.tabbable:after{clear:both}.tab-content{overflow:auto}.tabs-below>.nav-tabs,.tabs-right>.nav-tabs,.tabs-left>.nav-tabs{border-bottom:0}.tab-content>.tab-pane,.pill-content>.pill-pane{display:none}.tab-content>.active,.pill-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:hover,.tabs-below>.nav-tabs>li>a:focus{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:hover,.tabs-below>.nav-tabs>.active>a:focus{border-color:transparent #ddd #ddd #ddd}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px}.tabs-left>.nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd}.tabs-left>.nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:hover,.tabs-left>.nav-tabs>li>a:focus{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs .active>a,.tabs-left>.nav-tabs .active>a:hover,.tabs-left>.nav-tabs .active>a:focus{border-color:#ddd transparent #ddd #ddd;*border-right-color:#fff}.tabs-right>.nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd}.tabs-right>.nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:hover,.tabs-right>.nav-tabs>li>a:focus{border-color:#eee #eee #eee #ddd}.tabs-right>.nav-tabs .active>a,.tabs-right>.nav-tabs .active>a:hover,.tabs-right>.nav-tabs .active>a:focus{border-color:#ddd #ddd #ddd transparent;*border-left-color:#fff}.nav>.disabled>a{color:#999}.nav>.disabled>a:hover,.nav>.disabled>a:focus{text-decoration:none;cursor:default;background-color:transparent}.navbar{*position:relative;*z-index:2;margin-bottom:20px;overflow:visible}.navbar-inner{min-height:40px;padding-right:20px;padding-left:20px;background-color:#fafafa;background-image:-moz-linear-gradient(top,#fff,#f2f2f2);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#f2f2f2));background-image:-webkit-linear-gradient(top,#fff,#f2f2f2);background-image:-o-linear-gradient(top,#fff,#f2f2f2);background-image:linear-gradient(to bottom,#fff,#f2f2f2);background-repeat:repeat-x;border:1px solid #d4d4d4;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#fff2f2f2',GradientType=0);*zoom:1;-webkit-box-shadow:0 1px 4px rgba(0,0,0,0.065);-moz-box-shadow:0 1px 4px rgba(0,0,0,0.065);box-shadow:0 1px 4px rgba(0,0,0,0.065)}.navbar-inner:before,.navbar-inner:after{display:table;line-height:0;content:""}.navbar-inner:after{clear:both}.navbar .container{width:auto}.nav-collapse.collapse{height:auto;overflow:visible}.navbar .brand{display:block;float:left;padding:10px 20px 10px;margin-left:-20px;font-size:20px;font-weight:200;color:#777;text-shadow:0 1px 0 #fff}.navbar .brand:hover,.navbar .brand:focus{text-decoration:none}.navbar-text{margin-bottom:0;line-height:40px;color:#777}.navbar-link{color:#777}.navbar-link:hover,.navbar-link:focus{color:#333}.navbar .divider-vertical{height:40px;margin:0 9px;border-right:1px solid #fff;border-left:1px solid #f2f2f2}.navbar .btn,.navbar .btn-group{margin-top:5px}.navbar .btn-group .btn,.navbar .input-prepend .btn,.navbar .input-append .btn,.navbar .input-prepend .btn-group,.navbar .input-append .btn-group{margin-top:0}.navbar-form{margin-bottom:0;*zoom:1}.navbar-form:before,.navbar-form:after{display:table;line-height:0;content:""}.navbar-form:after{clear:both}.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:5px}.navbar-form input,.navbar-form select,.navbar-form .btn{display:inline-block;margin-bottom:0}.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px}.navbar-form .input-append,.navbar-form .input-prepend{margin-top:5px;white-space:nowrap}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0}.navbar-search{position:relative;float:left;margin-top:5px;margin-bottom:0}.navbar-search .search-query{padding:4px 14px;margin-bottom:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.navbar-static-top{position:static;margin-bottom:0}.navbar-static-top .navbar-inner{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0}.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{border-width:0 0 1px}.navbar-fixed-bottom .navbar-inner{border-width:1px 0 0}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding-right:0;padding-left:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.navbar-fixed-top{top:0}.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{-webkit-box-shadow:0 1px 10px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 10px rgba(0,0,0,0.1);box-shadow:0 1px 10px rgba(0,0,0,0.1)}.navbar-fixed-bottom{bottom:0}.navbar-fixed-bottom .navbar-inner{-webkit-box-shadow:0 -1px 10px rgba(0,0,0,0.1);-moz-box-shadow:0 -1px 10px rgba(0,0,0,0.1);box-shadow:0 -1px 10px rgba(0,0,0,0.1)}.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0}.navbar .nav.pull-right{float:right;margin-right:0}.navbar .nav>li{float:left}.navbar .nav>li>a{float:none;padding:10px 15px 10px;color:#777;text-decoration:none;text-shadow:0 1px 0 #fff}.navbar .nav .dropdown-toggle .caret{margin-top:8px}.navbar .nav>li>a:focus,.navbar .nav>li>a:hover{color:#333;text-decoration:none;background-color:transparent}.navbar .nav>.active>a,.navbar .nav>.active>a:hover,.navbar .nav>.active>a:focus{color:#555;text-decoration:none;background-color:#e5e5e5;-webkit-box-shadow:inset 0 3px 8px rgba(0,0,0,0.125);-moz-box-shadow:inset 0 3px 8px rgba(0,0,0,0.125);box-shadow:inset 0 3px 8px rgba(0,0,0,0.125)}.navbar .btn-navbar{display:none;float:right;padding:7px 10px;margin-right:5px;margin-left:5px;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#ededed;*background-color:#e5e5e5;background-image:-moz-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#e5e5e5));background-image:-webkit-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:-o-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:linear-gradient(to bottom,#f2f2f2,#e5e5e5);background-repeat:repeat-x;border-color:#e5e5e5 #e5e5e5 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffe5e5e5',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075)}.navbar .btn-navbar:hover,.navbar .btn-navbar:focus,.navbar .btn-navbar:active,.navbar .btn-navbar.active,.navbar .btn-navbar.disabled,.navbar .btn-navbar[disabled]{color:#fff;background-color:#e5e5e5;*background-color:#d9d9d9}.navbar .btn-navbar:active,.navbar .btn-navbar.active{background-color:#ccc \9}.navbar .btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,0.25);-moz-box-shadow:0 1px 0 rgba(0,0,0,0.25);box-shadow:0 1px 0 rgba(0,0,0,0.25)}.btn-navbar .icon-bar+.icon-bar{margin-top:3px}.navbar .nav>li>.dropdown-menu:before{position:absolute;top:-7px;left:9px;display:inline-block;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-left:7px solid transparent;border-bottom-color:rgba(0,0,0,0.2);content:''}.navbar .nav>li>.dropdown-menu:after{position:absolute;top:-6px;left:10px;display:inline-block;border-right:6px solid transparent;border-bottom:6px solid #fff;border-left:6px solid transparent;content:''}.navbar-fixed-bottom .nav>li>.dropdown-menu:before{top:auto;bottom:-7px;border-top:7px solid #ccc;border-bottom:0;border-top-color:rgba(0,0,0,0.2)}.navbar-fixed-bottom .nav>li>.dropdown-menu:after{top:auto;bottom:-6px;border-top:6px solid #fff;border-bottom:0}.navbar .nav li.dropdown>a:hover .caret,.navbar .nav li.dropdown>a:focus .caret{border-top-color:#333;border-bottom-color:#333}.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.open.active>.dropdown-toggle{color:#555;background-color:#e5e5e5}.navbar .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#777;border-bottom-color:#777}.navbar .nav li.dropdown.open>.dropdown-toggle .caret,.navbar .nav li.dropdown.active>.dropdown-toggle .caret,.navbar .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#555;border-bottom-color:#555}.navbar .pull-right>li>.dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right{right:0;left:auto}.navbar .pull-right>li>.dropdown-menu:before,.navbar .nav>li>.dropdown-menu.pull-right:before{right:12px;left:auto}.navbar .pull-right>li>.dropdown-menu:after,.navbar .nav>li>.dropdown-menu.pull-right:after{right:13px;left:auto}.navbar .pull-right>li>.dropdown-menu .dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right .dropdown-menu{right:100%;left:auto;margin-right:-1px;margin-left:0;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.navbar-inverse .navbar-inner{background-color:#1b1b1b;background-image:-moz-linear-gradient(top,#222,#111);background-image:-webkit-gradient(linear,0 0,0 100%,from(#222),to(#111));background-image:-webkit-linear-gradient(top,#222,#111);background-image:-o-linear-gradient(top,#222,#111);background-image:linear-gradient(to bottom,#222,#111);background-repeat:repeat-x;border-color:#252525;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222',endColorstr='#ff111111',GradientType=0)}.navbar-inverse .brand,.navbar-inverse .nav>li>a{color:#999;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.navbar-inverse .brand:hover,.navbar-inverse .nav>li>a:hover,.navbar-inverse .brand:focus,.navbar-inverse .nav>li>a:focus{color:#fff}.navbar-inverse .brand{color:#999}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .nav>li>a:focus,.navbar-inverse .nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .nav .active>a,.navbar-inverse .nav .active>a:hover,.navbar-inverse .nav .active>a:focus{color:#fff;background-color:#111}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover,.navbar-inverse .navbar-link:focus{color:#fff}.navbar-inverse .divider-vertical{border-right-color:#222;border-left-color:#111}.navbar-inverse .nav li.dropdown.open>.dropdown-toggle,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle{color:#fff;background-color:#111}.navbar-inverse .nav li.dropdown>a:hover .caret,.navbar-inverse .nav li.dropdown>a:focus .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#999;border-bottom-color:#999}.navbar-inverse .nav li.dropdown.open>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .navbar-search .search-query{color:#fff;background-color:#515151;border-color:#111;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-webkit-transition:none;-moz-transition:none;-o-transition:none;transition:none}.navbar-inverse .navbar-search .search-query:-moz-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query:-ms-input-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query:focus,.navbar-inverse .navbar-search .search-query.focused{padding:5px 15px;color:#333;text-shadow:0 1px 0 #fff;background-color:#fff;border:0;outline:0;-webkit-box-shadow:0 0 3px rgba(0,0,0,0.15);-moz-box-shadow:0 0 3px rgba(0,0,0,0.15);box-shadow:0 0 3px rgba(0,0,0,0.15)}.navbar-inverse .btn-navbar{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#0e0e0e;*background-color:#040404;background-image:-moz-linear-gradient(top,#151515,#040404);background-image:-webkit-gradient(linear,0 0,0 100%,from(#151515),to(#040404));background-image:-webkit-linear-gradient(top,#151515,#040404);background-image:-o-linear-gradient(top,#151515,#040404);background-image:linear-gradient(to bottom,#151515,#040404);background-repeat:repeat-x;border-color:#040404 #040404 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515',endColorstr='#ff040404',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.navbar-inverse .btn-navbar:hover,.navbar-inverse .btn-navbar:focus,.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active,.navbar-inverse .btn-navbar.disabled,.navbar-inverse .btn-navbar[disabled]{color:#fff;background-color:#040404;*background-color:#000}.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active{background-color:#000 \9}.breadcrumb{padding:8px 15px;margin:0 0 20px;list-style:none;background-color:#f5f5f5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.breadcrumb>li{display:inline-block;*display:inline;text-shadow:0 1px 0 #fff;*zoom:1}.breadcrumb>li>.divider{padding:0 5px;color:#ccc}.breadcrumb>.active{color:#999}.pagination{margin:20px 0}.pagination ul{display:inline-block;*display:inline;margin-bottom:0;margin-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*zoom:1;-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:0 1px 2px rgba(0,0,0,0.05);box-shadow:0 1px 2px rgba(0,0,0,0.05)}.pagination ul>li{display:inline}.pagination ul>li>a,.pagination ul>li>span{float:left;padding:4px 12px;line-height:20px;text-decoration:none;background-color:#fff;border:1px solid #ddd;border-left-width:0}.pagination ul>li>a:hover,.pagination ul>li>a:focus,.pagination ul>.active>a,.pagination ul>.active>span{background-color:#f5f5f5}.pagination ul>.active>a,.pagination ul>.active>span{color:#999;cursor:default}.pagination ul>.disabled>span,.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover,.pagination ul>.disabled>a:focus{color:#999;cursor:default;background-color:transparent}.pagination ul>li:first-child>a,.pagination ul>li:first-child>span{border-left-width:1px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px}.pagination ul>li:last-child>a,.pagination ul>li:last-child>span{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}.pagination-centered{text-align:center}.pagination-right{text-align:right}.pagination-large ul>li>a,.pagination-large ul>li>span{padding:11px 19px;font-size:17.5px}.pagination-large ul>li:first-child>a,.pagination-large ul>li:first-child>span{-webkit-border-bottom-left-radius:6px;border-bottom-left-radius:6px;-webkit-border-top-left-radius:6px;border-top-left-radius:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topleft:6px}.pagination-large ul>li:last-child>a,.pagination-large ul>li:last-child>span{-webkit-border-top-right-radius:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;border-bottom-right-radius:6px;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px}.pagination-mini ul>li:first-child>a,.pagination-small ul>li:first-child>a,.pagination-mini ul>li:first-child>span,.pagination-small ul>li:first-child>span{-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-moz-border-radius-bottomleft:3px;-moz-border-radius-topleft:3px}.pagination-mini ul>li:last-child>a,.pagination-small ul>li:last-child>a,.pagination-mini ul>li:last-child>span,.pagination-small ul>li:last-child>span{-webkit-border-top-right-radius:3px;border-top-right-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;-moz-border-radius-topright:3px;-moz-border-radius-bottomright:3px}.pagination-small ul>li>a,.pagination-small ul>li>span{padding:2px 10px;font-size:11.9px}.pagination-mini ul>li>a,.pagination-mini ul>li>span{padding:0 6px;font-size:10.5px}.pager{margin:20px 0;text-align:center;list-style:none;*zoom:1}.pager:before,.pager:after{display:table;line-height:0;content:""}.pager:after{clear:both}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#f5f5f5}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;cursor:default;background-color:#fff}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0}.modal-backdrop,.modal-backdrop.fade.in{opacity:.8;filter:alpha(opacity=80)}.modal{position:fixed;top:10%;left:50%;z-index:1050;width:560px;margin-left:-280px;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;outline:0;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box}.modal.fade{top:-25%;-webkit-transition:opacity .3s linear,top .3s ease-out;-moz-transition:opacity .3s linear,top .3s ease-out;-o-transition:opacity .3s linear,top .3s ease-out;transition:opacity .3s linear,top .3s ease-out}.modal.fade.in{top:10%}.modal-header{padding:9px 15px;border-bottom:1px solid #eee}.modal-header .close{margin-top:2px}.modal-header h3{margin:0;line-height:30px}.modal-body{position:relative;max-height:400px;padding:15px;overflow-y:auto}.modal-form{margin-bottom:0}.modal-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;*zoom:1;-webkit-box-shadow:inset 0 1px 0 #fff;-moz-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.modal-footer:before,.modal-footer:after{display:table;line-height:0;content:""}.modal-footer:after{clear:both}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.tooltip{position:absolute;z-index:1030;display:block;font-size:11px;line-height:1.4;opacity:0;filter:alpha(opacity=0);visibility:visible}.tooltip.in{opacity:.8;filter:alpha(opacity=80)}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-right-color:#000;border-width:5px 5px 5px 0}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-left-color:#000;border-width:5px 0 5px 5px}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-color:#000;border-width:0 5px 5px}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;max-width:276px;padding:1px;text-align:left;white-space:normal;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;font-weight:normal;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0}.popover-title:empty{display:none}.popover-content{padding:9px 14px}.popover .arrow,.popover .arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover .arrow{border-width:11px}.popover .arrow:after{border-width:10px;content:""}.popover.top .arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,0.25);border-bottom-width:0}.popover.top .arrow:after{bottom:1px;margin-left:-10px;border-top-color:#fff;border-bottom-width:0}.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,0.25);border-left-width:0}.popover.right .arrow:after{bottom:-10px;left:1px;border-right-color:#fff;border-left-width:0}.popover.bottom .arrow{top:-11px;left:50%;margin-left:-11px;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);border-top-width:0}.popover.bottom .arrow:after{top:1px;margin-left:-10px;border-bottom-color:#fff;border-top-width:0}.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-left-color:#999;border-left-color:rgba(0,0,0,0.25);border-right-width:0}.popover.left .arrow:after{right:1px;bottom:-10px;border-left-color:#fff;border-right-width:0}.thumbnails{margin-left:-20px;list-style:none;*zoom:1}.thumbnails:before,.thumbnails:after{display:table;line-height:0;content:""}.thumbnails:after{clear:both}.row-fluid .thumbnails{margin-left:0}.thumbnails>li{float:left;margin-bottom:20px;margin-left:20px}.thumbnail{display:block;padding:4px;line-height:20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.055);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.055);box-shadow:0 1px 3px rgba(0,0,0,0.055);-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}a.thumbnail:hover,a.thumbnail:focus{border-color:#08c;-webkit-box-shadow:0 1px 4px rgba(0,105,214,0.25);-moz-box-shadow:0 1px 4px rgba(0,105,214,0.25);box-shadow:0 1px 4px rgba(0,105,214,0.25)}.thumbnail>img{display:block;max-width:100%;margin-right:auto;margin-left:auto}.thumbnail .caption{padding:9px;color:#555}.media,.media-body{overflow:hidden;*overflow:visible;zoom:1}.media,.media .media{margin-top:15px}.media:first-child{margin-top:0}.media-object{display:block}.media-heading{margin:0 0 5px}.media>.pull-left{margin-right:10px}.media>.pull-right{margin-left:10px}.media-list{margin-left:0;list-style:none}.label,.badge{display:inline-block;padding:2px 4px;font-size:11.844px;font-weight:bold;line-height:14px;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);white-space:nowrap;vertical-align:baseline;background-color:#999}.label{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.badge{padding-right:9px;padding-left:9px;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px}.label:empty,.badge:empty{display:none}a.label:hover,a.label:focus,a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}.label-important,.badge-important{background-color:#b94a48}.label-important[href],.badge-important[href]{background-color:#953b39}.label-warning,.badge-warning{background-color:#f89406}.label-warning[href],.badge-warning[href]{background-color:#c67605}.label-success,.badge-success{background-color:#468847}.label-success[href],.badge-success[href]{background-color:#356635}.label-info,.badge-info{background-color:#3a87ad}.label-info[href],.badge-info[href]{background-color:#2d6987}.label-inverse,.badge-inverse{background-color:#333}.label-inverse[href],.badge-inverse[href]{background-color:#1a1a1a}.btn .label,.btn .badge{position:relative;top:-1px}.btn-mini .label,.btn-mini .badge{top:0}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-ms-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:0 0}to{background-position:40px 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f7f7f7;background-image:-moz-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f5f5f5),to(#f9f9f9));background-image:-webkit-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-o-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:linear-gradient(to bottom,#f5f5f5,#f9f9f9);background-repeat:repeat-x;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5',endColorstr='#fff9f9f9',GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)}.progress .bar{float:left;width:0;height:100%;font-size:12px;color:#fff;text-align:center;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top,#149bdf,#0480be);background-image:-webkit-gradient(linear,0 0,0 100%,from(#149bdf),to(#0480be));background-image:-webkit-linear-gradient(top,#149bdf,#0480be);background-image:-o-linear-gradient(top,#149bdf,#0480be);background-image:linear-gradient(to bottom,#149bdf,#0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf',endColorstr='#ff0480be',GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width .6s ease;-moz-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress .bar+.bar{-webkit-box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15);-moz-box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15)}.progress-striped .bar{background-color:#149bdf;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px}.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-danger .bar,.progress .bar-danger{background-color:#dd514c;background-image:-moz-linear-gradient(top,#ee5f5b,#c43c35);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#c43c35));background-image:-webkit-linear-gradient(top,#ee5f5b,#c43c35);background-image:-o-linear-gradient(top,#ee5f5b,#c43c35);background-image:linear-gradient(to bottom,#ee5f5b,#c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffc43c35',GradientType=0)}.progress-danger.progress-striped .bar,.progress-striped .bar-danger{background-color:#ee5f5b;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-success .bar,.progress .bar-success{background-color:#5eb95e;background-image:-moz-linear-gradient(top,#62c462,#57a957);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#57a957));background-image:-webkit-linear-gradient(top,#62c462,#57a957);background-image:-o-linear-gradient(top,#62c462,#57a957);background-image:linear-gradient(to bottom,#62c462,#57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff57a957',GradientType=0)}.progress-success.progress-striped .bar,.progress-striped .bar-success{background-color:#62c462;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-info .bar,.progress .bar-info{background-color:#4bb1cf;background-image:-moz-linear-gradient(top,#5bc0de,#339bb9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#339bb9));background-image:-webkit-linear-gradient(top,#5bc0de,#339bb9);background-image:-o-linear-gradient(top,#5bc0de,#339bb9);background-image:linear-gradient(to bottom,#5bc0de,#339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff339bb9',GradientType=0)}.progress-info.progress-striped .bar,.progress-striped .bar-info{background-color:#5bc0de;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-warning .bar,.progress .bar-warning{background-color:#faa732;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0)}.progress-warning.progress-striped .bar,.progress-striped .bar-warning{background-color:#fbb450;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.accordion{margin-bottom:20px}.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.accordion-heading{border-bottom:0}.accordion-heading .accordion-toggle{display:block;padding:8px 15px}.accordion-toggle{cursor:pointer}.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5}.carousel{position:relative;margin-bottom:20px;line-height:1}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-moz-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;line-height:1}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#fff;text-align:center;background:#222;border:3px solid #fff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:.5;filter:alpha(opacity=50)}.carousel-control.right{right:15px;left:auto}.carousel-control:hover,.carousel-control:focus{color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-indicators{position:absolute;top:15px;right:15px;z-index:5;margin:0;list-style:none}.carousel-indicators li{display:block;float:left;width:10px;height:10px;margin-left:5px;text-indent:-999px;background-color:#ccc;background-color:rgba(255,255,255,0.25);border-radius:5px}.carousel-indicators .active{background-color:#fff}.carousel-caption{position:absolute;right:0;bottom:0;left:0;padding:15px;background:#333;background:rgba(0,0,0,0.75)}.carousel-caption h4,.carousel-caption p{line-height:20px;color:#fff}.carousel-caption h4{margin:0 0 5px}.carousel-caption p{margin-bottom:0}.hero-unit{padding:60px;margin-bottom:30px;font-size:18px;font-weight:200;line-height:30px;color:inherit;background-color:#eee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;color:inherit}.hero-unit li{line-height:30px}.pull-right{float:right}.pull-left{float:left}.hide{display:none}.show{display:block}.invisible{visibility:hidden}.affix{position:fixed}
diff --git a/apps/bootstrap/css/site.css b/apps/bootstrap/css/site.css
new file mode 100644
index 0000000..890a953
--- /dev/null
+++ b/apps/bootstrap/css/site.css
@@ -0,0 +1,78 @@
+body {
+	padding-top: 20px;
+	padding-bottom: 60px;
+}
+
+/* Custom container */
+.container {
+	margin: 0 auto;
+	max-width: 1000px;
+}
+
+.container > hr {
+	margin: 60px 0;
+}
+
+/* Main marketing message and sign up button */
+.jumbotron {
+	margin: 80px 0;
+	text-align: center;
+}
+
+.jumbotron h1 {
+	font-size: 100px;
+	line-height: 1;
+}
+
+.jumbotron .lead {
+	font-size: 24px;
+	line-height: 1.25;
+}
+
+.jumbotron .btn {
+	font-size: 21px;
+	padding: 14px 24px;
+}
+
+/* Supporting marketing content */
+.marketing {
+	margin: 60px 0;
+}
+
+.marketing p + h4 {
+	margin-top: 28px;
+}
+
+/* Customize the navbar links to be fill the entire space of the .navbar */
+.navbar .navbar-inner {
+	padding: 0;
+}
+
+.navbar .nav {
+	margin: 0;
+	display: table;
+	width: 100%;
+}
+
+.navbar .nav li {
+	display: table-cell;
+	width: 1%;
+	float: none;
+}
+
+.navbar .nav li a {
+	font-weight: bold;
+	text-align: center;
+	border-left: 1px solid rgba(255, 255, 255, .75);
+	border-right: 1px solid rgba(0, 0, 0, .1);
+}
+
+.navbar .nav li:first-child a {
+	border-left: 0;
+	border-radius: 3px 0 0 3px;
+}
+
+.navbar .nav li:last-child a {
+	border-right: 0;
+	border-radius: 0 3px 3px 0;
+}
diff --git a/apps/bootstrap/img/glyphicons-halflings-white.png b/apps/bootstrap/img/glyphicons-halflings-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bf6484a29d8da269f9bc874b25493a45fae3bae
GIT binary patch
literal 8777
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
B7G?kd

literal 0
HcmV?d00001

diff --git a/apps/bootstrap/img/glyphicons-halflings.png b/apps/bootstrap/img/glyphicons-halflings.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9969993201f9cee63cf9f49217646347297b643
GIT binary patch
literal 12799
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

literal 0
HcmV?d00001

diff --git a/apps/bootstrap/index.php b/apps/bootstrap/index.php
new file mode 100644
index 0000000..8f98090
--- /dev/null
+++ b/apps/bootstrap/index.php
@@ -0,0 +1,9 @@
+<?php
+
+defined('YII_DEBUG') or define('YII_DEBUG', true);
+
+require(__DIR__ . '/../framework/yii.php');
+
+$config = require(__DIR__ . '/protected/config/main.php');
+$application = new yii\web\Application($config);
+$application->run();
diff --git a/apps/bootstrap/js/bootstrap.js b/apps/bootstrap/js/bootstrap.js
new file mode 100644
index 0000000..c298ee4
--- /dev/null
+++ b/apps/bootstrap/js/bootstrap.js
@@ -0,0 +1,2276 @@
+/* ===================================================
+ * bootstrap-transition.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#transitions
+ * ===================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+  /* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
+   * ======================================================= */
+
+  $(function () {
+
+    $.support.transition = (function () {
+
+      var transitionEnd = (function () {
+
+        var el = document.createElement('bootstrap')
+          , transEndEventNames = {
+               'WebkitTransition' : 'webkitTransitionEnd'
+            ,  'MozTransition'    : 'transitionend'
+            ,  'OTransition'      : 'oTransitionEnd otransitionend'
+            ,  'transition'       : 'transitionend'
+            }
+          , name
+
+        for (name in transEndEventNames){
+          if (el.style[name] !== undefined) {
+            return transEndEventNames[name]
+          }
+        }
+
+      }())
+
+      return transitionEnd && {
+        end: transitionEnd
+      }
+
+    })()
+
+  })
+
+}(window.jQuery);/* ==========================================================
+ * bootstrap-alert.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#alerts
+ * ==========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* ALERT CLASS DEFINITION
+  * ====================== */
+
+  var dismiss = '[data-dismiss="alert"]'
+    , Alert = function (el) {
+        $(el).on('click', dismiss, this.close)
+      }
+
+  Alert.prototype.close = function (e) {
+    var $this = $(this)
+      , selector = $this.attr('data-target')
+      , $parent
+
+    if (!selector) {
+      selector = $this.attr('href')
+      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+    }
+
+    $parent = $(selector)
+
+    e && e.preventDefault()
+
+    $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
+
+    $parent.trigger(e = $.Event('close'))
+
+    if (e.isDefaultPrevented()) return
+
+    $parent.removeClass('in')
+
+    function removeElement() {
+      $parent
+        .trigger('closed')
+        .remove()
+    }
+
+    $.support.transition && $parent.hasClass('fade') ?
+      $parent.on($.support.transition.end, removeElement) :
+      removeElement()
+  }
+
+
+ /* ALERT PLUGIN DEFINITION
+  * ======================= */
+
+  var old = $.fn.alert
+
+  $.fn.alert = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('alert')
+      if (!data) $this.data('alert', (data = new Alert(this)))
+      if (typeof option == 'string') data[option].call($this)
+    })
+  }
+
+  $.fn.alert.Constructor = Alert
+
+
+ /* ALERT NO CONFLICT
+  * ================= */
+
+  $.fn.alert.noConflict = function () {
+    $.fn.alert = old
+    return this
+  }
+
+
+ /* ALERT DATA-API
+  * ============== */
+
+  $(document).on('click.alert.data-api', dismiss, Alert.prototype.close)
+
+}(window.jQuery);/* ============================================================
+ * bootstrap-button.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#buttons
+ * ============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* BUTTON PUBLIC CLASS DEFINITION
+  * ============================== */
+
+  var Button = function (element, options) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.button.defaults, options)
+  }
+
+  Button.prototype.setState = function (state) {
+    var d = 'disabled'
+      , $el = this.$element
+      , data = $el.data()
+      , val = $el.is('input') ? 'val' : 'html'
+
+    state = state + 'Text'
+    data.resetText || $el.data('resetText', $el[val]())
+
+    $el[val](data[state] || this.options[state])
+
+    // push to event loop to allow forms to submit
+    setTimeout(function () {
+      state == 'loadingText' ?
+        $el.addClass(d).attr(d, d) :
+        $el.removeClass(d).removeAttr(d)
+    }, 0)
+  }
+
+  Button.prototype.toggle = function () {
+    var $parent = this.$element.closest('[data-toggle="buttons-radio"]')
+
+    $parent && $parent
+      .find('.active')
+      .removeClass('active')
+
+    this.$element.toggleClass('active')
+  }
+
+
+ /* BUTTON PLUGIN DEFINITION
+  * ======================== */
+
+  var old = $.fn.button
+
+  $.fn.button = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('button')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('button', (data = new Button(this, options)))
+      if (option == 'toggle') data.toggle()
+      else if (option) data.setState(option)
+    })
+  }
+
+  $.fn.button.defaults = {
+    loadingText: 'loading...'
+  }
+
+  $.fn.button.Constructor = Button
+
+
+ /* BUTTON NO CONFLICT
+  * ================== */
+
+  $.fn.button.noConflict = function () {
+    $.fn.button = old
+    return this
+  }
+
+
+ /* BUTTON DATA-API
+  * =============== */
+
+  $(document).on('click.button.data-api', '[data-toggle^=button]', function (e) {
+    var $btn = $(e.target)
+    if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
+    $btn.button('toggle')
+  })
+
+}(window.jQuery);/* ==========================================================
+ * bootstrap-carousel.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#carousel
+ * ==========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* CAROUSEL CLASS DEFINITION
+  * ========================= */
+
+  var Carousel = function (element, options) {
+    this.$element = $(element)
+    this.$indicators = this.$element.find('.carousel-indicators')
+    this.options = options
+    this.options.pause == 'hover' && this.$element
+      .on('mouseenter', $.proxy(this.pause, this))
+      .on('mouseleave', $.proxy(this.cycle, this))
+  }
+
+  Carousel.prototype = {
+
+    cycle: function (e) {
+      if (!e) this.paused = false
+      if (this.interval) clearInterval(this.interval);
+      this.options.interval
+        && !this.paused
+        && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
+      return this
+    }
+
+  , getActiveIndex: function () {
+      this.$active = this.$element.find('.item.active')
+      this.$items = this.$active.parent().children()
+      return this.$items.index(this.$active)
+    }
+
+  , to: function (pos) {
+      var activeIndex = this.getActiveIndex()
+        , that = this
+
+      if (pos > (this.$items.length - 1) || pos < 0) return
+
+      if (this.sliding) {
+        return this.$element.one('slid', function () {
+          that.to(pos)
+        })
+      }
+
+      if (activeIndex == pos) {
+        return this.pause().cycle()
+      }
+
+      return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
+    }
+
+  , pause: function (e) {
+      if (!e) this.paused = true
+      if (this.$element.find('.next, .prev').length && $.support.transition.end) {
+        this.$element.trigger($.support.transition.end)
+        this.cycle(true)
+      }
+      clearInterval(this.interval)
+      this.interval = null
+      return this
+    }
+
+  , next: function () {
+      if (this.sliding) return
+      return this.slide('next')
+    }
+
+  , prev: function () {
+      if (this.sliding) return
+      return this.slide('prev')
+    }
+
+  , slide: function (type, next) {
+      var $active = this.$element.find('.item.active')
+        , $next = next || $active[type]()
+        , isCycling = this.interval
+        , direction = type == 'next' ? 'left' : 'right'
+        , fallback  = type == 'next' ? 'first' : 'last'
+        , that = this
+        , e
+
+      this.sliding = true
+
+      isCycling && this.pause()
+
+      $next = $next.length ? $next : this.$element.find('.item')[fallback]()
+
+      e = $.Event('slide', {
+        relatedTarget: $next[0]
+      , direction: direction
+      })
+
+      if ($next.hasClass('active')) return
+
+      if (this.$indicators.length) {
+        this.$indicators.find('.active').removeClass('active')
+        this.$element.one('slid', function () {
+          var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
+          $nextIndicator && $nextIndicator.addClass('active')
+        })
+      }
+
+      if ($.support.transition && this.$element.hasClass('slide')) {
+        this.$element.trigger(e)
+        if (e.isDefaultPrevented()) return
+        $next.addClass(type)
+        $next[0].offsetWidth // force reflow
+        $active.addClass(direction)
+        $next.addClass(direction)
+        this.$element.one($.support.transition.end, function () {
+          $next.removeClass([type, direction].join(' ')).addClass('active')
+          $active.removeClass(['active', direction].join(' '))
+          that.sliding = false
+          setTimeout(function () { that.$element.trigger('slid') }, 0)
+        })
+      } else {
+        this.$element.trigger(e)
+        if (e.isDefaultPrevented()) return
+        $active.removeClass('active')
+        $next.addClass('active')
+        this.sliding = false
+        this.$element.trigger('slid')
+      }
+
+      isCycling && this.cycle()
+
+      return this
+    }
+
+  }
+
+
+ /* CAROUSEL PLUGIN DEFINITION
+  * ========================== */
+
+  var old = $.fn.carousel
+
+  $.fn.carousel = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('carousel')
+        , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option)
+        , action = typeof option == 'string' ? option : options.slide
+      if (!data) $this.data('carousel', (data = new Carousel(this, options)))
+      if (typeof option == 'number') data.to(option)
+      else if (action) data[action]()
+      else if (options.interval) data.pause().cycle()
+    })
+  }
+
+  $.fn.carousel.defaults = {
+    interval: 5000
+  , pause: 'hover'
+  }
+
+  $.fn.carousel.Constructor = Carousel
+
+
+ /* CAROUSEL NO CONFLICT
+  * ==================== */
+
+  $.fn.carousel.noConflict = function () {
+    $.fn.carousel = old
+    return this
+  }
+
+ /* CAROUSEL DATA-API
+  * ================= */
+
+  $(document).on('click.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
+    var $this = $(this), href
+      , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+      , options = $.extend({}, $target.data(), $this.data())
+      , slideIndex
+
+    $target.carousel(options)
+
+    if (slideIndex = $this.attr('data-slide-to')) {
+      $target.data('carousel').pause().to(slideIndex).cycle()
+    }
+
+    e.preventDefault()
+  })
+
+}(window.jQuery);/* =============================================================
+ * bootstrap-collapse.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#collapse
+ * =============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* COLLAPSE PUBLIC CLASS DEFINITION
+  * ================================ */
+
+  var Collapse = function (element, options) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.collapse.defaults, options)
+
+    if (this.options.parent) {
+      this.$parent = $(this.options.parent)
+    }
+
+    this.options.toggle && this.toggle()
+  }
+
+  Collapse.prototype = {
+
+    constructor: Collapse
+
+  , dimension: function () {
+      var hasWidth = this.$element.hasClass('width')
+      return hasWidth ? 'width' : 'height'
+    }
+
+  , show: function () {
+      var dimension
+        , scroll
+        , actives
+        , hasData
+
+      if (this.transitioning || this.$element.hasClass('in')) return
+
+      dimension = this.dimension()
+      scroll = $.camelCase(['scroll', dimension].join('-'))
+      actives = this.$parent && this.$parent.find('> .accordion-group > .in')
+
+      if (actives && actives.length) {
+        hasData = actives.data('collapse')
+        if (hasData && hasData.transitioning) return
+        actives.collapse('hide')
+        hasData || actives.data('collapse', null)
+      }
+
+      this.$element[dimension](0)
+      this.transition('addClass', $.Event('show'), 'shown')
+      $.support.transition && this.$element[dimension](this.$element[0][scroll])
+    }
+
+  , hide: function () {
+      var dimension
+      if (this.transitioning || !this.$element.hasClass('in')) return
+      dimension = this.dimension()
+      this.reset(this.$element[dimension]())
+      this.transition('removeClass', $.Event('hide'), 'hidden')
+      this.$element[dimension](0)
+    }
+
+  , reset: function (size) {
+      var dimension = this.dimension()
+
+      this.$element
+        .removeClass('collapse')
+        [dimension](size || 'auto')
+        [0].offsetWidth
+
+      this.$element[size !== null ? 'addClass' : 'removeClass']('collapse')
+
+      return this
+    }
+
+  , transition: function (method, startEvent, completeEvent) {
+      var that = this
+        , complete = function () {
+            if (startEvent.type == 'show') that.reset()
+            that.transitioning = 0
+            that.$element.trigger(completeEvent)
+          }
+
+      this.$element.trigger(startEvent)
+
+      if (startEvent.isDefaultPrevented()) return
+
+      this.transitioning = 1
+
+      this.$element[method]('in')
+
+      $.support.transition && this.$element.hasClass('collapse') ?
+        this.$element.one($.support.transition.end, complete) :
+        complete()
+    }
+
+  , toggle: function () {
+      this[this.$element.hasClass('in') ? 'hide' : 'show']()
+    }
+
+  }
+
+
+ /* COLLAPSE PLUGIN DEFINITION
+  * ========================== */
+
+  var old = $.fn.collapse
+
+  $.fn.collapse = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('collapse')
+        , options = $.extend({}, $.fn.collapse.defaults, $this.data(), typeof option == 'object' && option)
+      if (!data) $this.data('collapse', (data = new Collapse(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.collapse.defaults = {
+    toggle: true
+  }
+
+  $.fn.collapse.Constructor = Collapse
+
+
+ /* COLLAPSE NO CONFLICT
+  * ==================== */
+
+  $.fn.collapse.noConflict = function () {
+    $.fn.collapse = old
+    return this
+  }
+
+
+ /* COLLAPSE DATA-API
+  * ================= */
+
+  $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) {
+    var $this = $(this), href
+      , target = $this.attr('data-target')
+        || e.preventDefault()
+        || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
+      , option = $(target).data('collapse') ? 'toggle' : $this.data()
+    $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
+    $(target).collapse(option)
+  })
+
+}(window.jQuery);/* ============================================================
+ * bootstrap-dropdown.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#dropdowns
+ * ============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* DROPDOWN CLASS DEFINITION
+  * ========================= */
+
+  var toggle = '[data-toggle=dropdown]'
+    , Dropdown = function (element) {
+        var $el = $(element).on('click.dropdown.data-api', this.toggle)
+        $('html').on('click.dropdown.data-api', function () {
+          $el.parent().removeClass('open')
+        })
+      }
+
+  Dropdown.prototype = {
+
+    constructor: Dropdown
+
+  , toggle: function (e) {
+      var $this = $(this)
+        , $parent
+        , isActive
+
+      if ($this.is('.disabled, :disabled')) return
+
+      $parent = getParent($this)
+
+      isActive = $parent.hasClass('open')
+
+      clearMenus()
+
+      if (!isActive) {
+        $parent.toggleClass('open')
+      }
+
+      $this.focus()
+
+      return false
+    }
+
+  , keydown: function (e) {
+      var $this
+        , $items
+        , $active
+        , $parent
+        , isActive
+        , index
+
+      if (!/(38|40|27)/.test(e.keyCode)) return
+
+      $this = $(this)
+
+      e.preventDefault()
+      e.stopPropagation()
+
+      if ($this.is('.disabled, :disabled')) return
+
+      $parent = getParent($this)
+
+      isActive = $parent.hasClass('open')
+
+      if (!isActive || (isActive && e.keyCode == 27)) {
+        if (e.which == 27) $parent.find(toggle).focus()
+        return $this.click()
+      }
+
+      $items = $('[role=menu] li:not(.divider):visible a', $parent)
+
+      if (!$items.length) return
+
+      index = $items.index($items.filter(':focus'))
+
+      if (e.keyCode == 38 && index > 0) index--                                        // up
+      if (e.keyCode == 40 && index < $items.length - 1) index++                        // down
+      if (!~index) index = 0
+
+      $items
+        .eq(index)
+        .focus()
+    }
+
+  }
+
+  function clearMenus() {
+    $(toggle).each(function () {
+      getParent($(this)).removeClass('open')
+    })
+  }
+
+  function getParent($this) {
+    var selector = $this.attr('data-target')
+      , $parent
+
+    if (!selector) {
+      selector = $this.attr('href')
+      selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+    }
+
+    $parent = selector && $(selector)
+
+    if (!$parent || !$parent.length) $parent = $this.parent()
+
+    return $parent
+  }
+
+
+  /* DROPDOWN PLUGIN DEFINITION
+   * ========================== */
+
+  var old = $.fn.dropdown
+
+  $.fn.dropdown = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('dropdown')
+      if (!data) $this.data('dropdown', (data = new Dropdown(this)))
+      if (typeof option == 'string') data[option].call($this)
+    })
+  }
+
+  $.fn.dropdown.Constructor = Dropdown
+
+
+ /* DROPDOWN NO CONFLICT
+  * ==================== */
+
+  $.fn.dropdown.noConflict = function () {
+    $.fn.dropdown = old
+    return this
+  }
+
+
+  /* APPLY TO STANDARD DROPDOWN ELEMENTS
+   * =================================== */
+
+  $(document)
+    .on('click.dropdown.data-api', clearMenus)
+    .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
+    .on('click.dropdown-menu', function (e) { e.stopPropagation() })
+    .on('click.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
+    .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
+
+}(window.jQuery);
+/* =========================================================
+ * bootstrap-modal.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#modals
+ * =========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================= */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* MODAL CLASS DEFINITION
+  * ====================== */
+
+  var Modal = function (element, options) {
+    this.options = options
+    this.$element = $(element)
+      .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
+    this.options.remote && this.$element.find('.modal-body').load(this.options.remote)
+  }
+
+  Modal.prototype = {
+
+      constructor: Modal
+
+    , toggle: function () {
+        return this[!this.isShown ? 'show' : 'hide']()
+      }
+
+    , show: function () {
+        var that = this
+          , e = $.Event('show')
+
+        this.$element.trigger(e)
+
+        if (this.isShown || e.isDefaultPrevented()) return
+
+        this.isShown = true
+
+        this.escape()
+
+        this.backdrop(function () {
+          var transition = $.support.transition && that.$element.hasClass('fade')
+
+          if (!that.$element.parent().length) {
+            that.$element.appendTo(document.body) //don't move modals dom position
+          }
+
+          that.$element.show()
+
+          if (transition) {
+            that.$element[0].offsetWidth // force reflow
+          }
+
+          that.$element
+            .addClass('in')
+            .attr('aria-hidden', false)
+
+          that.enforceFocus()
+
+          transition ?
+            that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown') }) :
+            that.$element.focus().trigger('shown')
+
+        })
+      }
+
+    , hide: function (e) {
+        e && e.preventDefault()
+
+        var that = this
+
+        e = $.Event('hide')
+
+        this.$element.trigger(e)
+
+        if (!this.isShown || e.isDefaultPrevented()) return
+
+        this.isShown = false
+
+        this.escape()
+
+        $(document).off('focusin.modal')
+
+        this.$element
+          .removeClass('in')
+          .attr('aria-hidden', true)
+
+        $.support.transition && this.$element.hasClass('fade') ?
+          this.hideWithTransition() :
+          this.hideModal()
+      }
+
+    , enforceFocus: function () {
+        var that = this
+        $(document).on('focusin.modal', function (e) {
+          if (that.$element[0] !== e.target && !that.$element.has(e.target).length) {
+            that.$element.focus()
+          }
+        })
+      }
+
+    , escape: function () {
+        var that = this
+        if (this.isShown && this.options.keyboard) {
+          this.$element.on('keyup.dismiss.modal', function ( e ) {
+            e.which == 27 && that.hide()
+          })
+        } else if (!this.isShown) {
+          this.$element.off('keyup.dismiss.modal')
+        }
+      }
+
+    , hideWithTransition: function () {
+        var that = this
+          , timeout = setTimeout(function () {
+              that.$element.off($.support.transition.end)
+              that.hideModal()
+            }, 500)
+
+        this.$element.one($.support.transition.end, function () {
+          clearTimeout(timeout)
+          that.hideModal()
+        })
+      }
+
+    , hideModal: function () {
+        var that = this
+        this.$element.hide()
+        this.backdrop(function () {
+          that.removeBackdrop()
+          that.$element.trigger('hidden')
+        })
+      }
+
+    , removeBackdrop: function () {
+        this.$backdrop && this.$backdrop.remove()
+        this.$backdrop = null
+      }
+
+    , backdrop: function (callback) {
+        var that = this
+          , animate = this.$element.hasClass('fade') ? 'fade' : ''
+
+        if (this.isShown && this.options.backdrop) {
+          var doAnimate = $.support.transition && animate
+
+          this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
+            .appendTo(document.body)
+
+          this.$backdrop.click(
+            this.options.backdrop == 'static' ?
+              $.proxy(this.$element[0].focus, this.$element[0])
+            : $.proxy(this.hide, this)
+          )
+
+          if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
+
+          this.$backdrop.addClass('in')
+
+          if (!callback) return
+
+          doAnimate ?
+            this.$backdrop.one($.support.transition.end, callback) :
+            callback()
+
+        } else if (!this.isShown && this.$backdrop) {
+          this.$backdrop.removeClass('in')
+
+          $.support.transition && this.$element.hasClass('fade')?
+            this.$backdrop.one($.support.transition.end, callback) :
+            callback()
+
+        } else if (callback) {
+          callback()
+        }
+      }
+  }
+
+
+ /* MODAL PLUGIN DEFINITION
+  * ======================= */
+
+  var old = $.fn.modal
+
+  $.fn.modal = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('modal')
+        , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option)
+      if (!data) $this.data('modal', (data = new Modal(this, options)))
+      if (typeof option == 'string') data[option]()
+      else if (options.show) data.show()
+    })
+  }
+
+  $.fn.modal.defaults = {
+      backdrop: true
+    , keyboard: true
+    , show: true
+  }
+
+  $.fn.modal.Constructor = Modal
+
+
+ /* MODAL NO CONFLICT
+  * ================= */
+
+  $.fn.modal.noConflict = function () {
+    $.fn.modal = old
+    return this
+  }
+
+
+ /* MODAL DATA-API
+  * ============== */
+
+  $(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) {
+    var $this = $(this)
+      , href = $this.attr('href')
+      , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
+      , option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data())
+
+    e.preventDefault()
+
+    $target
+      .modal(option)
+      .one('hide', function () {
+        $this.focus()
+      })
+  })
+
+}(window.jQuery);
+/* ===========================================================
+ * bootstrap-tooltip.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#tooltips
+ * Inspired by the original jQuery.tipsy by Jason Frame
+ * ===========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* TOOLTIP PUBLIC CLASS DEFINITION
+  * =============================== */
+
+  var Tooltip = function (element, options) {
+    this.init('tooltip', element, options)
+  }
+
+  Tooltip.prototype = {
+
+    constructor: Tooltip
+
+  , init: function (type, element, options) {
+      var eventIn
+        , eventOut
+        , triggers
+        , trigger
+        , i
+
+      this.type = type
+      this.$element = $(element)
+      this.options = this.getOptions(options)
+      this.enabled = true
+
+      triggers = this.options.trigger.split(' ')
+
+      for (i = triggers.length; i--;) {
+        trigger = triggers[i]
+        if (trigger == 'click') {
+          this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
+        } else if (trigger != 'manual') {
+          eventIn = trigger == 'hover' ? 'mouseenter' : 'focus'
+          eventOut = trigger == 'hover' ? 'mouseleave' : 'blur'
+          this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
+          this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
+        }
+      }
+
+      this.options.selector ?
+        (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
+        this.fixTitle()
+    }
+
+  , getOptions: function (options) {
+      options = $.extend({}, $.fn[this.type].defaults, this.$element.data(), options)
+
+      if (options.delay && typeof options.delay == 'number') {
+        options.delay = {
+          show: options.delay
+        , hide: options.delay
+        }
+      }
+
+      return options
+    }
+
+  , enter: function (e) {
+      var defaults = $.fn[this.type].defaults
+        , options = {}
+        , self
+
+      this._options && $.each(this._options, function (key, value) {
+        if (defaults[key] != value) options[key] = value
+      }, this)
+
+      self = $(e.currentTarget)[this.type](options).data(this.type)
+
+      if (!self.options.delay || !self.options.delay.show) return self.show()
+
+      clearTimeout(this.timeout)
+      self.hoverState = 'in'
+      this.timeout = setTimeout(function() {
+        if (self.hoverState == 'in') self.show()
+      }, self.options.delay.show)
+    }
+
+  , leave: function (e) {
+      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+
+      if (this.timeout) clearTimeout(this.timeout)
+      if (!self.options.delay || !self.options.delay.hide) return self.hide()
+
+      self.hoverState = 'out'
+      this.timeout = setTimeout(function() {
+        if (self.hoverState == 'out') self.hide()
+      }, self.options.delay.hide)
+    }
+
+  , show: function () {
+      var $tip
+        , pos
+        , actualWidth
+        , actualHeight
+        , placement
+        , tp
+        , e = $.Event('show')
+
+      if (this.hasContent() && this.enabled) {
+        this.$element.trigger(e)
+        if (e.isDefaultPrevented()) return
+        $tip = this.tip()
+        this.setContent()
+
+        if (this.options.animation) {
+          $tip.addClass('fade')
+        }
+
+        placement = typeof this.options.placement == 'function' ?
+          this.options.placement.call(this, $tip[0], this.$element[0]) :
+          this.options.placement
+
+        $tip
+          .detach()
+          .css({ top: 0, left: 0, display: 'block' })
+
+        this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
+
+        pos = this.getPosition()
+
+        actualWidth = $tip[0].offsetWidth
+        actualHeight = $tip[0].offsetHeight
+
+        switch (placement) {
+          case 'bottom':
+            tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}
+            break
+          case 'top':
+            tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2}
+            break
+          case 'left':
+            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth}
+            break
+          case 'right':
+            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width}
+            break
+        }
+
+        this.applyPlacement(tp, placement)
+        this.$element.trigger('shown')
+      }
+    }
+
+  , applyPlacement: function(offset, placement){
+      var $tip = this.tip()
+        , width = $tip[0].offsetWidth
+        , height = $tip[0].offsetHeight
+        , actualWidth
+        , actualHeight
+        , delta
+        , replace
+
+      $tip
+        .offset(offset)
+        .addClass(placement)
+        .addClass('in')
+
+      actualWidth = $tip[0].offsetWidth
+      actualHeight = $tip[0].offsetHeight
+
+      if (placement == 'top' && actualHeight != height) {
+        offset.top = offset.top + height - actualHeight
+        replace = true
+      }
+
+      if (placement == 'bottom' || placement == 'top') {
+        delta = 0
+
+        if (offset.left < 0){
+          delta = offset.left * -2
+          offset.left = 0
+          $tip.offset(offset)
+          actualWidth = $tip[0].offsetWidth
+          actualHeight = $tip[0].offsetHeight
+        }
+
+        this.replaceArrow(delta - width + actualWidth, actualWidth, 'left')
+      } else {
+        this.replaceArrow(actualHeight - height, actualHeight, 'top')
+      }
+
+      if (replace) $tip.offset(offset)
+    }
+
+  , replaceArrow: function(delta, dimension, position){
+      this
+        .arrow()
+        .css(position, delta ? (50 * (1 - delta / dimension) + "%") : '')
+    }
+
+  , setContent: function () {
+      var $tip = this.tip()
+        , title = this.getTitle()
+
+      $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
+      $tip.removeClass('fade in top bottom left right')
+    }
+
+  , hide: function () {
+      var that = this
+        , $tip = this.tip()
+        , e = $.Event('hide')
+
+      this.$element.trigger(e)
+      if (e.isDefaultPrevented()) return
+
+      $tip.removeClass('in')
+
+      function removeWithAnimation() {
+        var timeout = setTimeout(function () {
+          $tip.off($.support.transition.end).detach()
+        }, 500)
+
+        $tip.one($.support.transition.end, function () {
+          clearTimeout(timeout)
+          $tip.detach()
+        })
+      }
+
+      $.support.transition && this.$tip.hasClass('fade') ?
+        removeWithAnimation() :
+        $tip.detach()
+
+      this.$element.trigger('hidden')
+
+      return this
+    }
+
+  , fixTitle: function () {
+      var $e = this.$element
+      if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
+        $e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
+      }
+    }
+
+  , hasContent: function () {
+      return this.getTitle()
+    }
+
+  , getPosition: function () {
+      var el = this.$element[0]
+      return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : {
+        width: el.offsetWidth
+      , height: el.offsetHeight
+      }, this.$element.offset())
+    }
+
+  , getTitle: function () {
+      var title
+        , $e = this.$element
+        , o = this.options
+
+      title = $e.attr('data-original-title')
+        || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
+
+      return title
+    }
+
+  , tip: function () {
+      return this.$tip = this.$tip || $(this.options.template)
+    }
+
+  , arrow: function(){
+      return this.$arrow = this.$arrow || this.tip().find(".tooltip-arrow")
+    }
+
+  , validate: function () {
+      if (!this.$element[0].parentNode) {
+        this.hide()
+        this.$element = null
+        this.options = null
+      }
+    }
+
+  , enable: function () {
+      this.enabled = true
+    }
+
+  , disable: function () {
+      this.enabled = false
+    }
+
+  , toggleEnabled: function () {
+      this.enabled = !this.enabled
+    }
+
+  , toggle: function (e) {
+      var self = e ? $(e.currentTarget)[this.type](this._options).data(this.type) : this
+      self.tip().hasClass('in') ? self.hide() : self.show()
+    }
+
+  , destroy: function () {
+      this.hide().$element.off('.' + this.type).removeData(this.type)
+    }
+
+  }
+
+
+ /* TOOLTIP PLUGIN DEFINITION
+  * ========================= */
+
+  var old = $.fn.tooltip
+
+  $.fn.tooltip = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('tooltip')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('tooltip', (data = new Tooltip(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.tooltip.Constructor = Tooltip
+
+  $.fn.tooltip.defaults = {
+    animation: true
+  , placement: 'top'
+  , selector: false
+  , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
+  , trigger: 'hover focus'
+  , title: ''
+  , delay: 0
+  , html: false
+  , container: false
+  }
+
+
+ /* TOOLTIP NO CONFLICT
+  * =================== */
+
+  $.fn.tooltip.noConflict = function () {
+    $.fn.tooltip = old
+    return this
+  }
+
+}(window.jQuery);
+/* ===========================================================
+ * bootstrap-popover.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#popovers
+ * ===========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * =========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* POPOVER PUBLIC CLASS DEFINITION
+  * =============================== */
+
+  var Popover = function (element, options) {
+    this.init('popover', element, options)
+  }
+
+
+  /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js
+     ========================================== */
+
+  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, {
+
+    constructor: Popover
+
+  , setContent: function () {
+      var $tip = this.tip()
+        , title = this.getTitle()
+        , content = this.getContent()
+
+      $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
+      $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content)
+
+      $tip.removeClass('fade top bottom left right in')
+    }
+
+  , hasContent: function () {
+      return this.getTitle() || this.getContent()
+    }
+
+  , getContent: function () {
+      var content
+        , $e = this.$element
+        , o = this.options
+
+      content = (typeof o.content == 'function' ? o.content.call($e[0]) :  o.content)
+        || $e.attr('data-content')
+
+      return content
+    }
+
+  , tip: function () {
+      if (!this.$tip) {
+        this.$tip = $(this.options.template)
+      }
+      return this.$tip
+    }
+
+  , destroy: function () {
+      this.hide().$element.off('.' + this.type).removeData(this.type)
+    }
+
+  })
+
+
+ /* POPOVER PLUGIN DEFINITION
+  * ======================= */
+
+  var old = $.fn.popover
+
+  $.fn.popover = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('popover')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('popover', (data = new Popover(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.popover.Constructor = Popover
+
+  $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, {
+    placement: 'right'
+  , trigger: 'click'
+  , content: ''
+  , template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
+  })
+
+
+ /* POPOVER NO CONFLICT
+  * =================== */
+
+  $.fn.popover.noConflict = function () {
+    $.fn.popover = old
+    return this
+  }
+
+}(window.jQuery);
+/* =============================================================
+ * bootstrap-scrollspy.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#scrollspy
+ * =============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* SCROLLSPY CLASS DEFINITION
+  * ========================== */
+
+  function ScrollSpy(element, options) {
+    var process = $.proxy(this.process, this)
+      , $element = $(element).is('body') ? $(window) : $(element)
+      , href
+    this.options = $.extend({}, $.fn.scrollspy.defaults, options)
+    this.$scrollElement = $element.on('scroll.scroll-spy.data-api', process)
+    this.selector = (this.options.target
+      || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+      || '') + ' .nav li > a'
+    this.$body = $('body')
+    this.refresh()
+    this.process()
+  }
+
+  ScrollSpy.prototype = {
+
+      constructor: ScrollSpy
+
+    , refresh: function () {
+        var self = this
+          , $targets
+
+        this.offsets = $([])
+        this.targets = $([])
+
+        $targets = this.$body
+          .find(this.selector)
+          .map(function () {
+            var $el = $(this)
+              , href = $el.data('target') || $el.attr('href')
+              , $href = /^#\w/.test(href) && $(href)
+            return ( $href
+              && $href.length
+              && [[ $href.position().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]] ) || null
+          })
+          .sort(function (a, b) { return a[0] - b[0] })
+          .each(function () {
+            self.offsets.push(this[0])
+            self.targets.push(this[1])
+          })
+      }
+
+    , process: function () {
+        var scrollTop = this.$scrollElement.scrollTop() + this.options.offset
+          , scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight
+          , maxScroll = scrollHeight - this.$scrollElement.height()
+          , offsets = this.offsets
+          , targets = this.targets
+          , activeTarget = this.activeTarget
+          , i
+
+        if (scrollTop >= maxScroll) {
+          return activeTarget != (i = targets.last()[0])
+            && this.activate ( i )
+        }
+
+        for (i = offsets.length; i--;) {
+          activeTarget != targets[i]
+            && scrollTop >= offsets[i]
+            && (!offsets[i + 1] || scrollTop <= offsets[i + 1])
+            && this.activate( targets[i] )
+        }
+      }
+
+    , activate: function (target) {
+        var active
+          , selector
+
+        this.activeTarget = target
+
+        $(this.selector)
+          .parent('.active')
+          .removeClass('active')
+
+        selector = this.selector
+          + '[data-target="' + target + '"],'
+          + this.selector + '[href="' + target + '"]'
+
+        active = $(selector)
+          .parent('li')
+          .addClass('active')
+
+        if (active.parent('.dropdown-menu').length)  {
+          active = active.closest('li.dropdown').addClass('active')
+        }
+
+        active.trigger('activate')
+      }
+
+  }
+
+
+ /* SCROLLSPY PLUGIN DEFINITION
+  * =========================== */
+
+  var old = $.fn.scrollspy
+
+  $.fn.scrollspy = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('scrollspy')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.scrollspy.Constructor = ScrollSpy
+
+  $.fn.scrollspy.defaults = {
+    offset: 10
+  }
+
+
+ /* SCROLLSPY NO CONFLICT
+  * ===================== */
+
+  $.fn.scrollspy.noConflict = function () {
+    $.fn.scrollspy = old
+    return this
+  }
+
+
+ /* SCROLLSPY DATA-API
+  * ================== */
+
+  $(window).on('load', function () {
+    $('[data-spy="scroll"]').each(function () {
+      var $spy = $(this)
+      $spy.scrollspy($spy.data())
+    })
+  })
+
+}(window.jQuery);/* ========================================================
+ * bootstrap-tab.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#tabs
+ * ========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ======================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* TAB CLASS DEFINITION
+  * ==================== */
+
+  var Tab = function (element) {
+    this.element = $(element)
+  }
+
+  Tab.prototype = {
+
+    constructor: Tab
+
+  , show: function () {
+      var $this = this.element
+        , $ul = $this.closest('ul:not(.dropdown-menu)')
+        , selector = $this.attr('data-target')
+        , previous
+        , $target
+        , e
+
+      if (!selector) {
+        selector = $this.attr('href')
+        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+      }
+
+      if ( $this.parent('li').hasClass('active') ) return
+
+      previous = $ul.find('.active:last a')[0]
+
+      e = $.Event('show', {
+        relatedTarget: previous
+      })
+
+      $this.trigger(e)
+
+      if (e.isDefaultPrevented()) return
+
+      $target = $(selector)
+
+      this.activate($this.parent('li'), $ul)
+      this.activate($target, $target.parent(), function () {
+        $this.trigger({
+          type: 'shown'
+        , relatedTarget: previous
+        })
+      })
+    }
+
+  , activate: function ( element, container, callback) {
+      var $active = container.find('> .active')
+        , transition = callback
+            && $.support.transition
+            && $active.hasClass('fade')
+
+      function next() {
+        $active
+          .removeClass('active')
+          .find('> .dropdown-menu > .active')
+          .removeClass('active')
+
+        element.addClass('active')
+
+        if (transition) {
+          element[0].offsetWidth // reflow for transition
+          element.addClass('in')
+        } else {
+          element.removeClass('fade')
+        }
+
+        if ( element.parent('.dropdown-menu') ) {
+          element.closest('li.dropdown').addClass('active')
+        }
+
+        callback && callback()
+      }
+
+      transition ?
+        $active.one($.support.transition.end, next) :
+        next()
+
+      $active.removeClass('in')
+    }
+  }
+
+
+ /* TAB PLUGIN DEFINITION
+  * ===================== */
+
+  var old = $.fn.tab
+
+  $.fn.tab = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('tab')
+      if (!data) $this.data('tab', (data = new Tab(this)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.tab.Constructor = Tab
+
+
+ /* TAB NO CONFLICT
+  * =============== */
+
+  $.fn.tab.noConflict = function () {
+    $.fn.tab = old
+    return this
+  }
+
+
+ /* TAB DATA-API
+  * ============ */
+
+  $(document).on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
+    e.preventDefault()
+    $(this).tab('show')
+  })
+
+}(window.jQuery);/* =============================================================
+ * bootstrap-typeahead.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#typeahead
+ * =============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function($){
+
+  "use strict"; // jshint ;_;
+
+
+ /* TYPEAHEAD PUBLIC CLASS DEFINITION
+  * ================================= */
+
+  var Typeahead = function (element, options) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.typeahead.defaults, options)
+    this.matcher = this.options.matcher || this.matcher
+    this.sorter = this.options.sorter || this.sorter
+    this.highlighter = this.options.highlighter || this.highlighter
+    this.updater = this.options.updater || this.updater
+    this.source = this.options.source
+    this.$menu = $(this.options.menu)
+    this.shown = false
+    this.listen()
+  }
+
+  Typeahead.prototype = {
+
+    constructor: Typeahead
+
+  , select: function () {
+      var val = this.$menu.find('.active').attr('data-value')
+      this.$element
+        .val(this.updater(val))
+        .change()
+      return this.hide()
+    }
+
+  , updater: function (item) {
+      return item
+    }
+
+  , show: function () {
+      var pos = $.extend({}, this.$element.position(), {
+        height: this.$element[0].offsetHeight
+      })
+
+      this.$menu
+        .insertAfter(this.$element)
+        .css({
+          top: pos.top + pos.height
+        , left: pos.left
+        })
+        .show()
+
+      this.shown = true
+      return this
+    }
+
+  , hide: function () {
+      this.$menu.hide()
+      this.shown = false
+      return this
+    }
+
+  , lookup: function (event) {
+      var items
+
+      this.query = this.$element.val()
+
+      if (!this.query || this.query.length < this.options.minLength) {
+        return this.shown ? this.hide() : this
+      }
+
+      items = $.isFunction(this.source) ? this.source(this.query, $.proxy(this.process, this)) : this.source
+
+      return items ? this.process(items) : this
+    }
+
+  , process: function (items) {
+      var that = this
+
+      items = $.grep(items, function (item) {
+        return that.matcher(item)
+      })
+
+      items = this.sorter(items)
+
+      if (!items.length) {
+        return this.shown ? this.hide() : this
+      }
+
+      return this.render(items.slice(0, this.options.items)).show()
+    }
+
+  , matcher: function (item) {
+      return ~item.toLowerCase().indexOf(this.query.toLowerCase())
+    }
+
+  , sorter: function (items) {
+      var beginswith = []
+        , caseSensitive = []
+        , caseInsensitive = []
+        , item
+
+      while (item = items.shift()) {
+        if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item)
+        else if (~item.indexOf(this.query)) caseSensitive.push(item)
+        else caseInsensitive.push(item)
+      }
+
+      return beginswith.concat(caseSensitive, caseInsensitive)
+    }
+
+  , highlighter: function (item) {
+      var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&')
+      return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) {
+        return '<strong>' + match + '</strong>'
+      })
+    }
+
+  , render: function (items) {
+      var that = this
+
+      items = $(items).map(function (i, item) {
+        i = $(that.options.item).attr('data-value', item)
+        i.find('a').html(that.highlighter(item))
+        return i[0]
+      })
+
+      items.first().addClass('active')
+      this.$menu.html(items)
+      return this
+    }
+
+  , next: function (event) {
+      var active = this.$menu.find('.active').removeClass('active')
+        , next = active.next()
+
+      if (!next.length) {
+        next = $(this.$menu.find('li')[0])
+      }
+
+      next.addClass('active')
+    }
+
+  , prev: function (event) {
+      var active = this.$menu.find('.active').removeClass('active')
+        , prev = active.prev()
+
+      if (!prev.length) {
+        prev = this.$menu.find('li').last()
+      }
+
+      prev.addClass('active')
+    }
+
+  , listen: function () {
+      this.$element
+        .on('focus',    $.proxy(this.focus, this))
+        .on('blur',     $.proxy(this.blur, this))
+        .on('keypress', $.proxy(this.keypress, this))
+        .on('keyup',    $.proxy(this.keyup, this))
+
+      if (this.eventSupported('keydown')) {
+        this.$element.on('keydown', $.proxy(this.keydown, this))
+      }
+
+      this.$menu
+        .on('click', $.proxy(this.click, this))
+        .on('mouseenter', 'li', $.proxy(this.mouseenter, this))
+        .on('mouseleave', 'li', $.proxy(this.mouseleave, this))
+    }
+
+  , eventSupported: function(eventName) {
+      var isSupported = eventName in this.$element
+      if (!isSupported) {
+        this.$element.setAttribute(eventName, 'return;')
+        isSupported = typeof this.$element[eventName] === 'function'
+      }
+      return isSupported
+    }
+
+  , move: function (e) {
+      if (!this.shown) return
+
+      switch(e.keyCode) {
+        case 9: // tab
+        case 13: // enter
+        case 27: // escape
+          e.preventDefault()
+          break
+
+        case 38: // up arrow
+          e.preventDefault()
+          this.prev()
+          break
+
+        case 40: // down arrow
+          e.preventDefault()
+          this.next()
+          break
+      }
+
+      e.stopPropagation()
+    }
+
+  , keydown: function (e) {
+      this.suppressKeyPressRepeat = ~$.inArray(e.keyCode, [40,38,9,13,27])
+      this.move(e)
+    }
+
+  , keypress: function (e) {
+      if (this.suppressKeyPressRepeat) return
+      this.move(e)
+    }
+
+  , keyup: function (e) {
+      switch(e.keyCode) {
+        case 40: // down arrow
+        case 38: // up arrow
+        case 16: // shift
+        case 17: // ctrl
+        case 18: // alt
+          break
+
+        case 9: // tab
+        case 13: // enter
+          if (!this.shown) return
+          this.select()
+          break
+
+        case 27: // escape
+          if (!this.shown) return
+          this.hide()
+          break
+
+        default:
+          this.lookup()
+      }
+
+      e.stopPropagation()
+      e.preventDefault()
+  }
+
+  , focus: function (e) {
+      this.focused = true
+    }
+
+  , blur: function (e) {
+      this.focused = false
+      if (!this.mousedover && this.shown) this.hide()
+    }
+
+  , click: function (e) {
+      e.stopPropagation()
+      e.preventDefault()
+      this.select()
+      this.$element.focus()
+    }
+
+  , mouseenter: function (e) {
+      this.mousedover = true
+      this.$menu.find('.active').removeClass('active')
+      $(e.currentTarget).addClass('active')
+    }
+
+  , mouseleave: function (e) {
+      this.mousedover = false
+      if (!this.focused && this.shown) this.hide()
+    }
+
+  }
+
+
+  /* TYPEAHEAD PLUGIN DEFINITION
+   * =========================== */
+
+  var old = $.fn.typeahead
+
+  $.fn.typeahead = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('typeahead')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('typeahead', (data = new Typeahead(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.typeahead.defaults = {
+    source: []
+  , items: 8
+  , menu: '<ul class="typeahead dropdown-menu"></ul>'
+  , item: '<li><a href="#"></a></li>'
+  , minLength: 1
+  }
+
+  $.fn.typeahead.Constructor = Typeahead
+
+
+ /* TYPEAHEAD NO CONFLICT
+  * =================== */
+
+  $.fn.typeahead.noConflict = function () {
+    $.fn.typeahead = old
+    return this
+  }
+
+
+ /* TYPEAHEAD DATA-API
+  * ================== */
+
+  $(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
+    var $this = $(this)
+    if ($this.data('typeahead')) return
+    $this.typeahead($this.data())
+  })
+
+}(window.jQuery);
+/* ==========================================================
+ * bootstrap-affix.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#affix
+ * ==========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* AFFIX CLASS DEFINITION
+  * ====================== */
+
+  var Affix = function (element, options) {
+    this.options = $.extend({}, $.fn.affix.defaults, options)
+    this.$window = $(window)
+      .on('scroll.affix.data-api', $.proxy(this.checkPosition, this))
+      .on('click.affix.data-api',  $.proxy(function () { setTimeout($.proxy(this.checkPosition, this), 1) }, this))
+    this.$element = $(element)
+    this.checkPosition()
+  }
+
+  Affix.prototype.checkPosition = function () {
+    if (!this.$element.is(':visible')) return
+
+    var scrollHeight = $(document).height()
+      , scrollTop = this.$window.scrollTop()
+      , position = this.$element.offset()
+      , offset = this.options.offset
+      , offsetBottom = offset.bottom
+      , offsetTop = offset.top
+      , reset = 'affix affix-top affix-bottom'
+      , affix
+
+    if (typeof offset != 'object') offsetBottom = offsetTop = offset
+    if (typeof offsetTop == 'function') offsetTop = offset.top()
+    if (typeof offsetBottom == 'function') offsetBottom = offset.bottom()
+
+    affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ?
+      false    : offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ?
+      'bottom' : offsetTop != null && scrollTop <= offsetTop ?
+      'top'    : false
+
+    if (this.affixed === affix) return
+
+    this.affixed = affix
+    this.unpin = affix == 'bottom' ? position.top - scrollTop : null
+
+    this.$element.removeClass(reset).addClass('affix' + (affix ? '-' + affix : ''))
+  }
+
+
+ /* AFFIX PLUGIN DEFINITION
+  * ======================= */
+
+  var old = $.fn.affix
+
+  $.fn.affix = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('affix')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('affix', (data = new Affix(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.affix.Constructor = Affix
+
+  $.fn.affix.defaults = {
+    offset: 0
+  }
+
+
+ /* AFFIX NO CONFLICT
+  * ================= */
+
+  $.fn.affix.noConflict = function () {
+    $.fn.affix = old
+    return this
+  }
+
+
+ /* AFFIX DATA-API
+  * ============== */
+
+  $(window).on('load', function () {
+    $('[data-spy="affix"]').each(function () {
+      var $spy = $(this)
+        , data = $spy.data()
+
+      data.offset = data.offset || {}
+
+      data.offsetBottom && (data.offset.bottom = data.offsetBottom)
+      data.offsetTop && (data.offset.top = data.offsetTop)
+
+      $spy.affix(data)
+    })
+  })
+
+
+}(window.jQuery);
\ No newline at end of file
diff --git a/apps/bootstrap/js/bootstrap.min.js b/apps/bootstrap/js/bootstrap.min.js
new file mode 100644
index 0000000..95c5ac5
--- /dev/null
+++ b/apps/bootstrap/js/bootstrap.min.js
@@ -0,0 +1,6 @@
+/*!
+* Bootstrap.js by @fat & @mdo
+* Copyright 2012 Twitter, Inc.
+* http://www.apache.org/licenses/LICENSE-2.0.txt
+*/
+!function(e){"use strict";e(function(){e.support.transition=function(){var e=function(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},n;for(n in t)if(e.style[n]!==undefined)return t[n]}();return e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed").remove()}var n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()};var r=e.fn.alert;e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e.fn.alert.noConflict=function(){return e.fn.alert=r,this},e(document).on("click.alert.data-api",t,n.prototype.close)}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.closest('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")};var n=e.fn.button;e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e.fn.button.noConflict=function(){return e.fn.button=n,this},e(document).on("click.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.$indicators=this.$element.find(".carousel-indicators"),this.options=n,this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return t||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},getActiveIndex:function(){return this.$active=this.$element.find(".item.active"),this.$items=this.$active.parent().children(),this.$items.index(this.$active)},to:function(t){var n=this.getActiveIndex(),r=this;if(t>this.$items.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){r.to(t)}):n==t?this.pause().cycle():this.slide(t>n?"next":"prev",e(this.$items[t]))},pause:function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle(!0)),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this,f;this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u](),f=e.Event("slide",{relatedTarget:i[0],direction:o});if(i.hasClass("active"))return;this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid",function(){var t=e(a.$indicators.children()[a.getActiveIndex()]);t&&t.addClass("active")}));if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this}};var n=e.fn.carousel;e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("carousel"),s=e.extend({},e.fn.carousel.defaults,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.pause().cycle()})},e.fn.carousel.defaults={interval:5e3,pause:"hover"},e.fn.carousel.Constructor=t,e.fn.carousel.noConflict=function(){return e.fn.carousel=n,this},e(document).on("click.carousel.data-api","[data-slide], [data-slide-to]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=e.extend({},i.data(),n.data()),o;i.carousel(s),(o=n.attr("data-slide-to"))&&i.data("carousel").pause().to(o).cycle(),t.preventDefault()})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.collapse.defaults,n),this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.prototype={constructor:t,dimension:function(){var e=this.$element.hasClass("width");return e?"width":"height"},show:function(){var t,n,r,i;if(this.transitioning||this.$element.hasClass("in"))return;t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show"),"shown"),e.support.transition&&this.$element[t](this.$element[0][n])},hide:function(){var t;if(this.transitioning||!this.$element.hasClass("in"))return;t=this.dimension(),this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide"),"hidden"),this.$element[t](0)},reset:function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!==null?"addClass":"removeClass"]("collapse"),this},transition:function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}};var n=e.fn.collapse;e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=e.extend({},e.fn.collapse.defaults,r.data(),typeof n=="object"&&n);i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.defaults={toggle:!0},e.fn.collapse.Constructor=t,e.fn.collapse.noConflict=function(){return e.fn.collapse=n,this},e(document).on("click.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})}(window.jQuery),!function(e){"use strict";function r(){e(t).each(function(){i(e(this)).removeClass("open")})}function i(t){var n=t.attr("data-target"),r;n||(n=t.attr("href"),n=n&&/#/.test(n)&&n.replace(/.*(?=#[^\s]*$)/,"")),r=n&&e(n);if(!r||!r.length)r=t.parent();return r}var t="[data-toggle=dropdown]",n=function(t){var n=e(t).on("click.dropdown.data-api",this.toggle);e("html").on("click.dropdown.data-api",function(){n.parent().removeClass("open")})};n.prototype={constructor:n,toggle:function(t){var n=e(this),s,o;if(n.is(".disabled, :disabled"))return;return s=i(n),o=s.hasClass("open"),r(),o||s.toggleClass("open"),n.focus(),!1},keydown:function(n){var r,s,o,u,a,f;if(!/(38|40|27)/.test(n.keyCode))return;r=e(this),n.preventDefault(),n.stopPropagation();if(r.is(".disabled, :disabled"))return;u=i(r),a=u.hasClass("open");if(!a||a&&n.keyCode==27)return n.which==27&&u.find(t).focus(),r.click();s=e("[role=menu] li:not(.divider):visible a",u);if(!s.length)return;f=s.index(s.filter(":focus")),n.keyCode==38&&f>0&&f--,n.keyCode==40&&f<s.length-1&&f++,~f||(f=0),s.eq(f).focus()}};var s=e.fn.dropdown;e.fn.dropdown=function(t){return this.each(function(){var r=e(this),i=r.data("dropdown");i||r.data("dropdown",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.dropdown.Constructor=n,e.fn.dropdown.noConflict=function(){return e.fn.dropdown=s,this},e(document).on("click.dropdown.data-api",r).on("click.dropdown.data-api",".dropdown form",function(e){e.stopPropagation()}).on("click.dropdown-menu",function(e){e.stopPropagation()}).on("click.dropdown.data-api",t,n.prototype.toggle).on("keydown.dropdown.data-api",t+", [role=menu]",n.prototype.keydown)}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=n,this.$element=e(t).delegate('[data-dismiss="modal"]',"click.dismiss.modal",e.proxy(this.hide,this)),this.options.remote&&this.$element.find(".modal-body").load(this.options.remote)};t.prototype={constructor:t,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var t=this,n=e.Event("show");this.$element.trigger(n);if(this.isShown||n.isDefaultPrevented())return;this.isShown=!0,this.escape(),this.backdrop(function(){var n=e.support.transition&&t.$element.hasClass("fade");t.$element.parent().length||t.$element.appendTo(document.body),t.$element.show(),n&&t.$element[0].offsetWidth,t.$element.addClass("in").attr("aria-hidden",!1),t.enforceFocus(),n?t.$element.one(e.support.transition.end,function(){t.$element.focus().trigger("shown")}):t.$element.focus().trigger("shown")})},hide:function(t){t&&t.preventDefault();var n=this;t=e.Event("hide"),this.$element.trigger(t);if(!this.isShown||t.isDefaultPrevented())return;this.isShown=!1,this.escape(),e(document).off("focusin.modal"),this.$element.removeClass("in").attr("aria-hidden",!0),e.support.transition&&this.$element.hasClass("fade")?this.hideWithTransition():this.hideModal()},enforceFocus:function(){var t=this;e(document).on("focusin.modal",function(e){t.$element[0]!==e.target&&!t.$element.has(e.target).length&&t.$element.focus()})},escape:function(){var e=this;this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.modal",function(t){t.which==27&&e.hide()}):this.isShown||this.$element.off("keyup.dismiss.modal")},hideWithTransition:function(){var t=this,n=setTimeout(function(){t.$element.off(e.support.transition.end),t.hideModal()},500);this.$element.one(e.support.transition.end,function(){clearTimeout(n),t.hideModal()})},hideModal:function(){var e=this;this.$element.hide(),this.backdrop(function(){e.removeBackdrop(),e.$element.trigger("hidden")})},removeBackdrop:function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},backdrop:function(t){var n=this,r=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var i=e.support.transition&&r;this.$backdrop=e('<div class="modal-backdrop '+r+'" />').appendTo(document.body),this.$backdrop.click(this.options.backdrop=="static"?e.proxy(this.$element[0].focus,this.$element[0]):e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in");if(!t)return;i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,t):t()):t&&t()}};var n=e.fn.modal;e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("modal"),s=e.extend({},e.fn.modal.defaults,r.data(),typeof n=="object"&&n);i||r.data("modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},e.fn.modal.Constructor=t,e.fn.modal.noConflict=function(){return e.fn.modal=n,this},e(document).on("click.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})})}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("tooltip",e,t)};t.prototype={constructor:t,init:function(t,n,r){var i,s,o,u,a;this.type=t,this.$element=e(n),this.options=this.getOptions(r),this.enabled=!0,o=this.options.trigger.split(" ");for(a=o.length;a--;)u=o[a],u=="click"?this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this)):u!="manual"&&(i=u=="hover"?"mouseenter":"focus",s=u=="hover"?"mouseleave":"blur",this.$element.on(i+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(s+"."+this.type,this.options.selector,e.proxy(this.leave,this)));this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(t){return t=e.extend({},e.fn[this.type].defaults,this.$element.data(),t),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},enter:function(t){var n=e.fn[this.type].defaults,r={},i;this._options&&e.each(this._options,function(e,t){n[e]!=t&&(r[e]=t)},this),i=e(t.currentTarget)[this.type](r).data(this.type);if(!i.options.delay||!i.options.delay.show)return i.show();clearTimeout(this.timeout),i.hoverState="in",this.timeout=setTimeout(function(){i.hoverState=="in"&&i.show()},i.options.delay.show)},leave:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},show:function(){var t,n,r,i,s,o,u=e.Event("show");if(this.hasContent()&&this.enabled){this.$element.trigger(u);if(u.isDefaultPrevented())return;t=this.tip(),this.setContent(),this.options.animation&&t.addClass("fade"),s=typeof this.options.placement=="function"?this.options.placement.call(this,t[0],this.$element[0]):this.options.placement,t.detach().css({top:0,left:0,display:"block"}),this.options.container?t.appendTo(this.options.container):t.insertAfter(this.$element),n=this.getPosition(),r=t[0].offsetWidth,i=t[0].offsetHeight;switch(s){case"bottom":o={top:n.top+n.height,left:n.left+n.width/2-r/2};break;case"top":o={top:n.top-i,left:n.left+n.width/2-r/2};break;case"left":o={top:n.top+n.height/2-i/2,left:n.left-r};break;case"right":o={top:n.top+n.height/2-i/2,left:n.left+n.width}}this.applyPlacement(o,s),this.$element.trigger("shown")}},applyPlacement:function(e,t){var n=this.tip(),r=n[0].offsetWidth,i=n[0].offsetHeight,s,o,u,a;n.offset(e).addClass(t).addClass("in"),s=n[0].offsetWidth,o=n[0].offsetHeight,t=="top"&&o!=i&&(e.top=e.top+i-o,a=!0),t=="bottom"||t=="top"?(u=0,e.left<0&&(u=e.left*-2,e.left=0,n.offset(e),s=n[0].offsetWidth,o=n[0].offsetHeight),this.replaceArrow(u-r+s,s,"left")):this.replaceArrow(o-i,o,"top"),a&&n.offset(e)},replaceArrow:function(e,t,n){this.arrow().css(n,e?50*(1-e/t)+"%":"")},setContent:function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},hide:function(){function i(){var t=setTimeout(function(){n.off(e.support.transition.end).detach()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.detach()})}var t=this,n=this.tip(),r=e.Event("hide");this.$element.trigger(r);if(r.isDefaultPrevented())return;return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?i():n.detach(),this.$element.trigger("hidden"),this},fixTitle:function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").attr("title","")},hasContent:function(){return this.getTitle()},getPosition:function(){var t=this.$element[0];return e.extend({},typeof t.getBoundingClientRect=="function"?t.getBoundingClientRect():{width:t.offsetWidth,height:t.offsetHeight},this.$element.offset())},getTitle:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},tip:function(){return this.$tip=this.$tip||e(this.options.template)},arrow:function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(t){var n=t?e(t.currentTarget)[this.type](this._options).data(this.type):this;n.tip().hasClass("in")?n.hide():n.show()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}};var n=e.fn.tooltip;e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("tooltip"),s=typeof n=="object"&&n;i||r.data("tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},e.fn.tooltip.noConflict=function(){return e.fn.tooltip=n,this}}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype,{constructor:t,setContent:function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var e,t=this.$element,n=this.options;return e=(typeof n.content=="function"?n.content.call(t[0]):n.content)||t.attr("data-content"),e},tip:function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}});var n=e.fn.popover;e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("popover"),s=typeof n=="object"&&n;i||r.data("popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.defaults=e.extend({},e.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),e.fn.popover.noConflict=function(){return e.fn.popover=n,this}}(window.jQuery),!function(e){"use strict";function t(t,n){var r=e.proxy(this.process,this),i=e(t).is("body")?e(window):e(t),s;this.options=e.extend({},e.fn.scrollspy.defaults,n),this.$scrollElement=i.on("scroll.scroll-spy.data-api",r),this.selector=(this.options.target||(s=e(t).attr("href"))&&s.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=e("body"),this.refresh(),this.process()}t.prototype={constructor:t,refresh:function(){var t=this,n;this.offsets=e([]),this.targets=e([]),n=this.$body.find(this.selector).map(function(){var n=e(this),r=n.data("target")||n.attr("href"),i=/^#\w/.test(r)&&e(r);return i&&i.length&&[[i.position().top+(!e.isWindow(t.$scrollElement.get(0))&&t.$scrollElement.scrollTop()),r]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},process:function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},activate:function(t){var n,r;this.activeTarget=t,e(this.selector).parent(".active").removeClass("active"),r=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',n=e(r).parent("li").addClass("active"),n.parent(".dropdown-menu").length&&(n=n.closest("li.dropdown").addClass("active")),n.trigger("activate")}};var n=e.fn.scrollspy;e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("scrollspy"),s=typeof n=="object"&&n;i||r.data("scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.defaults={offset:10},e.fn.scrollspy.noConflict=function(){return e.fn.scrollspy=n,this},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype={constructor:t,show:function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target"),i,s,o;r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;i=n.find(".active:last a")[0],o=e.Event("show",{relatedTarget:i}),t.trigger(o);if(o.isDefaultPrevented())return;s=e(r),this.activate(t.parent("li"),n),this.activate(s,s.parent(),function(){t.trigger({type:"shown",relatedTarget:i})})},activate:function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")}};var n=e.fn.tab;e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("tab");i||r.data("tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e.fn.tab.noConflict=function(){return e.fn.tab=n,this},e(document).on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.source=this.options.source,this.$menu=e(this.options.menu),this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.position(),{height:this.$element[0].offsetHeight});return this.$menu.insertAfter(this.$element).css({top:t.top+t.height,left:t.left}).show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length<this.options.minLength?this.shown?this.hide():this:(n=e.isFunction(this.source)?this.source(this.query,e.proxy(this.process,this)):this.source,n?this.process(n):this)},process:function(t){var n=this;return t=e.grep(t,function(e){return n.matcher(e)}),t=this.sorter(t),t.length?this.render(t.slice(0,this.options.items)).show():this.shown?this.hide():this},matcher:function(e){return~e.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(e){var t=[],n=[],r=[],i;while(i=e.shift())i.toLowerCase().indexOf(this.query.toLowerCase())?~i.indexOf(this.query)?n.push(i):r.push(i):t.push(i);return t.concat(n,r)},highlighter:function(e){var t=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return e.replace(new RegExp("("+t+")","ig"),function(e,t){return"<strong>"+t+"</strong>"})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),t.first().addClass("active"),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("focus",e.proxy(this.focus,this)).on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),this.eventSupported("keydown")&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this)).on("mouseleave","li",e.proxy(this.mouseleave,this))},eventSupported:function(e){var t=e in this.$element;return t||(this.$element.setAttribute(e,"return;"),t=typeof this.$element[e]=="function"),t},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:case 16:case 17:case 18:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},focus:function(e){this.focused=!0},blur:function(e){this.focused=!1,!this.mousedover&&this.shown&&this.hide()},click:function(e){e.stopPropagation(),e.preventDefault(),this.select(),this.$element.focus()},mouseenter:function(t){this.mousedover=!0,this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")},mouseleave:function(e){this.mousedover=!1,!this.focused&&this.shown&&this.hide()}};var n=e.fn.typeahead;e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>',minLength:1},e.fn.typeahead.Constructor=t,e.fn.typeahead.noConflict=function(){return e.fn.typeahead=n,this},e(document).on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;n.typeahead(n.data())})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=e.extend({},e.fn.affix.defaults,n),this.$window=e(window).on("scroll.affix.data-api",e.proxy(this.checkPosition,this)).on("click.affix.data-api",e.proxy(function(){setTimeout(e.proxy(this.checkPosition,this),1)},this)),this.$element=e(t),this.checkPosition()};t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.bottom,o=i.top,u="affix affix-top affix-bottom",a;typeof i!="object"&&(s=o=i),typeof o=="function"&&(o=i.top()),typeof s=="function"&&(s=i.bottom()),a=this.unpin!=null&&n+this.unpin<=r.top?!1:s!=null&&r.top+this.$element.height()>=t-s?"bottom":o!=null&&n<=o?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))};var n=e.fn.affix;e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("affix"),s=typeof n=="object"&&n;i||r.data("affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.defaults={offset:0},e.fn.affix.noConflict=function(){return e.fn.affix=n,this},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery);
\ No newline at end of file
diff --git a/apps/bootstrap/protected/.htaccess b/apps/bootstrap/protected/.htaccess
new file mode 100644
index 0000000..e019832
--- /dev/null
+++ b/apps/bootstrap/protected/.htaccess
@@ -0,0 +1 @@
+deny from all
diff --git a/apps/bootstrap/protected/config/assets.php b/apps/bootstrap/protected/config/assets.php
new file mode 100644
index 0000000..a3ba847
--- /dev/null
+++ b/apps/bootstrap/protected/config/assets.php
@@ -0,0 +1,19 @@
+<?php
+
+return array(
+	'app' => array(
+		'basePath' => '@wwwroot',
+		'baseUrl' => '@www',
+		'css' => array(
+			'css/bootstrap.min.css',
+			'css/bootstrap-responsive.min.css',
+			'css/site.css',
+		),
+		'js' => array(
+
+		),
+		'depends' => array(
+			'yii',
+		),
+	),
+);
diff --git a/apps/bootstrap/protected/config/main.php b/apps/bootstrap/protected/config/main.php
new file mode 100644
index 0000000..96e0986
--- /dev/null
+++ b/apps/bootstrap/protected/config/main.php
@@ -0,0 +1,21 @@
+<?php
+
+return array(
+	'id' => 'hello',
+	'basePath' => dirname(__DIR__),
+	'components' => array(
+		'cache' => array(
+			'class' => 'yii\caching\FileCache',
+		),
+		'user' => array(
+			'class' => 'yii\web\User',
+			'identityClass' => 'app\models\User',
+		),
+		'assetManager' => array(
+			'bundles' => require(__DIR__ . '/assets.php'),
+		),
+	),
+	'params' => array(
+		'adminEmail' => 'admin@example.com',
+	),
+);
diff --git a/apps/bootstrap/protected/controllers/SiteController.php b/apps/bootstrap/protected/controllers/SiteController.php
new file mode 100644
index 0000000..d1186f6
--- /dev/null
+++ b/apps/bootstrap/protected/controllers/SiteController.php
@@ -0,0 +1,49 @@
+<?php
+
+use yii\web\Controller;
+use app\models\LoginForm;
+use app\models\ContactForm;
+
+class SiteController extends Controller
+{
+	public function actionIndex()
+	{
+		echo $this->render('index');
+	}
+
+	public function actionLogin()
+	{
+		$model = new LoginForm();
+		if ($this->populate($_POST, $model) && $model->login()) {
+			Yii::$app->response->redirect(array('site/index'));
+		} else {
+			echo $this->render('login', array(
+				'model' => $model,
+			));
+		}
+	}
+
+	public function actionLogout()
+	{
+		Yii::$app->getUser()->logout();
+		Yii::$app->getResponse()->redirect(array('site/index'));
+	}
+
+	public function actionContact()
+	{
+		$model = new ContactForm;
+		if ($this->populate($_POST, $model) && $model->contact(Yii::$app->params['adminEmail'])) {
+			Yii::$app->session->setFlash('contactFormSubmitted');
+			Yii::$app->response->refresh();
+		} else {
+			echo $this->render('contact', array(
+				'model' => $model,
+			));
+		}
+	}
+
+	public function actionAbout()
+	{
+		echo $this->render('about');
+	}
+}
diff --git a/apps/bootstrap/protected/models/ContactForm.php b/apps/bootstrap/protected/models/ContactForm.php
new file mode 100644
index 0000000..5124b2c
--- /dev/null
+++ b/apps/bootstrap/protected/models/ContactForm.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace app\models;
+
+use yii\base\Model;
+
+/**
+ * ContactForm is the model behind the contact form.
+ */
+class ContactForm extends Model
+{
+	public $name;
+	public $email;
+	public $subject;
+	public $body;
+	public $verifyCode;
+
+	/**
+	 * @return array the validation rules.
+	 */
+	public function rules()
+	{
+		return array(
+			// name, email, subject and body are required
+			array('name, email, subject, body', 'required'),
+			// email has to be a valid email address
+			array('email', 'email'),
+			// verifyCode needs to be entered correctly
+			//array('verifyCode', 'captcha', 'allowEmpty' => !Captcha::checkRequirements()),
+		);
+	}
+
+	/**
+	 * @return array customized attribute labels
+	 */
+	public function attributeLabels()
+	{
+		return array(
+			'verifyCode' => 'Verification Code',
+		);
+	}
+
+	/**
+	 * Sends an email to the specified email address using the information collected by this model.
+	 * @param string $email the target email address
+	 * @return boolean whether the model passes validation
+	 */
+	public function contact($email)
+	{
+		if ($this->validate()) {
+			$name = '=?UTF-8?B?' . base64_encode($this->name) . '?=';
+			$subject = '=?UTF-8?B?' . base64_encode($this->subject) . '?=';
+			$headers = "From: $name <{$this->email}>\r\n" .
+				"Reply-To: {$this->email}\r\n" .
+				"MIME-Version: 1.0\r\n" .
+				"Content-type: text/plain; charset=UTF-8";
+			mail($email, $subject, $this->body, $headers);
+			return true;
+		} else {
+			return false;
+		}
+	}
+}
diff --git a/apps/bootstrap/protected/models/LoginForm.php b/apps/bootstrap/protected/models/LoginForm.php
new file mode 100644
index 0000000..5ba1dc6
--- /dev/null
+++ b/apps/bootstrap/protected/models/LoginForm.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace app\models;
+
+use Yii;
+use yii\base\Model;
+
+/**
+ * LoginForm is the model behind the login form.
+ */
+class LoginForm extends Model
+{
+	public $username;
+	public $password;
+	public $rememberMe = true;
+
+	/**
+	 * @return array the validation rules.
+	 */
+	public function rules()
+	{
+		return array(
+			// username and password are both required
+			array('username, password', 'required'),
+			// password is validated by validatePassword()
+			array('password', 'validatePassword'),
+			// rememberMe must be a boolean value
+			array('rememberMe', 'boolean'),
+		);
+	}
+
+	/**
+	 * Validates the password.
+	 * This method serves as the inline validation for password.
+	 */
+	public function validatePassword()
+	{
+		$user = User::findByUsername($this->username);
+		if (!$user || !$user->validatePassword($this->password)) {
+			$this->addError('password', 'Incorrect username or password.');
+		}
+	}
+
+	/**
+	 * Logs in a user using the provided username and password.
+	 * @return boolean whether the user is logged in successfully
+	 */
+	public function login()
+	{
+		if ($this->validate()) {
+			$user = User::findByUsername($this->username);
+			Yii::$app->user->login($user, $this->rememberMe ? 3600*24*30 : 0);
+			return true;
+		} else {
+			return false;
+		}
+	}
+}
diff --git a/apps/bootstrap/protected/models/User.php b/apps/bootstrap/protected/models/User.php
new file mode 100644
index 0000000..afbf9f8
--- /dev/null
+++ b/apps/bootstrap/protected/models/User.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace app\models;
+
+class User extends \yii\base\Object implements \yii\web\Identity
+{
+	public $id;
+	public $username;
+	public $password;
+	public $authKey;
+
+	private static $users = array(
+		'100' => array(
+			'id' => '100',
+			'username' => 'admin',
+			'password' => 'admin',
+			'authKey' => 'test100key',
+		),
+		'101' => array(
+			'id' => '101',
+			'username' => 'demo',
+			'password' => 'demo',
+			'authKey' => 'test101key',
+		),
+	);
+
+	public static function findIdentity($id)
+	{
+		return isset(self::$users[$id]) ? new self(self::$users[$id]) : null;
+	}
+
+	public static function findByUsername($username)
+	{
+		foreach (self::$users as $user) {
+			if (strcasecmp($user['username'], $username) === 0) {
+				return new self($user);
+			}
+		}
+		return null;
+	}
+
+	public function getId()
+	{
+		return $this->id;
+	}
+
+	public function getAuthKey()
+	{
+		return $this->authKey;
+	}
+
+	public function validateAuthKey($authKey)
+	{
+		return $this->authKey === $authKey;
+	}
+
+	public function validatePassword($password)
+	{
+		return $this->password === $password;
+	}
+}
diff --git a/apps/bootstrap/protected/runtime/.gitignore b/apps/bootstrap/protected/runtime/.gitignore
new file mode 100644
index 0000000..72e8ffc
--- /dev/null
+++ b/apps/bootstrap/protected/runtime/.gitignore
@@ -0,0 +1 @@
+*
diff --git a/apps/bootstrap/protected/views/layouts/main.php b/apps/bootstrap/protected/views/layouts/main.php
new file mode 100644
index 0000000..8fb915a
--- /dev/null
+++ b/apps/bootstrap/protected/views/layouts/main.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * @var $this \yii\base\View
+ * @var $content string
+ */
+use yii\helpers\Html;
+$this->registerAssetBundle('app');
+?>
+<?php $this->beginPage(); ?>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="utf-8"/>
+	<title><?php echo Html::encode($this->title); ?></title>
+	<?php $this->head(); ?>
+</head>
+<body>
+<div class="container">
+	<?php $this->beginBody(); ?>
+	<div class="masthead">
+		<h3 class="muted">My Company</h3>
+
+		<div class="navbar">
+			<div class="navbar-inner">
+				<div class="container">
+					<ul class="nav">
+						<li><?php echo Html::a('Home', Yii::$app->homeUrl); ?></li>
+						<li><?php echo Html::a('About', array('/site/about')); ?></li>
+						<li><?php echo Html::a('Contact', array('/site/contact')); ?></li>
+						<?php if (Yii::$app->user->isGuest): ?>
+						<li><?php echo Html::a('Login', array('/site/login')); ?></li>
+						<?php else: ?>
+						<li><?php echo Html::a('Logout (' . Html::encode(Yii::$app->user->identity->username) . ')', array('/site/logout')); ?></li>
+						<?php endif; ?>
+					</ul>
+				</div>
+			</div>
+		</div>
+		<!-- /.navbar -->
+	</div>
+
+	<?php echo $content; ?>
+
+	<hr>
+
+	<div class="footer">
+		<p>&copy; My Company <?php echo date('Y'); ?></p>
+		<p>
+			<?php echo Yii::powered(); ?>
+			Template by <a href="http://twitter.github.io/bootstrap/">Twitter Bootstrap</a>
+		</p>
+	</div>
+	<?php $this->endBody(); ?>
+</div>
+</body>
+</html>
+<?php $this->endPage(); ?>
diff --git a/apps/bootstrap/protected/views/site/about.php b/apps/bootstrap/protected/views/site/about.php
new file mode 100644
index 0000000..7ebc5d5
--- /dev/null
+++ b/apps/bootstrap/protected/views/site/about.php
@@ -0,0 +1,15 @@
+<?php
+use yii\helpers\Html;
+/**
+ * @var yii\base\View $this
+ */
+$this->title = 'About';
+?>
+<h1><?php echo Html::encode($this->title); ?></h1>
+
+<p>
+	This is the About page. You may modify the following file to customize its content:
+</p>
+
+<code><?php echo __FILE__; ?></code>
+
diff --git a/apps/bootstrap/protected/views/site/contact.php b/apps/bootstrap/protected/views/site/contact.php
new file mode 100644
index 0000000..4ca40f1
--- /dev/null
+++ b/apps/bootstrap/protected/views/site/contact.php
@@ -0,0 +1,33 @@
+<?php
+use yii\helpers\Html;
+/**
+ * @var yii\base\View $this
+ * @var yii\widgets\ActiveForm $form
+ * @var app\models\ContactForm $model
+ */
+$this->title = 'Contact';
+?>
+<h1><?php echo Html::encode($this->title); ?></h1>
+
+<?php if(Yii::$app->session->hasFlash('contactFormSubmitted')): ?>
+<div class="alert alert-success">
+	Thank you for contacting us. We will respond to you as soon as possible.
+</div>
+<?php return; endif; ?>
+
+<p>
+	If you have business inquiries or other questions, please fill out the following form to contact us. Thank you.
+</p>
+
+<?php $form = $this->beginWidget('yii\widgets\ActiveForm', array(
+	'options' => array('class' => 'form-horizontal'),
+	'fieldConfig' => array('inputOptions' => array('class' => 'input-xlarge')),
+)); ?>
+	<?php echo $form->field($model, 'name')->textInput(); ?>
+	<?php echo $form->field($model, 'email')->textInput(); ?>
+	<?php echo $form->field($model, 'subject')->textInput(); ?>
+	<?php echo $form->field($model, 'body')->textArea(array('rows' => 6)); ?>
+	<div class="form-actions">
+		<?php echo Html::submitButton('Submit', null, null, array('class' => 'btn btn-primary')); ?>
+	</div>
+<?php $this->endWidget(); ?>
diff --git a/apps/bootstrap/protected/views/site/index.php b/apps/bootstrap/protected/views/site/index.php
new file mode 100644
index 0000000..158b61c
--- /dev/null
+++ b/apps/bootstrap/protected/views/site/index.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * @var yii\base\View $this
+ */
+$this->title = 'Welcome';
+?>
+<div class="jumbotron">
+	<h1>Welcome!</h1>
+
+	<p class="lead">Cras justo odio, dapibus ac facilisis in, egestas eget quam. Fusce dapibus, tellus ac cursus
+		commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
+	<a class="btn btn-large btn-success" href="http://www.yiiframework.com">Get started with Yii</a>
+</div>
+
+<hr>
+
+<!-- Example row of columns -->
+<div class="row-fluid">
+	<div class="span4">
+		<h2>Heading</h2>
+
+		<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris
+			condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod.
+			Donec sed odio dui. </p>
+
+		<p><a class="btn" href="#">View details &raquo;</a></p>
+	</div>
+	<div class="span4">
+		<h2>Heading</h2>
+
+		<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris
+			condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod.
+			Donec sed odio dui. </p>
+
+		<p><a class="btn" href="#">View details &raquo;</a></p>
+	</div>
+	<div class="span4">
+		<h2>Heading</h2>
+
+		<p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta
+			felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum
+			massa.</p>
+
+		<p><a class="btn" href="#">View details &raquo;</a></p>
+	</div>
+</div>
+
diff --git a/apps/bootstrap/protected/views/site/login.php b/apps/bootstrap/protected/views/site/login.php
new file mode 100644
index 0000000..8672eeb
--- /dev/null
+++ b/apps/bootstrap/protected/views/site/login.php
@@ -0,0 +1,21 @@
+<?php
+use yii\helpers\Html;
+/**
+ * @var yii\base\View $this
+ * @var yii\widgets\ActiveForm $form
+ * @var app\models\LoginForm $model
+ */
+$this->title = 'Login';
+?>
+<h1><?php echo Html::encode($this->title); ?></h1>
+
+<p>Please fill out the following fields to login:</p>
+
+<?php $form = $this->beginWidget('yii\widgets\ActiveForm', array('options' => array('class' => 'form-horizontal'))); ?>
+	<?php echo $form->field($model, 'username')->textInput(); ?>
+	<?php echo $form->field($model, 'password')->passwordInput(); ?>
+	<?php echo $form->field($model, 'rememberMe')->checkbox(); ?>
+	<div class="form-actions">
+		<?php echo Html::submitButton('Login', null, null, array('class' => 'btn btn-primary')); ?>
+	</div>
+<?php $this->endWidget(); ?>
diff --git a/framework/console/webapp/config.php b/framework/console/webapp/config.php
deleted file mode 100644
index 47ddcc1..0000000
--- a/framework/console/webapp/config.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/** @var $controller \yii\console\controllers\AppController */
-$controller = $this;
-
-return array(
-	'default' => array(
-		'index.php' => array(
-			'handler' => function($source) use ($controller) {
-				return $controller->replaceRelativePath($source, realpath(YII_PATH.'/yii.php'), 'yii');
-			},
-			'permissions' => 0777,
-		),
-		'protected/runtime' => array(
-			'permissions' => 0755,
-		),
-	),
-);
diff --git a/framework/console/webapp/default/index.php b/framework/console/webapp/default/index.php
deleted file mode 100644
index 2aa3580..0000000
--- a/framework/console/webapp/default/index.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-define('YII_DEBUG', true);
-
-require __DIR__.'/../framework/yii.php';
-
-$config = require dirname(__DIR__).'/protected/config/main.php';
-$config['basePath'] = dirname(__DIR__).'/protected';
-
-$app = new \yii\web\Application($config);
-$app->run();
diff --git a/framework/console/webapp/default/protected/config/main.php b/framework/console/webapp/default/protected/config/main.php
deleted file mode 100644
index 5817783..0000000
--- a/framework/console/webapp/default/protected/config/main.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-return array(
-	'id' => 'webapp',
-	'name' => 'My Web Application',
-
-	'components' => array(
-		// uncomment the following to use a MySQL database
-		/*
-		'db' => array(
-			'class' => 'yii\db\Connection',
-			'dsn' => 'mysql:host=localhost;dbname=testdrive',
-			'username' => 'root',
-			'password' => '',
-		),
-		*/
-		'cache' => array(
-			'class' => 'yii\caching\DummyCache',
-		),
-	),
-);
diff --git a/framework/console/webapp/default/protected/controllers/SiteController.php b/framework/console/webapp/default/protected/controllers/SiteController.php
deleted file mode 100644
index ac8c1dd..0000000
--- a/framework/console/webapp/default/protected/controllers/SiteController.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-use \yii\web\Controller;
-
-/**
- * SiteController
- */
-class SiteController extends Controller
-{
-	public function actionIndex()
-	{
-		echo $this->render('index', array(
-			'name' => 'Qiang',
-		));
-	}
-}
diff --git a/framework/console/webapp/default/protected/views/layouts/main.php b/framework/console/webapp/default/protected/views/layouts/main.php
deleted file mode 100644
index 9837038..0000000
--- a/framework/console/webapp/default/protected/views/layouts/main.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php use yii\helpers\Html as Html; ?>
-<!doctype html>
-<html lang="<?php \Yii::$app->language?>">
-	<head>
-		<meta charset="utf-8" />
-		<title><?php echo Html::encode($this->title)?></title>
-	</head>
-	<body>
-		<h1><?php echo Html::encode($this->title)?></h1>
-		<div class="content">
-			<?php echo $content?>
-		</div>
-		<div class="footer">
-			<?php echo \Yii::powered()?>
-		</div>
-	</body>
-</html>
diff --git a/framework/console/webapp/default/protected/views/site/index.php b/framework/console/webapp/default/protected/views/site/index.php
deleted file mode 100644
index 08c5288..0000000
--- a/framework/console/webapp/default/protected/views/site/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Hello, <?php echo $name?>!
diff --git a/readme.md b/readme.md
index 6293292..f395e95 100644
--- a/readme.md
+++ b/readme.md
@@ -13,7 +13,8 @@ without prior notices. **Yii 2.0 is not ready for production use yet.**
 DIRECTORY STRUCTURE
 -------------------
 
-      app/                 a ready-to-use application built on Yii 2
+      apps/                ready-to-use Web apps built on Yii 2
+          bootstrap/       a simple app supporting user login and contact page
       build/               internally used build tools
       docs/                documentation
       framework/           framework source files

From 8c11a4b7e2ab73d1d4eb6477835fc062ea31c8df Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sun, 5 May 2013 18:35:49 -0400
Subject: [PATCH 041/152] code reorganization fix.

---
 apps/bootstrap/index.php | 2 +-
 docs/guide/bootstrap.md  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/bootstrap/index.php b/apps/bootstrap/index.php
index 8f98090..e3188c1 100644
--- a/apps/bootstrap/index.php
+++ b/apps/bootstrap/index.php
@@ -2,7 +2,7 @@
 
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 
-require(__DIR__ . '/../framework/yii.php');
+require(__DIR__ . '/../../framework/yii.php');
 
 $config = require(__DIR__ . '/protected/config/main.php');
 $application = new yii\web\Application($config);
diff --git a/docs/guide/bootstrap.md b/docs/guide/bootstrap.md
index 5f00a75..1bc3fe6 100644
--- a/docs/guide/bootstrap.md
+++ b/docs/guide/bootstrap.md
@@ -7,7 +7,7 @@ If you have installed Yii under a Web-accessible folder, you should be able to
 access this application through the following URL:
 
 ~~~
-http://localhost/yii/app/index.php
+http://localhost/yii/apps/bootstrap/index.php
 ~~~
 
 

From d2f35f2062a76c91f62c8edbad724a5832aa940a Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sun, 5 May 2013 21:02:57 -0400
Subject: [PATCH 042/152] Fixes issue #124.

---
 framework/web/AccessRule.php | 3 ---
 framework/web/User.php       | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/framework/web/AccessRule.php b/framework/web/AccessRule.php
index aaf4f6b..e565e18 100644
--- a/framework/web/AccessRule.php
+++ b/framework/web/AccessRule.php
@@ -9,9 +9,6 @@ namespace yii\web;
 
 use yii\base\Component;
 use yii\base\Action;
-use yii\base\Controller;
-use yii\web\User;
-use yii\web\Request;
 
 /**
  *
diff --git a/framework/web/User.php b/framework/web/User.php
index 2fbea91..88fc12d 100644
--- a/framework/web/User.php
+++ b/framework/web/User.php
@@ -461,7 +461,7 @@ class User extends Component
 		if ($auth !== null) {
 			return $auth->checkAccess($this->getId(), $operation, $params);
 		} else {
-			return true;
+			return false;
 		}
 	}
 }

From 2d1180f35caeaab90353b445e5720f7df61ff286 Mon Sep 17 00:00:00 2001
From: mdeweerd <m.deweerd@ieee.org>
Date: Mon, 6 May 2013 09:56:15 +0300
Subject: [PATCH 043/152] Add ensureBehaviors() to detachBehavior*()

Need to add ensureBehaviors() to detachBehavior*().

The intent may be to detach behaviors defined in behaviors().
In the original implementation, if these behaviors() are not yet attached, they can not selectively be detached.
---
 framework/base/Component.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/framework/base/Component.php b/framework/base/Component.php
index 80259e7..582cf03 100644
--- a/framework/base/Component.php
+++ b/framework/base/Component.php
@@ -496,6 +496,7 @@ class Component extends Object
 	 */
 	public function detachBehavior($name)
 	{
+		$this->ensureBehaviors();
 		if (isset($this->_behaviors[$name])) {
 			$behavior = $this->_behaviors[$name];
 			unset($this->_behaviors[$name]);
@@ -511,6 +512,7 @@ class Component extends Object
 	 */
 	public function detachBehaviors()
 	{
+		$this->ensureBehaviors();
 		if ($this->_behaviors !== null) {
 			foreach ($this->_behaviors as $name => $behavior) {
 				$this->detachBehavior($name);

From ba0032b1cdf02bd514d4a9013114d037cd5a8150 Mon Sep 17 00:00:00 2001
From: Antonio Ramirez <ramirez.cobos@gmail.com>
Date: Mon, 6 May 2013 12:49:29 +0200
Subject: [PATCH 044/152] proposed refactor of ConsoleColor

---
 framework/helpers/Console.php                |  23 +
 framework/helpers/ConsoleColor.php           |  23 -
 framework/helpers/base/Console.php           | 826 +++++++++++++++++++++++++++
 framework/helpers/base/ConsoleColor.php      | 470 ---------------
 tests/unit/framework/helpers/ConsoleTest.php |  10 +
 5 files changed, 859 insertions(+), 493 deletions(-)
 create mode 100644 framework/helpers/Console.php
 delete mode 100644 framework/helpers/ConsoleColor.php
 create mode 100644 framework/helpers/base/Console.php
 delete mode 100644 framework/helpers/base/ConsoleColor.php
 create mode 100644 tests/unit/framework/helpers/ConsoleTest.php

diff --git a/framework/helpers/Console.php b/framework/helpers/Console.php
new file mode 100644
index 0000000..43c64c9
--- /dev/null
+++ b/framework/helpers/Console.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\helpers;
+
+// todo test this on all kinds of terminals, especially windows (check out lib ncurses)
+
+/**
+ * Console View is the base class for console view components
+ *
+ * A console view provides functionality to create rich console application by allowing to format output
+ * by adding color and font style to it.
+ *
+ * @author Carsten Brandt <mail@cebe.cc>
+ * @since 2.0
+ */
+class ConsoleColor extends base\Console
+{
+}
diff --git a/framework/helpers/ConsoleColor.php b/framework/helpers/ConsoleColor.php
deleted file mode 100644
index 794b9c8..0000000
--- a/framework/helpers/ConsoleColor.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\helpers;
-
-// todo test this on all kinds of terminals, especially windows (check out lib ncurses)
-
-/**
- * Console View is the base class for console view components
- *
- * A console view provides functionality to create rich console application by allowing to format output
- * by adding color and font style to it.
- *
- * @author Carsten Brandt <mail@cebe.cc>
- * @since 2.0
- */
-class ConsoleColor extends base\ConsoleColor
-{
-}
diff --git a/framework/helpers/base/Console.php b/framework/helpers/base/Console.php
new file mode 100644
index 0000000..bff5a09
--- /dev/null
+++ b/framework/helpers/base/Console.php
@@ -0,0 +1,826 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\helpers\base;
+
+// todo test this on all kinds of terminals, especially windows (check out lib ncurses)
+
+/**
+ * Console View is the base class for console view components
+ *
+ * A console view provides functionality to create rich console application by allowing to format output
+ * by adding color and font style to it.
+ *
+ * @author Carsten Brandt <mail@cebe.cc>
+ * @since 2.0
+ */
+class Console
+{
+	const FG_BLACK = 30;
+	const FG_RED = 31;
+	const FG_GREEN = 32;
+	const FG_YELLOW = 33;
+	const FG_BLUE = 34;
+	const FG_PURPLE = 35;
+	const FG_CYAN = 36;
+	const FG_GREY = 37;
+
+	const BG_BLACK = 40;
+	const BG_RED = 41;
+	const BG_GREEN = 42;
+	const BG_YELLOW = 43;
+	const BG_BLUE = 44;
+	const BG_PURPLE = 45;
+	const BG_CYAN = 46;
+	const BG_GREY = 47;
+
+    const NORMAL = 0;
+	const BOLD = 1;
+	const ITALIC = 3;
+	const UNDERLINE = 4;
+	const BLINK = 5;
+	const NEGATIVE = 7;
+	const CONCEALED = 8;
+	const CROSSED_OUT = 9;
+	const FRAMED = 51;
+	const ENCIRCLED = 52;
+	const OVERLINED = 53;
+
+	/**
+	 * Moves the terminal cursor up by sending ANSI control code CUU to the terminal.
+	 * If the cursor is already at the edge of the screen, this has no effect.
+	 * @param integer $rows number of rows the cursor should be moved up
+	 */
+	public static function moveCursorUp($rows=1)
+	{
+		echo "\033[" . (int) $rows . 'A';
+	}
+
+	/**
+	 * Moves the terminal cursor down by sending ANSI control code CUD to the terminal.
+	 * If the cursor is already at the edge of the screen, this has no effect.
+	 * @param integer $rows number of rows the cursor should be moved down
+	 */
+	public static function moveCursorDown($rows=1)
+	{
+		echo "\033[" . (int) $rows . 'B';
+	}
+
+	/**
+	 * Moves the terminal cursor forward by sending ANSI control code CUF to the terminal.
+	 * If the cursor is already at the edge of the screen, this has no effect.
+	 * @param integer $steps number of steps the cursor should be moved forward
+	 */
+	public static function moveCursorForward($steps=1)
+	{
+		echo "\033[" . (int) $steps . 'C';
+	}
+
+	/**
+	 * Moves the terminal cursor backward by sending ANSI control code CUB to the terminal.
+	 * If the cursor is already at the edge of the screen, this has no effect.
+	 * @param integer $steps number of steps the cursor should be moved backward
+	 */
+	public static function moveCursorBackward($steps=1)
+	{
+		echo "\033[" . (int) $steps . 'D';
+	}
+
+	/**
+	 * Moves the terminal cursor to the beginning of the next line by sending ANSI control code CNL to the terminal.
+	 * @param integer $lines number of lines the cursor should be moved down
+	 */
+	public static function moveCursorNextLine($lines=1)
+	{
+		echo "\033[" . (int) $lines . 'E';
+	}
+
+	/**
+	 * Moves the terminal cursor to the beginning of the previous line by sending ANSI control code CPL to the terminal.
+	 * @param integer $lines number of lines the cursor should be moved up
+	 */
+	public static function moveCursorPrevLine($lines=1)
+	{
+		echo "\033[" . (int) $lines . 'F';
+	}
+
+	/**
+	 * Moves the cursor to an absolute position given as column and row by sending ANSI control code CUP or CHA to the terminal.
+	 * @param integer $column 1-based column number, 1 is the left edge of the screen.
+	 * @param integer|null $row 1-based row number, 1 is the top edge of the screen. if not set, will move cursor only in current line.
+	 */
+	public static function moveCursorTo($column, $row=null)
+	{
+		if ($row === null) {
+			echo "\033[" . (int) $column . 'G';
+		} else {
+			echo "\033[" . (int) $row . ';' . (int) $column . 'H';
+		}
+	}
+
+	/**
+	 * Scrolls whole page up by sending ANSI control code SU to the terminal.
+	 * New lines are added at the bottom. This is not supported by ANSI.SYS used in windows.
+	 * @param int $lines number of lines to scroll up
+	 */
+	public static function scrollUp($lines=1)
+	{
+		echo "\033[".(int)$lines."S";
+	}
+
+	/**
+	 * Scrolls whole page down by sending ANSI control code SD to the terminal.
+	 * New lines are added at the top. This is not supported by ANSI.SYS used in windows.
+	 * @param int $lines number of lines to scroll down
+	 */
+	public static function scrollDown($lines=1)
+	{
+		echo "\033[".(int)$lines."T";
+	}
+
+	/**
+	 * Saves the current cursor position by sending ANSI control code SCP to the terminal.
+	 * Position can then be restored with {@link restoreCursorPosition}.
+	 */
+	public static function saveCursorPosition()
+	{
+		echo "\033[s";
+	}
+
+	/**
+	 * Restores the cursor position saved with {@link saveCursorPosition} by sending ANSI control code RCP to the terminal.
+	 */
+	public static function restoreCursorPosition()
+	{
+		echo "\033[u";
+	}
+
+	/**
+	 * Hides the cursor by sending ANSI DECTCEM code ?25l to the terminal.
+	 * Use {@link showCursor} to bring it back.
+	 * Do not forget to show cursor when your application exits. Cursor might stay hidden in terminal after exit.
+	 */
+	public static function hideCursor()
+	{
+		echo "\033[?25l";
+	}
+
+	/**
+	 * Will show a cursor again when it has been hidden by {@link hideCursor}  by sending ANSI DECTCEM code ?25h to the terminal.
+	 */
+	public static function showCursor()
+	{
+		echo "\033[?25h";
+	}
+
+	/**
+	 * Clears entire screen content by sending ANSI control code ED with argument 2 to the terminal.
+	 * Cursor position will not be changed.
+	 * **Note:** ANSI.SYS implementation used in windows will reset cursor position to upper left corner of the screen.
+	 */
+	public static function clearScreen()
+	{
+		echo "\033[2J";
+	}
+
+	/**
+	 * Clears text from cursor to the beginning of the screen by sending ANSI control code ED with argument 1 to the terminal.
+	 * Cursor position will not be changed.
+	 */
+	public static function clearScreenBeforeCursor()
+	{
+		echo "\033[1J";
+	}
+
+	/**
+	 * Clears text from cursor to the end of the screen by sending ANSI control code ED with argument 0 to the terminal.
+	 * Cursor position will not be changed.
+	 */
+	public static function clearScreenAfterCursor()
+	{
+		echo "\033[0J";
+	}
+
+	/**
+	 * Clears the line, the cursor is currently on by sending ANSI control code EL with argument 2 to the terminal.
+	 * Cursor position will not be changed.
+	 */
+	public static function clearLine()
+	{
+		echo "\033[2K";
+	}
+
+	/**
+	 * Clears text from cursor position to the beginning of the line by sending ANSI control code EL with argument 1 to the terminal.
+	 * Cursor position will not be changed.
+	 */
+	public static function clearLineBeforeCursor()
+	{
+		echo "\033[1K";
+	}
+
+	/**
+	 * Clears text from cursor position to the end of the line by sending ANSI control code EL with argument 0 to the terminal.
+	 * Cursor position will not be changed.
+	 */
+	public static function clearLineAfterCursor()
+	{
+		echo "\033[0K";
+	}
+
+	/**
+	 * Will send ANSI format for following output
+	 *
+	 * You can pass any of the FG_*, BG_* and TEXT_* constants and also xterm256ColorBg
+	 * TODO: documentation
+	 */
+	public static function ansiStyle()
+	{
+		echo "\033[" . implode(';', func_get_args()) . 'm';
+	}
+
+	/**
+	 * Will return a string formatted with the given ANSI style
+	 *
+	 * See {@link ansiStyle} for possible arguments.
+	 * @param string $string the string to be formatted
+	 * @return string
+	 */
+	public static function ansiStyleString($string)
+	{
+		$args = func_get_args();
+		array_shift($args);
+		$code = implode(';', $args);
+		return "\033[0m" . ($code !== '' ? "\033[" . $code . "m" : '') . $string."\033[0m";
+	}
+
+	//const COLOR_XTERM256 = 38;// http://en.wikipedia.org/wiki/Talk:ANSI_escape_code#xterm-256colors
+	public static function xterm256ColorFg($i) // TODO naming!
+	{
+		return '38;5;'.$i;
+	}
+
+	public static function xterm256ColorBg($i) // TODO naming!
+	{
+		return '48;5;'.$i;
+	}
+
+	/**
+	 * Usage: list($w, $h) = ConsoleHelper::getScreenSize();
+	 *
+	 * @return array
+	 */
+	public static function getScreenSize()
+	{
+		// TODO implement
+		return array(150,50);
+	}
+
+	/**
+	 * resets any ansi style set by previous method {@link ansiStyle}
+	 * Any output after this is will have default text style.
+	 */
+	public static function reset()
+	{
+		echo "\033[0m";
+	}
+
+	/**
+	 * Strips ANSI control codes from a string
+	 *
+	 * @param string $string String to strip
+	 * @return string
+	 */
+	public static function strip($string)
+	{
+		return preg_replace('/\033\[[\d;]+m/', '', $string); // TODO currently only strips color
+	}
+
+	// TODO refactor and review
+	public static function ansiToHtml($string)
+	{
+		$tags = 0;
+		return preg_replace_callback('/\033\[[\d;]+m/', function($ansi) use (&$tags) {
+			$styleA = array();
+			foreach(explode(';', $ansi) as $controlCode)
+			{
+				switch($controlCode)
+				{
+					case static::FG_BLACK:  $style = array('color' => '#000000'); break;
+					case static::FG_BLUE:   $style = array('color' => '#000078'); break;
+					case static::FG_CYAN:   $style = array('color' => '#007878'); break;
+					case static::FG_GREEN:  $style = array('color' => '#007800'); break;
+					case static::FG_GREY:   $style = array('color' => '#787878'); break;
+					case static::FG_PURPLE: $style = array('color' => '#780078'); break;
+					case static::FG_RED:    $style = array('color' => '#780000'); break;
+					case static::FG_YELLOW: $style = array('color' => '#787800'); break;
+					case static::BG_BLACK:  $style = array('background-color' => '#000000'); break;
+					case static::BG_BLUE:   $style = array('background-color' => '#000078'); break;
+					case static::BG_CYAN:   $style = array('background-color' => '#007878'); break;
+					case static::BG_GREEN:  $style = array('background-color' => '#007800'); break;
+					case static::BG_GREY:   $style = array('background-color' => '#787878'); break;
+					case static::BG_PURPLE: $style = array('background-color' => '#780078'); break;
+					case static::BG_RED:    $style = array('background-color' => '#780000'); break;
+					case static::BG_YELLOW: $style = array('background-color' => '#787800'); break;
+					case static::BOLD:       $style = array('font-weight' => 'bold'); break;
+					case static::ITALIC:     $style = array('font-style' => 'italic'); break;
+					case static::UNDERLINE:  $style = array('text-decoration' => array('underline')); break;
+					case static::OVERLINED:  $style = array('text-decoration' => array('overline')); break;
+					case static::CROSSED_OUT:$style = array('text-decoration' => array('line-through')); break;
+					case static::BLINK:      $style = array('text-decoration' => array('blink')); break;
+					case static::NEGATIVE:   // ???
+					case static::CONCEALED:
+					case static::ENCIRCLED:
+					case static::FRAMED:
+					// TODO allow resetting codes
+					break;
+					case 0: // ansi reset
+						$return = '';
+						for($n=$tags; $tags>0; $tags--) {
+							$return .= '</span>';
+						}
+						return $return;
+				}
+
+				$styleA = ArrayHelper::merge($styleA, $style);
+			}
+			$styleString[] = array();
+			foreach($styleA as $name => $content) {
+				if ($name === 'text-decoration') {
+					$content = implode(' ', $content);
+				}
+				$styleString[] = $name.':'.$content;
+			}
+			$tags++;
+			return '<span' . (!empty($styleString) ? 'style="' . implode(';', $styleString) : '') . '>';
+		}, $string);
+	}
+
+    /**
+     *
+     * Returns an ANSI-Controlcode
+     *
+     * Takes 1 to 3 Arguments: either 1 to 3 strings containing the name of the
+     * FG Color, style and BG color, or one array with the indices color, style
+     * or background.
+     *
+     * @param mixed  $color      Optional.
+     *                           Either a string with the name of the foreground
+     *                           color, or an array with the indices 'color',
+     *                           'style', 'background' and corresponding names as
+     *                           values.
+     * @param string $style      Optional name of the style
+     * @param string $background Optional name of the background color
+     *
+     * @return string
+     */
+    public function color($color = null, $style = null, $background = null) // {{{
+    {
+        $colors = static::getColorCodes();
+
+        if (is_array($color)) {
+            $style      = isset($color['style']) ? $color['style'] : null;
+            $background = isset($color['background']) ? $color['background'] : null;
+            $color      = isset($color['color']) ? $color['color'] : null;
+        }
+
+        if ($color == 'reset') {
+            return "\033[0m";
+        }
+
+        $code = array();
+        if (isset($style)) {
+            $code[] = $colors['style'][$style];
+        }
+
+        if (isset($color)) {
+            $code[] = $colors['color'][$color];
+        }
+
+        if (isset($background)) {
+            $code[] = $colors['background'][$background];
+        }
+
+        if (empty($code)) {
+            $code[] = 0;
+        }
+        $code = implode(';', $code);
+        return "\033[{$code}m";
+    }
+
+    /**
+	 * TODO syntax copied from https://github.com/pear/Console_Color2/blob/master/Console/Color2.php
+	 *
+	 * Converts colorcodes in the format %y (for yellow) into ansi-control
+	 * codes. The conversion table is: ('bold' meaning 'light' on some
+	 * terminals). It's almost the same conversion table irssi uses.
+	 * <pre>
+	 *                  text      text            background
+	 *      ------------------------------------------------
+	 *      %k %K %0    black     dark grey       black
+	 *      %r %R %1    red       bold red        red
+	 *      %g %G %2    green     bold green      green
+	 *      %y %Y %3    yellow    bold yellow     yellow
+	 *      %b %B %4    blue      bold blue       blue
+	 *      %m %M %5    magenta   bold magenta    magenta
+	 *      %p %P       magenta (think: purple)
+	 *      %c %C %6    cyan      bold cyan       cyan
+	 *      %w %W %7    white     bold white      white
+	 *
+	 *      %F     Blinking, Flashing
+	 *      %U     Underline
+	 *      %8     Reverse
+	 *      %_,%9  Bold
+	 *
+	 *      %n     Resets the color
+	 *      %%     A single %
+	 * </pre>
+	 * First param is the string to convert, second is an optional flag if
+	 * colors should be used. It defaults to true, if set to false, the
+	 * colorcodes will just be removed (And %% will be transformed into %)
+	 *
+	 * @param string $string  String to convert
+	 * @param bool   $colored Should the string be colored?
+	 *
+	 * @return string
+	 */
+	public static function renderColoredString($string, $colored = true)
+    {
+		static $conversions = array ( // static so the array doesn't get built
+		   // everytime
+		// %y - yellow, and so on... {{{
+		'%y' => array('color' => 'yellow'),
+		'%g' => array('color' => 'green' ),
+		'%b' => array('color' => 'blue'  ),
+		'%r' => array('color' => 'red'   ),
+		'%p' => array('color' => 'purple'),
+		'%m' => array('color' => 'purple'),
+		'%c' => array('color' => 'cyan'  ),
+		'%w' => array('color' => 'grey'  ),
+		'%k' => array('color' => 'black' ),
+		'%n' => array('color' => 'reset' ),
+		'%Y' => array('color' => 'yellow',  'style' => 'light'),
+		'%G' => array('color' => 'green',   'style' => 'light'),
+		'%B' => array('color' => 'blue',    'style' => 'light'),
+		'%R' => array('color' => 'red',     'style' => 'light'),
+		'%P' => array('color' => 'purple',  'style' => 'light'),
+		'%M' => array('color' => 'purple',  'style' => 'light'),
+		'%C' => array('color' => 'cyan',    'style' => 'light'),
+		'%W' => array('color' => 'grey',    'style' => 'light'),
+		'%K' => array('color' => 'black',   'style' => 'light'),
+		'%N' => array('color' => 'reset',   'style' => 'light'),
+		'%3' => array('background' => 'yellow'),
+		'%2' => array('background' => 'green' ),
+		'%4' => array('background' => 'blue'  ),
+		'%1' => array('background' => 'red'   ),
+		'%5' => array('background' => 'purple'),
+		'%6' => array('background' => 'cyan'  ),
+		'%7' => array('background' => 'grey'  ),
+		'%0' => array('background' => 'black' ),
+		// Don't use this, I can't stand flashing text
+		'%F' => array('style' => 'blink'),
+		'%U' => array('style' => 'underline'),
+		'%8' => array('style' => 'inverse'),
+		'%9' => array('style' => 'bold'),
+		'%_' => array('style' => 'bold')
+		// }}}
+		);
+
+		if ($colored) {
+			$string = str_replace('%%', '% ', $string);
+			foreach ($conversions as $key => $value) {
+				$string = str_replace($key, static::color($value),
+				$string);
+			}
+			$string = str_replace('% ', '%', $string);
+
+		} else {
+			$string = preg_replace('/%((%)|.)/', '$2', $string);
+		}
+
+		return $string;
+	}
+
+    /**
+     * Returns the different foreground and background color codes and styles available.
+     * @return array the color codes
+     */
+    public static function getColorCodes()
+    {
+        return array(
+            'color' => array(
+                'black'  => static::FG_BLACK,
+                'red'    => static::FG_RED,
+                'green'  => static::FG_GREEN,
+                'yellow' => static::FG_YELLOW,
+                'blue'   => static::FG_BLUE,
+                'purple' => static::FG_PURPLE,
+                'cyan'   => static::FG_CYAN,
+                'grey'   => static::FG_GREY,
+            ),
+            'style' => array(
+                'normal'      => static::NORMAL,
+                'bold'        => static::BOLD,
+                'italic'      => static::ITALIC,
+                'underline'   => static::UNDERLINE,
+                'blink'       => static::BLINK,
+                'negative'    => static::NEGATIVE,
+                'concealed'   => static::CONCEALED,
+                'crossed_out' => static::CROSSED_OUT,
+                'framed'      => static::FRAMED,
+                'encircled'   => static::ENCIRCLED,
+                'overlined'   => static::OVERLINED
+            ),
+            'background' => array(
+                'black'  => static::BG_BLACK,
+                'red'    => static::BG_RED,
+                'green'  => static::BG_RED,
+                'yellow' => static::BG_YELLOW,
+                'blue'   => static::BG_BLUE,
+                'purple' => static::BG_PURPLE,
+                'cyan'   => static::BG_CYAN,
+                'grey'   => static::BG_GREY
+            )
+        );
+    }
+
+	/**
+	 * Escapes % so they don't get interpreted as color codes
+	 *
+	 * @param string $string String to escape
+	 *
+	 * @access public
+	 * @return string
+	 */
+	public static function escape($string)
+	{
+		return str_replace('%', '%%', $string);
+	}
+
+    /**
+     * Returns true if the stream supports colorization. ANSI colors is disabled if not supported by the stream.
+     *
+     * - windows without asicon
+     * - not tty consoles
+     *
+     * @param mixed $stream
+     * @return bool true if the stream supports ANSI colors, otherwise false.
+     */
+    public static function streamSupportsAnsiColors( $stream )
+    {
+        return DIRECTORY_SEPARATOR == '\\'
+            ? null !== getenv('ANSICON')
+            : function_exists('posix_isatty') && @posix_isatty($stream);
+    }
+
+    /**
+     * Returns true if the console is running on windows
+     * @return bool
+     */
+    public static function isRunningOnWindows()
+    {
+        return strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
+    }
+
+    /**
+     * Gets input from STDIN and returns a string right-trimmed for EOLs.
+     *
+     * @param bool $raw If set to true, returns the raw string without trimming
+     *
+     * @return string
+     */
+    public static function stdin($raw = false)
+    {
+        return $raw ? fgets(STDIN) : rtrim(fgets(STDIN), PHP_EOL);
+    }
+
+    /**
+     * Prints text to STDOUT.
+     *
+     * @param string $text
+     * @param bool   $raw
+     *
+     * @return int|false Number of bytes printed or false on error
+     */
+    public static function stdout($text, $raw = false)
+    {
+        if ($raw) {
+            return fwrite(STDOUT, $text);
+        } elseif (static::streamSupportsAnsiColors(STDOUT)) {
+            return fwrite(STDOUT, static::renderColoredString($text));
+        } else {
+            return fwrite(STDOUT, static::renderColoredString($text, false));
+        }
+    }
+
+    /**
+     * Prints text to STDERR.
+     *
+     * @param string $text
+     * @param bool   $raw
+     *
+     * @return mixed Number of bytes printed or bool false on error.
+     */
+    public static function stderr($text, $raw = false)
+    {
+        if ($raw) {
+            return fwrite(STDERR, $text);
+        } elseif (static::streamSupportsAnsiColors(STDERR)) {
+            return fwrite(STDERR, static::renderColoredString($text));
+        } else {
+            return fwrite(STDERR, static::renderColoredString($text, false));
+        }
+    }
+
+    /**
+     * Prints text to STDERR appended with a carriage return (PHP_EOL).
+     *
+     * @param string $text
+     * @param bool   $raw
+     *
+     * @return mixed Number of bytes printed or false on error
+     */
+    public static function error($text = null, $raw = false)
+    {
+        return static::stderr($text . PHP_EOL, $raw);
+    }
+
+    /**
+     * Asks the user for input. Ends when the user types a carriage return (PHP_EOL). Optionally, It also provides a
+     * prompt.
+     *
+     * @param string $prompt the prompt (optional)
+     * @return string the user's input
+     */
+    public static function input($prompt = null)
+    {
+        if(isset($prompt)) {
+            static::stdout($prompt);
+        }
+        return static::stdin();
+    }
+
+    /**
+     * Prints text to STDOUT appended with a carriage return (PHP_EOL).
+     *
+     * @param string $text
+     * @param bool $raw
+     *
+     * @return mixed Number of bytes printed or bool false on error
+     */
+    public static function output($text = null, $raw = false)
+    {
+        return static::stdout($text . PHP_EOL, $raw);
+    }
+
+    /**
+     * Prompts the user for input and validates it
+     *
+     * @param string $text prompt string
+     * @param array $options the options to validate the input:
+     *  - required: whether it is required or not
+     *  - default: default value if no input is inserted by the user
+     *  - pattern: regular expression pattern to validate user input
+     *  - validator: a callable function to validate input. The function must accept two parameters:
+     *      - $input: the user input to validate
+     *      - $error: the error value passed by reference if validation failed.
+     * @return string the user input
+     */
+    public static function prompt($text, $options = array())
+    {
+        $options = ArrayHelper::merge($options, array(
+            'required'  => false,
+            'default'   => null,
+            'pattern'   => null,
+            'validator' => null,
+            'error'     => 'Invalid input.',
+        ));
+        $error = null;
+
+        top:
+        $input = $options['default']
+            ? static::input("$text [" . $options['default'] . ']: ')
+            : static::input("$text: ");
+
+        if (!strlen($input)) {
+            if (isset($options['default'])) {
+                $input = $options['default'];
+            } elseif ($options['required']) {
+                static::output($options['error']);
+                goto top;
+            }
+        } elseif ($options['pattern'] && !preg_match($options['pattern'], $input)) {
+            static::output($options['error']);
+            goto top;
+        } elseif ($options['validator'] &&
+            !call_user_func_array($options['validator'], array($input, &$error))) {
+            static::output(isset($error) ? $error : $options['error']);
+            goto top;
+        }
+
+        return $input;
+    }
+
+    /**
+     * Asks the user for a simple yes/no confirmation.
+     *
+     * @param string $prompt the prompt string
+     *
+     * @return bool true or false according to user input.
+     */
+    public static function confirm($prompt)
+    {
+        top:
+        $input = strtolower(static::input("$prompt [y/n]: "));
+        if (!in_array(substr($input,0,1), array('y', 'n'))) {
+            static::output("Please, type 'y' or 'n'");
+            goto top;
+        }
+        return $input === 'y' ? true : false;
+    }
+
+    /**
+     * Gives the user an option to choose from. Giving '?' as an input will show
+     * a list of options to choose from and their explanations.
+     *
+     * @param string $prompt the prompt message
+     * @param array  $options Key-value array of options to choose from
+     *
+     * @return string An option character the user chose
+     */
+    public static function select($prompt, $options = array())
+    {
+        top:
+        static::stdout("$prompt [" . implode(',', array_keys($options)) . ",?]: ");
+        $input = static::stdin();
+        if ($input === '?') {
+            foreach ($options as $key => $value) {
+                echo " $key - $value\n";
+            }
+            echo " ? - Show help\n";
+            goto top;
+        } elseif (!in_array($input, array_keys($options))) goto top;
+        return $input;
+    }
+
+    /**
+     * Displays and updates a simple progress bar on screen.
+     *
+     * @param $done the number of items that are completed
+     * @param $total the total value of items that are to be done
+     * @param int $size the size of the status bar (optional)
+     * @see http://snipplr.com/view/29548/
+     */
+    public static function showProgress($done, $total, $size=30)
+    {
+        static $start;
+
+        // if we go over our bound, just ignore it
+        if($done > $total) {
+            return;
+        }
+
+        if(empty($start)) {
+            $start=time();
+        }
+
+        $now = time();
+
+        $percent=(double)($done/$total);
+        $bar=floor($percent*$size);
+
+        $status="\r[";
+        $status.=str_repeat("=", $bar);
+        if($bar<$size){
+            $status.=">";
+            $status.=str_repeat(" ", $size-$bar);
+        } else {
+            $status.="=";
+        }
+
+        $display=number_format($percent*100, 0);
+
+        $status.="] $display%  $done/$total";
+
+        $rate = ($now-$start)/$done;
+        $left = $total - $done;
+        $eta = round($rate * $left, 2);
+
+        $elapsed = $now - $start;
+
+        $status.= " remaining: ".number_format($eta)." sec.  elapsed: ".number_format($elapsed)." sec.";
+
+        static::stdout("$status  ");
+
+        flush();
+
+        // when done, send a newline
+        if($done == $total) {
+            echo "\n";
+        }
+    }
+}
diff --git a/framework/helpers/base/ConsoleColor.php b/framework/helpers/base/ConsoleColor.php
deleted file mode 100644
index 5e7f577..0000000
--- a/framework/helpers/base/ConsoleColor.php
+++ /dev/null
@@ -1,470 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\helpers\base;
-
-// todo test this on all kinds of terminals, especially windows (check out lib ncurses)
-
-/**
- * Console View is the base class for console view components
- *
- * A console view provides functionality to create rich console application by allowing to format output
- * by adding color and font style to it.
- *
- * @author Carsten Brandt <mail@cebe.cc>
- * @since 2.0
- */
-class ConsoleColor
-{
-	const FG_BLACK = 30;
-	const FG_RED = 31;
-	const FG_GREEN = 32;
-	const FG_YELLOW = 33;
-	const FG_BLUE = 34;
-	const FG_PURPLE = 35;
-	const FG_CYAN = 36;
-	const FG_GREY = 37;
-
-	const BG_BLACK = 40;
-	const BG_RED = 41;
-	const BG_GREEN = 42;
-	const BG_YELLOW = 43;
-	const BG_BLUE = 44;
-	const BG_PURPLE = 45;
-	const BG_CYAN = 46;
-	const BG_GREY = 47;
-
-	const BOLD = 1;
-	const ITALIC = 3;
-	const UNDERLINE = 4;
-	const BLINK = 5;
-	const NEGATIVE = 7;
-	const CONCEALED = 8;
-	const CROSSED_OUT = 9;
-	const FRAMED = 51;
-	const ENCIRCLED = 52;
-	const OVERLINED = 53;
-
-	/**
-	 * Moves the terminal cursor up by sending ANSI control code CUU to the terminal.
-	 * If the cursor is already at the edge of the screen, this has no effect.
-	 * @param integer $rows number of rows the cursor should be moved up
-	 */
-	public static function moveCursorUp($rows=1)
-	{
-		echo "\033[" . (int) $rows . 'A';
-	}
-
-	/**
-	 * Moves the terminal cursor down by sending ANSI control code CUD to the terminal.
-	 * If the cursor is already at the edge of the screen, this has no effect.
-	 * @param integer $rows number of rows the cursor should be moved down
-	 */
-	public static function moveCursorDown($rows=1)
-	{
-		echo "\033[" . (int) $rows . 'B';
-	}
-
-	/**
-	 * Moves the terminal cursor forward by sending ANSI control code CUF to the terminal.
-	 * If the cursor is already at the edge of the screen, this has no effect.
-	 * @param integer $steps number of steps the cursor should be moved forward
-	 */
-	public static function moveCursorForward($steps=1)
-	{
-		echo "\033[" . (int) $steps . 'C';
-	}
-
-	/**
-	 * Moves the terminal cursor backward by sending ANSI control code CUB to the terminal.
-	 * If the cursor is already at the edge of the screen, this has no effect.
-	 * @param integer $steps number of steps the cursor should be moved backward
-	 */
-	public static function moveCursorBackward($steps=1)
-	{
-		echo "\033[" . (int) $steps . 'D';
-	}
-
-	/**
-	 * Moves the terminal cursor to the beginning of the next line by sending ANSI control code CNL to the terminal.
-	 * @param integer $lines number of lines the cursor should be moved down
-	 */
-	public static function moveCursorNextLine($lines=1)
-	{
-		echo "\033[" . (int) $lines . 'E';
-	}
-
-	/**
-	 * Moves the terminal cursor to the beginning of the previous line by sending ANSI control code CPL to the terminal.
-	 * @param integer $lines number of lines the cursor should be moved up
-	 */
-	public static function moveCursorPrevLine($lines=1)
-	{
-		echo "\033[" . (int) $lines . 'F';
-	}
-
-	/**
-	 * Moves the cursor to an absolute position given as column and row by sending ANSI control code CUP or CHA to the terminal.
-	 * @param integer $column 1-based column number, 1 is the left edge of the screen.
-	 * @param integer|null $row 1-based row number, 1 is the top edge of the screen. if not set, will move cursor only in current line.
-	 */
-	public static function moveCursorTo($column, $row=null)
-	{
-		if ($row === null) {
-			echo "\033[" . (int) $column . 'G';
-		} else {
-			echo "\033[" . (int) $row . ';' . (int) $column . 'H';
-		}
-	}
-
-	/**
-	 * Scrolls whole page up by sending ANSI control code SU to the terminal.
-	 * New lines are added at the bottom. This is not supported by ANSI.SYS used in windows.
-	 * @param int $lines number of lines to scroll up
-	 */
-	public static function scrollUp($lines=1)
-	{
-		echo "\033[".(int)$lines."S";
-	}
-
-	/**
-	 * Scrolls whole page down by sending ANSI control code SD to the terminal.
-	 * New lines are added at the top. This is not supported by ANSI.SYS used in windows.
-	 * @param int $lines number of lines to scroll down
-	 */
-	public static function scrollDown($lines=1)
-	{
-		echo "\033[".(int)$lines."T";
-	}
-
-	/**
-	 * Saves the current cursor position by sending ANSI control code SCP to the terminal.
-	 * Position can then be restored with {@link restoreCursorPosition}.
-	 */
-	public static function saveCursorPosition()
-	{
-		echo "\033[s";
-	}
-
-	/**
-	 * Restores the cursor position saved with {@link saveCursorPosition} by sending ANSI control code RCP to the terminal.
-	 */
-	public static function restoreCursorPosition()
-	{
-		echo "\033[u";
-	}
-
-	/**
-	 * Hides the cursor by sending ANSI DECTCEM code ?25l to the terminal.
-	 * Use {@link showCursor} to bring it back.
-	 * Do not forget to show cursor when your application exits. Cursor might stay hidden in terminal after exit.
-	 */
-	public static function hideCursor()
-	{
-		echo "\033[?25l";
-	}
-
-	/**
-	 * Will show a cursor again when it has been hidden by {@link hideCursor}  by sending ANSI DECTCEM code ?25h to the terminal.
-	 */
-	public static function showCursor()
-	{
-		echo "\033[?25h";
-	}
-
-	/**
-	 * Clears entire screen content by sending ANSI control code ED with argument 2 to the terminal.
-	 * Cursor position will not be changed.
-	 * **Note:** ANSI.SYS implementation used in windows will reset cursor position to upper left corner of the screen.
-	 */
-	public static function clearScreen()
-	{
-		echo "\033[2J";
-	}
-
-	/**
-	 * Clears text from cursor to the beginning of the screen by sending ANSI control code ED with argument 1 to the terminal.
-	 * Cursor position will not be changed.
-	 */
-	public static function clearScreenBeforeCursor()
-	{
-		echo "\033[1J";
-	}
-
-	/**
-	 * Clears text from cursor to the end of the screen by sending ANSI control code ED with argument 0 to the terminal.
-	 * Cursor position will not be changed.
-	 */
-	public static function clearScreenAfterCursor()
-	{
-		echo "\033[0J";
-	}
-
-	/**
-	 * Clears the line, the cursor is currently on by sending ANSI control code EL with argument 2 to the terminal.
-	 * Cursor position will not be changed.
-	 */
-	public static function clearLine()
-	{
-		echo "\033[2K";
-	}
-
-	/**
-	 * Clears text from cursor position to the beginning of the line by sending ANSI control code EL with argument 1 to the terminal.
-	 * Cursor position will not be changed.
-	 */
-	public static function clearLineBeforeCursor()
-	{
-		echo "\033[1K";
-	}
-
-	/**
-	 * Clears text from cursor position to the end of the line by sending ANSI control code EL with argument 0 to the terminal.
-	 * Cursor position will not be changed.
-	 */
-	public static function clearLineAfterCursor()
-	{
-		echo "\033[0K";
-	}
-
-	/**
-	 * Will send ANSI format for following output
-	 *
-	 * You can pass any of the FG_*, BG_* and TEXT_* constants and also xterm256ColorBg
-	 * TODO: documentation
-	 */
-	public static function ansiStyle()
-	{
-		echo "\033[" . implode(';', func_get_args()) . 'm';
-	}
-
-	/**
-	 * Will return a string formatted with the given ANSI style
-	 *
-	 * See {@link ansiStyle} for possible arguments.
-	 * @param string $string the string to be formatted
-	 * @return string
-	 */
-	public static function ansiStyleString($string)
-	{
-		$args = func_get_args();
-		array_shift($args);
-		$code = implode(';', $args);
-		return "\033[0m" . ($code !== '' ? "\033[" . $code . "m" : '') . $string."\033[0m";
-	}
-
-	//const COLOR_XTERM256 = 38;// http://en.wikipedia.org/wiki/Talk:ANSI_escape_code#xterm-256colors
-	public static function xterm256ColorFg($i) // TODO naming!
-	{
-		return '38;5;'.$i;
-	}
-
-	public static function xterm256ColorBg($i) // TODO naming!
-	{
-		return '48;5;'.$i;
-	}
-
-	/**
-	 * Usage: list($w, $h) = ConsoleHelper::getScreenSize();
-	 *
-	 * @return array
-	 */
-	public static function getScreenSize()
-	{
-		// TODO implement
-		return array(150,50);
-	}
-
-	/**
-	 * resets any ansi style set by previous method {@link ansiStyle}
-	 * Any output after this is will have default text style.
-	 */
-	public static function reset()
-	{
-		echo "\033[0m";
-	}
-
-	/**
-	 * Strips ANSI control codes from a string
-	 *
-	 * @param string $string String to strip
-	 * @return string
-	 */
-	public static function strip($string)
-	{
-		return preg_replace('/\033\[[\d;]+m/', '', $string); // TODO currently only strips color
-	}
-
-	// TODO refactor and review
-	public static function ansiToHtml($string)
-	{
-		$tags = 0;
-		return preg_replace_callback('/\033\[[\d;]+m/', function($ansi) use (&$tags) {
-			$styleA = array();
-			foreach(explode(';', $ansi) as $controlCode)
-			{
-				switch($controlCode)
-				{
-					case static::FG_BLACK:  $style = array('color' => '#000000'); break;
-					case static::FG_BLUE:   $style = array('color' => '#000078'); break;
-					case static::FG_CYAN:   $style = array('color' => '#007878'); break;
-					case static::FG_GREEN:  $style = array('color' => '#007800'); break;
-					case static::FG_GREY:   $style = array('color' => '#787878'); break;
-					case static::FG_PURPLE: $style = array('color' => '#780078'); break;
-					case static::FG_RED:    $style = array('color' => '#780000'); break;
-					case static::FG_YELLOW: $style = array('color' => '#787800'); break;
-					case static::BG_BLACK:  $style = array('background-color' => '#000000'); break;
-					case static::BG_BLUE:   $style = array('background-color' => '#000078'); break;
-					case static::BG_CYAN:   $style = array('background-color' => '#007878'); break;
-					case static::BG_GREEN:  $style = array('background-color' => '#007800'); break;
-					case static::BG_GREY:   $style = array('background-color' => '#787878'); break;
-					case static::BG_PURPLE: $style = array('background-color' => '#780078'); break;
-					case static::BG_RED:    $style = array('background-color' => '#780000'); break;
-					case static::BG_YELLOW: $style = array('background-color' => '#787800'); break;
-					case static::BOLD:       $style = array('font-weight' => 'bold'); break;
-					case static::ITALIC:     $style = array('font-style' => 'italic'); break;
-					case static::UNDERLINE:  $style = array('text-decoration' => array('underline')); break;
-					case static::OVERLINED:  $style = array('text-decoration' => array('overline')); break;
-					case static::CROSSED_OUT:$style = array('text-decoration' => array('line-through')); break;
-					case static::BLINK:      $style = array('text-decoration' => array('blink')); break;
-					case static::NEGATIVE:   // ???
-					case static::CONCEALED:
-					case static::ENCIRCLED:
-					case static::FRAMED:
-					// TODO allow resetting codes
-					break;
-					case 0: // ansi reset
-						$return = '';
-						for($n=$tags; $tags>0; $tags--) {
-							$return .= '</span>';
-						}
-						return $return;
-				}
-
-				$styleA = ArrayHelper::merge($styleA, $style);
-			}
-			$styleString[] = array();
-			foreach($styleA as $name => $content) {
-				if ($name === 'text-decoration') {
-					$content = implode(' ', $content);
-				}
-				$styleString[] = $name.':'.$content;
-			}
-			$tags++;
-			return '<span' . (!empty($styleString) ? 'style="' . implode(';', $styleString) : '') . '>';
-		}, $string);
-	}
-
-	/**
-	 * TODO syntax copied from https://github.com/pear/Console_Color2/blob/master/Console/Color2.php
-	 *
-	 * Converts colorcodes in the format %y (for yellow) into ansi-control
-	 * codes. The conversion table is: ('bold' meaning 'light' on some
-	 * terminals). It's almost the same conversion table irssi uses.
-	 * <pre>
-	 *                  text      text            background
-	 *      ------------------------------------------------
-	 *      %k %K %0    black     dark grey       black
-	 *      %r %R %1    red       bold red        red
-	 *      %g %G %2    green     bold green      green
-	 *      %y %Y %3    yellow    bold yellow     yellow
-	 *      %b %B %4    blue      bold blue       blue
-	 *      %m %M %5    magenta   bold magenta    magenta
-	 *      %p %P       magenta (think: purple)
-	 *      %c %C %6    cyan      bold cyan       cyan
-	 *      %w %W %7    white     bold white      white
-	 *
-	 *      %F     Blinking, Flashing
-	 *      %U     Underline
-	 *      %8     Reverse
-	 *      %_,%9  Bold
-	 *
-	 *      %n     Resets the color
-	 *      %%     A single %
-	 * </pre>
-	 * First param is the string to convert, second is an optional flag if
-	 * colors should be used. It defaults to true, if set to false, the
-	 * colorcodes will just be removed (And %% will be transformed into %)
-	 *
-	 * @param string $string  String to convert
-	 * @param bool   $colored Should the string be colored?
-	 *
-	 * @return string
-	 */
-	public static function renderColoredString($string)
-	{
-		$colored = true;
-
-
-		static $conversions = array ( // static so the array doesn't get built
-		   // everytime
-		// %y - yellow, and so on... {{{
-		'%y' => array('color' => 'yellow'),
-		'%g' => array('color' => 'green' ),
-		'%b' => array('color' => 'blue'  ),
-		'%r' => array('color' => 'red'   ),
-		'%p' => array('color' => 'purple'),
-		'%m' => array('color' => 'purple'),
-		'%c' => array('color' => 'cyan'  ),
-		'%w' => array('color' => 'grey'  ),
-		'%k' => array('color' => 'black' ),
-		'%n' => array('color' => 'reset' ),
-		'%Y' => array('color' => 'yellow',  'style' => 'light'),
-		'%G' => array('color' => 'green',   'style' => 'light'),
-		'%B' => array('color' => 'blue',    'style' => 'light'),
-		'%R' => array('color' => 'red',     'style' => 'light'),
-		'%P' => array('color' => 'purple',  'style' => 'light'),
-		'%M' => array('color' => 'purple',  'style' => 'light'),
-		'%C' => array('color' => 'cyan',    'style' => 'light'),
-		'%W' => array('color' => 'grey',    'style' => 'light'),
-		'%K' => array('color' => 'black',   'style' => 'light'),
-		'%N' => array('color' => 'reset',   'style' => 'light'),
-		'%3' => array('background' => 'yellow'),
-		'%2' => array('background' => 'green' ),
-		'%4' => array('background' => 'blue'  ),
-		'%1' => array('background' => 'red'   ),
-		'%5' => array('background' => 'purple'),
-		'%6' => array('background' => 'cyan'  ),
-		'%7' => array('background' => 'grey'  ),
-		'%0' => array('background' => 'black' ),
-		// Don't use this, I can't stand flashing text
-		'%F' => array('style' => 'blink'),
-		'%U' => array('style' => 'underline'),
-		'%8' => array('style' => 'inverse'),
-		'%9' => array('style' => 'bold'),
-		'%_' => array('style' => 'bold')
-		// }}}
-		);
-
-		if ($colored) {
-			$string = str_replace('%%', '% ', $string);
-			foreach ($conversions as $key => $value) {
-				$string = str_replace($key, Console_Color::color($value),
-				$string);
-			}
-			$string = str_replace('% ', '%', $string);
-
-		} else {
-			$string = preg_replace('/%((%)|.)/', '$2', $string);
-		}
-
-		return $string;
-	}
-
-	/**
-	 * Escapes % so they don't get interpreted as color codes
-	 *
-	 * @param string $string String to escape
-	 *
-	 * @access public
-	 * @return string
-	 */
-	public static function escape($string)
-	{
-		return str_replace('%', '%%', $string);
-	}
-}
diff --git a/tests/unit/framework/helpers/ConsoleTest.php b/tests/unit/framework/helpers/ConsoleTest.php
new file mode 100644
index 0000000..2a86242
--- /dev/null
+++ b/tests/unit/framework/helpers/ConsoleTest.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace yiiunit\framework\helpers;
+
+use yii\helpers\base\Console;
+
+class ConsoleTest extends \yii\test\TestCase
+{
+    /* TODO */
+}
\ No newline at end of file

From d40e2446df59f858d4fae8fe2c68d58b060481da Mon Sep 17 00:00:00 2001
From: Antonio Ramirez <ramirez.cobos@gmail.com>
Date: Mon, 6 May 2013 12:50:55 +0200
Subject: [PATCH 045/152] minor fix for test unit

---
 tests/unit/framework/helpers/ConsoleTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/framework/helpers/ConsoleTest.php b/tests/unit/framework/helpers/ConsoleTest.php
index 2a86242..4e1dcaf 100644
--- a/tests/unit/framework/helpers/ConsoleTest.php
+++ b/tests/unit/framework/helpers/ConsoleTest.php
@@ -2,7 +2,7 @@
 
 namespace yiiunit\framework\helpers;
 
-use yii\helpers\base\Console;
+use yii\helpers\Console;
 
 class ConsoleTest extends \yii\test\TestCase
 {

From a20bd45645a25b36c6f9b7a70198143190108592 Mon Sep 17 00:00:00 2001
From: Antonio Ramirez <ramirez.cobos@gmail.com>
Date: Mon, 6 May 2013 13:00:54 +0200
Subject: [PATCH 046/152] Fixed formatting

---
 framework/helpers/base/Console.php | 1005 +++++++++++++++++++-----------------
 1 file changed, 530 insertions(+), 475 deletions(-)

diff --git a/framework/helpers/base/Console.php b/framework/helpers/base/Console.php
index bff5a09..b608d8e 100644
--- a/framework/helpers/base/Console.php
+++ b/framework/helpers/base/Console.php
@@ -20,345 +20,391 @@ namespace yii\helpers\base;
  */
 class Console
 {
-	const FG_BLACK = 30;
-	const FG_RED = 31;
-	const FG_GREEN = 32;
-	const FG_YELLOW = 33;
-	const FG_BLUE = 34;
-	const FG_PURPLE = 35;
-	const FG_CYAN = 36;
-	const FG_GREY = 37;
-
-	const BG_BLACK = 40;
-	const BG_RED = 41;
-	const BG_GREEN = 42;
-	const BG_YELLOW = 43;
-	const BG_BLUE = 44;
-	const BG_PURPLE = 45;
-	const BG_CYAN = 46;
-	const BG_GREY = 47;
-
-    const NORMAL = 0;
-	const BOLD = 1;
-	const ITALIC = 3;
-	const UNDERLINE = 4;
-	const BLINK = 5;
-	const NEGATIVE = 7;
-	const CONCEALED = 8;
-	const CROSSED_OUT = 9;
-	const FRAMED = 51;
-	const ENCIRCLED = 52;
-	const OVERLINED = 53;
-
-	/**
-	 * Moves the terminal cursor up by sending ANSI control code CUU to the terminal.
-	 * If the cursor is already at the edge of the screen, this has no effect.
-	 * @param integer $rows number of rows the cursor should be moved up
-	 */
-	public static function moveCursorUp($rows=1)
-	{
-		echo "\033[" . (int) $rows . 'A';
-	}
-
-	/**
-	 * Moves the terminal cursor down by sending ANSI control code CUD to the terminal.
-	 * If the cursor is already at the edge of the screen, this has no effect.
-	 * @param integer $rows number of rows the cursor should be moved down
-	 */
-	public static function moveCursorDown($rows=1)
-	{
-		echo "\033[" . (int) $rows . 'B';
-	}
-
-	/**
-	 * Moves the terminal cursor forward by sending ANSI control code CUF to the terminal.
-	 * If the cursor is already at the edge of the screen, this has no effect.
-	 * @param integer $steps number of steps the cursor should be moved forward
-	 */
-	public static function moveCursorForward($steps=1)
-	{
-		echo "\033[" . (int) $steps . 'C';
-	}
-
-	/**
-	 * Moves the terminal cursor backward by sending ANSI control code CUB to the terminal.
-	 * If the cursor is already at the edge of the screen, this has no effect.
-	 * @param integer $steps number of steps the cursor should be moved backward
-	 */
-	public static function moveCursorBackward($steps=1)
-	{
-		echo "\033[" . (int) $steps . 'D';
-	}
-
-	/**
-	 * Moves the terminal cursor to the beginning of the next line by sending ANSI control code CNL to the terminal.
-	 * @param integer $lines number of lines the cursor should be moved down
-	 */
-	public static function moveCursorNextLine($lines=1)
-	{
-		echo "\033[" . (int) $lines . 'E';
-	}
-
-	/**
-	 * Moves the terminal cursor to the beginning of the previous line by sending ANSI control code CPL to the terminal.
-	 * @param integer $lines number of lines the cursor should be moved up
-	 */
-	public static function moveCursorPrevLine($lines=1)
-	{
-		echo "\033[" . (int) $lines . 'F';
-	}
-
-	/**
-	 * Moves the cursor to an absolute position given as column and row by sending ANSI control code CUP or CHA to the terminal.
-	 * @param integer $column 1-based column number, 1 is the left edge of the screen.
-	 * @param integer|null $row 1-based row number, 1 is the top edge of the screen. if not set, will move cursor only in current line.
-	 */
-	public static function moveCursorTo($column, $row=null)
-	{
-		if ($row === null) {
-			echo "\033[" . (int) $column . 'G';
-		} else {
-			echo "\033[" . (int) $row . ';' . (int) $column . 'H';
-		}
-	}
-
-	/**
-	 * Scrolls whole page up by sending ANSI control code SU to the terminal.
-	 * New lines are added at the bottom. This is not supported by ANSI.SYS used in windows.
-	 * @param int $lines number of lines to scroll up
-	 */
-	public static function scrollUp($lines=1)
-	{
-		echo "\033[".(int)$lines."S";
-	}
-
-	/**
-	 * Scrolls whole page down by sending ANSI control code SD to the terminal.
-	 * New lines are added at the top. This is not supported by ANSI.SYS used in windows.
-	 * @param int $lines number of lines to scroll down
-	 */
-	public static function scrollDown($lines=1)
-	{
-		echo "\033[".(int)$lines."T";
-	}
-
-	/**
-	 * Saves the current cursor position by sending ANSI control code SCP to the terminal.
-	 * Position can then be restored with {@link restoreCursorPosition}.
-	 */
-	public static function saveCursorPosition()
-	{
-		echo "\033[s";
-	}
-
-	/**
-	 * Restores the cursor position saved with {@link saveCursorPosition} by sending ANSI control code RCP to the terminal.
-	 */
-	public static function restoreCursorPosition()
-	{
-		echo "\033[u";
-	}
-
-	/**
-	 * Hides the cursor by sending ANSI DECTCEM code ?25l to the terminal.
-	 * Use {@link showCursor} to bring it back.
-	 * Do not forget to show cursor when your application exits. Cursor might stay hidden in terminal after exit.
-	 */
-	public static function hideCursor()
-	{
-		echo "\033[?25l";
-	}
-
-	/**
-	 * Will show a cursor again when it has been hidden by {@link hideCursor}  by sending ANSI DECTCEM code ?25h to the terminal.
-	 */
-	public static function showCursor()
-	{
-		echo "\033[?25h";
-	}
-
-	/**
-	 * Clears entire screen content by sending ANSI control code ED with argument 2 to the terminal.
-	 * Cursor position will not be changed.
-	 * **Note:** ANSI.SYS implementation used in windows will reset cursor position to upper left corner of the screen.
-	 */
-	public static function clearScreen()
-	{
-		echo "\033[2J";
-	}
-
-	/**
-	 * Clears text from cursor to the beginning of the screen by sending ANSI control code ED with argument 1 to the terminal.
-	 * Cursor position will not be changed.
-	 */
-	public static function clearScreenBeforeCursor()
-	{
-		echo "\033[1J";
-	}
-
-	/**
-	 * Clears text from cursor to the end of the screen by sending ANSI control code ED with argument 0 to the terminal.
-	 * Cursor position will not be changed.
-	 */
-	public static function clearScreenAfterCursor()
-	{
-		echo "\033[0J";
-	}
-
-	/**
-	 * Clears the line, the cursor is currently on by sending ANSI control code EL with argument 2 to the terminal.
-	 * Cursor position will not be changed.
-	 */
-	public static function clearLine()
-	{
-		echo "\033[2K";
-	}
-
-	/**
-	 * Clears text from cursor position to the beginning of the line by sending ANSI control code EL with argument 1 to the terminal.
-	 * Cursor position will not be changed.
-	 */
-	public static function clearLineBeforeCursor()
-	{
-		echo "\033[1K";
-	}
-
-	/**
-	 * Clears text from cursor position to the end of the line by sending ANSI control code EL with argument 0 to the terminal.
-	 * Cursor position will not be changed.
-	 */
-	public static function clearLineAfterCursor()
-	{
-		echo "\033[0K";
-	}
-
-	/**
-	 * Will send ANSI format for following output
-	 *
-	 * You can pass any of the FG_*, BG_* and TEXT_* constants and also xterm256ColorBg
-	 * TODO: documentation
-	 */
-	public static function ansiStyle()
-	{
-		echo "\033[" . implode(';', func_get_args()) . 'm';
-	}
-
-	/**
-	 * Will return a string formatted with the given ANSI style
-	 *
-	 * See {@link ansiStyle} for possible arguments.
-	 * @param string $string the string to be formatted
-	 * @return string
-	 */
-	public static function ansiStyleString($string)
-	{
-		$args = func_get_args();
-		array_shift($args);
-		$code = implode(';', $args);
-		return "\033[0m" . ($code !== '' ? "\033[" . $code . "m" : '') . $string."\033[0m";
-	}
-
-	//const COLOR_XTERM256 = 38;// http://en.wikipedia.org/wiki/Talk:ANSI_escape_code#xterm-256colors
-	public static function xterm256ColorFg($i) // TODO naming!
-	{
-		return '38;5;'.$i;
-	}
-
-	public static function xterm256ColorBg($i) // TODO naming!
-	{
-		return '48;5;'.$i;
-	}
-
-	/**
-	 * Usage: list($w, $h) = ConsoleHelper::getScreenSize();
-	 *
-	 * @return array
-	 */
-	public static function getScreenSize()
-	{
-		// TODO implement
-		return array(150,50);
-	}
-
-	/**
-	 * resets any ansi style set by previous method {@link ansiStyle}
-	 * Any output after this is will have default text style.
-	 */
-	public static function reset()
-	{
-		echo "\033[0m";
-	}
-
-	/**
-	 * Strips ANSI control codes from a string
-	 *
-	 * @param string $string String to strip
-	 * @return string
-	 */
-	public static function strip($string)
-	{
-		return preg_replace('/\033\[[\d;]+m/', '', $string); // TODO currently only strips color
-	}
-
-	// TODO refactor and review
-	public static function ansiToHtml($string)
-	{
-		$tags = 0;
-		return preg_replace_callback('/\033\[[\d;]+m/', function($ansi) use (&$tags) {
-			$styleA = array();
-			foreach(explode(';', $ansi) as $controlCode)
-			{
-				switch($controlCode)
-				{
-					case static::FG_BLACK:  $style = array('color' => '#000000'); break;
-					case static::FG_BLUE:   $style = array('color' => '#000078'); break;
-					case static::FG_CYAN:   $style = array('color' => '#007878'); break;
-					case static::FG_GREEN:  $style = array('color' => '#007800'); break;
-					case static::FG_GREY:   $style = array('color' => '#787878'); break;
-					case static::FG_PURPLE: $style = array('color' => '#780078'); break;
-					case static::FG_RED:    $style = array('color' => '#780000'); break;
-					case static::FG_YELLOW: $style = array('color' => '#787800'); break;
-					case static::BG_BLACK:  $style = array('background-color' => '#000000'); break;
-					case static::BG_BLUE:   $style = array('background-color' => '#000078'); break;
-					case static::BG_CYAN:   $style = array('background-color' => '#007878'); break;
-					case static::BG_GREEN:  $style = array('background-color' => '#007800'); break;
-					case static::BG_GREY:   $style = array('background-color' => '#787878'); break;
-					case static::BG_PURPLE: $style = array('background-color' => '#780078'); break;
-					case static::BG_RED:    $style = array('background-color' => '#780000'); break;
-					case static::BG_YELLOW: $style = array('background-color' => '#787800'); break;
-					case static::BOLD:       $style = array('font-weight' => 'bold'); break;
-					case static::ITALIC:     $style = array('font-style' => 'italic'); break;
-					case static::UNDERLINE:  $style = array('text-decoration' => array('underline')); break;
-					case static::OVERLINED:  $style = array('text-decoration' => array('overline')); break;
-					case static::CROSSED_OUT:$style = array('text-decoration' => array('line-through')); break;
-					case static::BLINK:      $style = array('text-decoration' => array('blink')); break;
-					case static::NEGATIVE:   // ???
-					case static::CONCEALED:
-					case static::ENCIRCLED:
-					case static::FRAMED:
-					// TODO allow resetting codes
-					break;
-					case 0: // ansi reset
-						$return = '';
-						for($n=$tags; $tags>0; $tags--) {
-							$return .= '</span>';
-						}
-						return $return;
-				}
-
-				$styleA = ArrayHelper::merge($styleA, $style);
-			}
-			$styleString[] = array();
-			foreach($styleA as $name => $content) {
-				if ($name === 'text-decoration') {
-					$content = implode(' ', $content);
-				}
-				$styleString[] = $name.':'.$content;
-			}
-			$tags++;
-			return '<span' . (!empty($styleString) ? 'style="' . implode(';', $styleString) : '') . '>';
-		}, $string);
-	}
+    const FG_BLACK  = 30;
+    const FG_RED    = 31;
+    const FG_GREEN  = 32;
+    const FG_YELLOW = 33;
+    const FG_BLUE   = 34;
+    const FG_PURPLE = 35;
+    const FG_CYAN   = 36;
+    const FG_GREY   = 37;
+
+    const BG_BLACK  = 40;
+    const BG_RED    = 41;
+    const BG_GREEN  = 42;
+    const BG_YELLOW = 43;
+    const BG_BLUE   = 44;
+    const BG_PURPLE = 45;
+    const BG_CYAN   = 46;
+    const BG_GREY   = 47;
+
+    const NORMAL      = 0;
+    const BOLD        = 1;
+    const ITALIC      = 3;
+    const UNDERLINE   = 4;
+    const BLINK       = 5;
+    const NEGATIVE    = 7;
+    const CONCEALED   = 8;
+    const CROSSED_OUT = 9;
+    const FRAMED      = 51;
+    const ENCIRCLED   = 52;
+    const OVERLINED   = 53;
+
+    /**
+     * Moves the terminal cursor up by sending ANSI control code CUU to the terminal.
+     * If the cursor is already at the edge of the screen, this has no effect.
+     * @param integer $rows number of rows the cursor should be moved up
+     */
+    public static function moveCursorUp($rows = 1)
+    {
+        echo "\033[" . (int)$rows . 'A';
+    }
+
+    /**
+     * Moves the terminal cursor down by sending ANSI control code CUD to the terminal.
+     * If the cursor is already at the edge of the screen, this has no effect.
+     * @param integer $rows number of rows the cursor should be moved down
+     */
+    public static function moveCursorDown($rows = 1)
+    {
+        echo "\033[" . (int)$rows . 'B';
+    }
+
+    /**
+     * Moves the terminal cursor forward by sending ANSI control code CUF to the terminal.
+     * If the cursor is already at the edge of the screen, this has no effect.
+     * @param integer $steps number of steps the cursor should be moved forward
+     */
+    public static function moveCursorForward($steps = 1)
+    {
+        echo "\033[" . (int)$steps . 'C';
+    }
+
+    /**
+     * Moves the terminal cursor backward by sending ANSI control code CUB to the terminal.
+     * If the cursor is already at the edge of the screen, this has no effect.
+     * @param integer $steps number of steps the cursor should be moved backward
+     */
+    public static function moveCursorBackward($steps = 1)
+    {
+        echo "\033[" . (int)$steps . 'D';
+    }
+
+    /**
+     * Moves the terminal cursor to the beginning of the next line by sending ANSI control code CNL to the terminal.
+     * @param integer $lines number of lines the cursor should be moved down
+     */
+    public static function moveCursorNextLine($lines = 1)
+    {
+        echo "\033[" . (int)$lines . 'E';
+    }
+
+    /**
+     * Moves the terminal cursor to the beginning of the previous line by sending ANSI control code CPL to the terminal.
+     * @param integer $lines number of lines the cursor should be moved up
+     */
+    public static function moveCursorPrevLine($lines = 1)
+    {
+        echo "\033[" . (int)$lines . 'F';
+    }
+
+    /**
+     * Moves the cursor to an absolute position given as column and row by sending ANSI control code CUP or CHA to the terminal.
+     * @param integer $column 1-based column number, 1 is the left edge of the screen.
+     * @param integer|null $row 1-based row number, 1 is the top edge of the screen. if not set, will move cursor only in current line.
+     */
+    public static function moveCursorTo($column, $row = null)
+    {
+        if ($row === null) {
+            echo "\033[" . (int)$column . 'G';
+        } else {
+            echo "\033[" . (int)$row . ';' . (int)$column . 'H';
+        }
+    }
+
+    /**
+     * Scrolls whole page up by sending ANSI control code SU to the terminal.
+     * New lines are added at the bottom. This is not supported by ANSI.SYS used in windows.
+     * @param int $lines number of lines to scroll up
+     */
+    public static function scrollUp($lines = 1)
+    {
+        echo "\033[" . (int)$lines . "S";
+    }
+
+    /**
+     * Scrolls whole page down by sending ANSI control code SD to the terminal.
+     * New lines are added at the top. This is not supported by ANSI.SYS used in windows.
+     * @param int $lines number of lines to scroll down
+     */
+    public static function scrollDown($lines = 1)
+    {
+        echo "\033[" . (int)$lines . "T";
+    }
+
+    /**
+     * Saves the current cursor position by sending ANSI control code SCP to the terminal.
+     * Position can then be restored with {@link restoreCursorPosition}.
+     */
+    public static function saveCursorPosition()
+    {
+        echo "\033[s";
+    }
+
+    /**
+     * Restores the cursor position saved with {@link saveCursorPosition} by sending ANSI control code RCP to the terminal.
+     */
+    public static function restoreCursorPosition()
+    {
+        echo "\033[u";
+    }
+
+    /**
+     * Hides the cursor by sending ANSI DECTCEM code ?25l to the terminal.
+     * Use {@link showCursor} to bring it back.
+     * Do not forget to show cursor when your application exits. Cursor might stay hidden in terminal after exit.
+     */
+    public static function hideCursor()
+    {
+        echo "\033[?25l";
+    }
+
+    /**
+     * Will show a cursor again when it has been hidden by {@link hideCursor}  by sending ANSI DECTCEM code ?25h to the terminal.
+     */
+    public static function showCursor()
+    {
+        echo "\033[?25h";
+    }
+
+    /**
+     * Clears entire screen content by sending ANSI control code ED with argument 2 to the terminal.
+     * Cursor position will not be changed.
+     * **Note:** ANSI.SYS implementation used in windows will reset cursor position to upper left corner of the screen.
+     */
+    public static function clearScreen()
+    {
+        echo "\033[2J";
+    }
+
+    /**
+     * Clears text from cursor to the beginning of the screen by sending ANSI control code ED with argument 1 to the terminal.
+     * Cursor position will not be changed.
+     */
+    public static function clearScreenBeforeCursor()
+    {
+        echo "\033[1J";
+    }
+
+    /**
+     * Clears text from cursor to the end of the screen by sending ANSI control code ED with argument 0 to the terminal.
+     * Cursor position will not be changed.
+     */
+    public static function clearScreenAfterCursor()
+    {
+        echo "\033[0J";
+    }
+
+    /**
+     * Clears the line, the cursor is currently on by sending ANSI control code EL with argument 2 to the terminal.
+     * Cursor position will not be changed.
+     */
+    public static function clearLine()
+    {
+        echo "\033[2K";
+    }
+
+    /**
+     * Clears text from cursor position to the beginning of the line by sending ANSI control code EL with argument 1 to the terminal.
+     * Cursor position will not be changed.
+     */
+    public static function clearLineBeforeCursor()
+    {
+        echo "\033[1K";
+    }
+
+    /**
+     * Clears text from cursor position to the end of the line by sending ANSI control code EL with argument 0 to the terminal.
+     * Cursor position will not be changed.
+     */
+    public static function clearLineAfterCursor()
+    {
+        echo "\033[0K";
+    }
+
+    /**
+     * Will send ANSI format for following output
+     *
+     * You can pass any of the FG_*, BG_* and TEXT_* constants and also xterm256ColorBg
+     * TODO: documentation
+     */
+    public static function ansiStyle()
+    {
+        echo "\033[" . implode(';', func_get_args()) . 'm';
+    }
+
+    /**
+     * Will return a string formatted with the given ANSI style
+     *
+     * See {@link ansiStyle} for possible arguments.
+     * @param string $string the string to be formatted
+     * @return string
+     */
+    public static function ansiStyleString($string)
+    {
+        $args = func_get_args();
+        array_shift($args);
+        $code = implode(';', $args);
+        return "\033[0m" . ($code !== '' ? "\033[" . $code . "m" : '') . $string . "\033[0m";
+    }
+
+    //const COLOR_XTERM256 = 38;// http://en.wikipedia.org/wiki/Talk:ANSI_escape_code#xterm-256colors
+    public static function xterm256ColorFg($i) // TODO naming!
+    {
+        return '38;5;' . $i;
+    }
+
+    public static function xterm256ColorBg($i) // TODO naming!
+    {
+        return '48;5;' . $i;
+    }
+
+    /**
+     * Usage: list($w, $h) = ConsoleHelper::getScreenSize();
+     *
+     * @return array
+     */
+    public static function getScreenSize()
+    {
+        // TODO implement
+        return array(150, 50);
+    }
+
+    /**
+     * resets any ansi style set by previous method {@link ansiStyle}
+     * Any output after this is will have default text style.
+     */
+    public static function reset()
+    {
+        echo "\033[0m";
+    }
+
+    /**
+     * Strips ANSI control codes from a string
+     *
+     * @param string $string String to strip
+     * @return string
+     */
+    public static function strip($string)
+    {
+        return preg_replace('/\033\[[\d;]+m/', '', $string); // TODO currently only strips color
+    }
+
+    // TODO refactor and review
+    public static function ansiToHtml($string)
+    {
+        $tags = 0;
+        return preg_replace_callback(
+            '/\033\[[\d;]+m/',
+            function ($ansi) use (&$tags) {
+                $styleA = array();
+                foreach (explode(';', $ansi) as $controlCode) {
+                    switch ($controlCode) {
+                        case static::FG_BLACK:
+                            $style = array('color' => '#000000');
+                            break;
+                        case static::FG_BLUE:
+                            $style = array('color' => '#000078');
+                            break;
+                        case static::FG_CYAN:
+                            $style = array('color' => '#007878');
+                            break;
+                        case static::FG_GREEN:
+                            $style = array('color' => '#007800');
+                            break;
+                        case static::FG_GREY:
+                            $style = array('color' => '#787878');
+                            break;
+                        case static::FG_PURPLE:
+                            $style = array('color' => '#780078');
+                            break;
+                        case static::FG_RED:
+                            $style = array('color' => '#780000');
+                            break;
+                        case static::FG_YELLOW:
+                            $style = array('color' => '#787800');
+                            break;
+                        case static::BG_BLACK:
+                            $style = array('background-color' => '#000000');
+                            break;
+                        case static::BG_BLUE:
+                            $style = array('background-color' => '#000078');
+                            break;
+                        case static::BG_CYAN:
+                            $style = array('background-color' => '#007878');
+                            break;
+                        case static::BG_GREEN:
+                            $style = array('background-color' => '#007800');
+                            break;
+                        case static::BG_GREY:
+                            $style = array('background-color' => '#787878');
+                            break;
+                        case static::BG_PURPLE:
+                            $style = array('background-color' => '#780078');
+                            break;
+                        case static::BG_RED:
+                            $style = array('background-color' => '#780000');
+                            break;
+                        case static::BG_YELLOW:
+                            $style = array('background-color' => '#787800');
+                            break;
+                        case static::BOLD:
+                            $style = array('font-weight' => 'bold');
+                            break;
+                        case static::ITALIC:
+                            $style = array('font-style' => 'italic');
+                            break;
+                        case static::UNDERLINE:
+                            $style = array('text-decoration' => array('underline'));
+                            break;
+                        case static::OVERLINED:
+                            $style = array('text-decoration' => array('overline'));
+                            break;
+                        case static::CROSSED_OUT:
+                            $style = array('text-decoration' => array('line-through'));
+                            break;
+                        case static::BLINK:
+                            $style = array('text-decoration' => array('blink'));
+                            break;
+                        case static::NEGATIVE: // ???
+                        case static::CONCEALED:
+                        case static::ENCIRCLED:
+                        case static::FRAMED:
+                            // TODO allow resetting codes
+                            break;
+                        case 0: // ansi reset
+                            $return = '';
+                            for ($n = $tags; $tags > 0; $tags--) {
+                                $return .= '</span>';
+                            }
+                            return $return;
+                    }
+
+                    $styleA = ArrayHelper::merge($styleA, $style);
+                }
+                $styleString[] = array();
+                foreach ($styleA as $name => $content) {
+                    if ($name === 'text-decoration') {
+                        $content = implode(' ', $content);
+                    }
+                    $styleString[] = $name . ':' . $content;
+                }
+                $tags++;
+                return '<span' . (!empty($styleString) ? 'style="' . implode(';', $styleString) : '') . '>';
+            },
+            $string
+        );
+    }
 
     /**
      *
@@ -413,97 +459,100 @@ class Console
     }
 
     /**
-	 * TODO syntax copied from https://github.com/pear/Console_Color2/blob/master/Console/Color2.php
-	 *
-	 * Converts colorcodes in the format %y (for yellow) into ansi-control
-	 * codes. The conversion table is: ('bold' meaning 'light' on some
-	 * terminals). It's almost the same conversion table irssi uses.
-	 * <pre>
-	 *                  text      text            background
-	 *      ------------------------------------------------
-	 *      %k %K %0    black     dark grey       black
-	 *      %r %R %1    red       bold red        red
-	 *      %g %G %2    green     bold green      green
-	 *      %y %Y %3    yellow    bold yellow     yellow
-	 *      %b %B %4    blue      bold blue       blue
-	 *      %m %M %5    magenta   bold magenta    magenta
-	 *      %p %P       magenta (think: purple)
-	 *      %c %C %6    cyan      bold cyan       cyan
-	 *      %w %W %7    white     bold white      white
-	 *
-	 *      %F     Blinking, Flashing
-	 *      %U     Underline
-	 *      %8     Reverse
-	 *      %_,%9  Bold
-	 *
-	 *      %n     Resets the color
-	 *      %%     A single %
-	 * </pre>
-	 * First param is the string to convert, second is an optional flag if
-	 * colors should be used. It defaults to true, if set to false, the
-	 * colorcodes will just be removed (And %% will be transformed into %)
-	 *
-	 * @param string $string  String to convert
-	 * @param bool   $colored Should the string be colored?
-	 *
-	 * @return string
-	 */
-	public static function renderColoredString($string, $colored = true)
-    {
-		static $conversions = array ( // static so the array doesn't get built
-		   // everytime
-		// %y - yellow, and so on... {{{
-		'%y' => array('color' => 'yellow'),
-		'%g' => array('color' => 'green' ),
-		'%b' => array('color' => 'blue'  ),
-		'%r' => array('color' => 'red'   ),
-		'%p' => array('color' => 'purple'),
-		'%m' => array('color' => 'purple'),
-		'%c' => array('color' => 'cyan'  ),
-		'%w' => array('color' => 'grey'  ),
-		'%k' => array('color' => 'black' ),
-		'%n' => array('color' => 'reset' ),
-		'%Y' => array('color' => 'yellow',  'style' => 'light'),
-		'%G' => array('color' => 'green',   'style' => 'light'),
-		'%B' => array('color' => 'blue',    'style' => 'light'),
-		'%R' => array('color' => 'red',     'style' => 'light'),
-		'%P' => array('color' => 'purple',  'style' => 'light'),
-		'%M' => array('color' => 'purple',  'style' => 'light'),
-		'%C' => array('color' => 'cyan',    'style' => 'light'),
-		'%W' => array('color' => 'grey',    'style' => 'light'),
-		'%K' => array('color' => 'black',   'style' => 'light'),
-		'%N' => array('color' => 'reset',   'style' => 'light'),
-		'%3' => array('background' => 'yellow'),
-		'%2' => array('background' => 'green' ),
-		'%4' => array('background' => 'blue'  ),
-		'%1' => array('background' => 'red'   ),
-		'%5' => array('background' => 'purple'),
-		'%6' => array('background' => 'cyan'  ),
-		'%7' => array('background' => 'grey'  ),
-		'%0' => array('background' => 'black' ),
-		// Don't use this, I can't stand flashing text
-		'%F' => array('style' => 'blink'),
-		'%U' => array('style' => 'underline'),
-		'%8' => array('style' => 'inverse'),
-		'%9' => array('style' => 'bold'),
-		'%_' => array('style' => 'bold')
-		// }}}
-		);
-
-		if ($colored) {
-			$string = str_replace('%%', '% ', $string);
-			foreach ($conversions as $key => $value) {
-				$string = str_replace($key, static::color($value),
-				$string);
-			}
-			$string = str_replace('% ', '%', $string);
-
-		} else {
-			$string = preg_replace('/%((%)|.)/', '$2', $string);
-		}
-
-		return $string;
-	}
+     * TODO syntax copied from https://github.com/pear/Console_Color2/blob/master/Console/Color2.php
+     *
+     * Converts colorcodes in the format %y (for yellow) into ansi-control
+     * codes. The conversion table is: ('bold' meaning 'light' on some
+     * terminals). It's almost the same conversion table irssi uses.
+     * <pre>
+     *                  text      text            background
+     *      ------------------------------------------------
+     *      %k %K %0    black     dark grey       black
+     *      %r %R %1    red       bold red        red
+     *      %g %G %2    green     bold green      green
+     *      %y %Y %3    yellow    bold yellow     yellow
+     *      %b %B %4    blue      bold blue       blue
+     *      %m %M %5    magenta   bold magenta    magenta
+     *      %p %P       magenta (think: purple)
+     *      %c %C %6    cyan      bold cyan       cyan
+     *      %w %W %7    white     bold white      white
+     *
+     *      %F     Blinking, Flashing
+     *      %U     Underline
+     *      %8     Reverse
+     *      %_,%9  Bold
+     *
+     *      %n     Resets the color
+     *      %%     A single %
+     * </pre>
+     * First param is the string to convert, second is an optional flag if
+     * colors should be used. It defaults to true, if set to false, the
+     * colorcodes will just be removed (And %% will be transformed into %)
+     *
+     * @param string $string  String to convert
+     * @param bool   $colored Should the string be colored?
+     *
+     * @return string
+     */
+    public static function renderColoredString($string, $colored = true)
+    {
+        static $conversions = array( // static so the array doesn't get built
+            // everytime
+            // %y - yellow, and so on... {{{
+            '%y' => array('color' => 'yellow'),
+            '%g' => array('color' => 'green'),
+            '%b' => array('color' => 'blue'),
+            '%r' => array('color' => 'red'),
+            '%p' => array('color' => 'purple'),
+            '%m' => array('color' => 'purple'),
+            '%c' => array('color' => 'cyan'),
+            '%w' => array('color' => 'grey'),
+            '%k' => array('color' => 'black'),
+            '%n' => array('color' => 'reset'),
+            '%Y' => array('color' => 'yellow', 'style' => 'light'),
+            '%G' => array('color' => 'green', 'style' => 'light'),
+            '%B' => array('color' => 'blue', 'style' => 'light'),
+            '%R' => array('color' => 'red', 'style' => 'light'),
+            '%P' => array('color' => 'purple', 'style' => 'light'),
+            '%M' => array('color' => 'purple', 'style' => 'light'),
+            '%C' => array('color' => 'cyan', 'style' => 'light'),
+            '%W' => array('color' => 'grey', 'style' => 'light'),
+            '%K' => array('color' => 'black', 'style' => 'light'),
+            '%N' => array('color' => 'reset', 'style' => 'light'),
+            '%3' => array('background' => 'yellow'),
+            '%2' => array('background' => 'green'),
+            '%4' => array('background' => 'blue'),
+            '%1' => array('background' => 'red'),
+            '%5' => array('background' => 'purple'),
+            '%6' => array('background' => 'cyan'),
+            '%7' => array('background' => 'grey'),
+            '%0' => array('background' => 'black'),
+            // Don't use this, I can't stand flashing text
+            '%F' => array('style' => 'blink'),
+            '%U' => array('style' => 'underline'),
+            '%8' => array('style' => 'inverse'),
+            '%9' => array('style' => 'bold'),
+            '%_' => array('style' => 'bold')
+            // }}}
+        );
+
+        if ($colored) {
+            $string = str_replace('%%', '% ', $string);
+            foreach ($conversions as $key => $value) {
+                $string = str_replace(
+                    $key,
+                    static::color($value),
+                    $string
+                );
+            }
+            $string = str_replace('% ', '%', $string);
+
+        } else {
+            $string = preg_replace('/%((%)|.)/', '$2', $string);
+        }
+
+        return $string;
+    }
 
     /**
      * Returns the different foreground and background color codes and styles available.
@@ -512,7 +561,7 @@ class Console
     public static function getColorCodes()
     {
         return array(
-            'color' => array(
+            'color'      => array(
                 'black'  => static::FG_BLACK,
                 'red'    => static::FG_RED,
                 'green'  => static::FG_GREEN,
@@ -522,7 +571,7 @@ class Console
                 'cyan'   => static::FG_CYAN,
                 'grey'   => static::FG_GREY,
             ),
-            'style' => array(
+            'style'      => array(
                 'normal'      => static::NORMAL,
                 'bold'        => static::BOLD,
                 'italic'      => static::ITALIC,
@@ -548,18 +597,18 @@ class Console
         );
     }
 
-	/**
-	 * Escapes % so they don't get interpreted as color codes
-	 *
-	 * @param string $string String to escape
-	 *
-	 * @access public
-	 * @return string
-	 */
-	public static function escape($string)
-	{
-		return str_replace('%', '%%', $string);
-	}
+    /**
+     * Escapes % so they don't get interpreted as color codes
+     *
+     * @param string $string String to escape
+     *
+     * @access public
+     * @return string
+     */
+    public static function escape($string)
+    {
+        return str_replace('%', '%%', $string);
+    }
 
     /**
      * Returns true if the stream supports colorization. ANSI colors is disabled if not supported by the stream.
@@ -570,7 +619,7 @@ class Console
      * @param mixed $stream
      * @return bool true if the stream supports ANSI colors, otherwise false.
      */
-    public static function streamSupportsAnsiColors( $stream )
+    public static function streamSupportsAnsiColors($stream)
     {
         return DIRECTORY_SEPARATOR == '\\'
             ? null !== getenv('ANSICON')
@@ -658,7 +707,7 @@ class Console
      */
     public static function input($prompt = null)
     {
-        if(isset($prompt)) {
+        if (isset($prompt)) {
             static::stdout($prompt);
         }
         return static::stdin();
@@ -692,14 +741,17 @@ class Console
      */
     public static function prompt($text, $options = array())
     {
-        $options = ArrayHelper::merge($options, array(
-            'required'  => false,
-            'default'   => null,
-            'pattern'   => null,
-            'validator' => null,
-            'error'     => 'Invalid input.',
-        ));
-        $error = null;
+        $options = ArrayHelper::merge(
+            $options,
+            array(
+                'required'  => false,
+                'default'   => null,
+                'pattern'   => null,
+                'validator' => null,
+                'error'     => 'Invalid input.',
+            )
+        );
+        $error   = null;
 
         top:
         $input = $options['default']
@@ -717,7 +769,8 @@ class Console
             static::output($options['error']);
             goto top;
         } elseif ($options['validator'] &&
-            !call_user_func_array($options['validator'], array($input, &$error))) {
+            !call_user_func_array($options['validator'], array($input, &$error))
+        ) {
             static::output(isset($error) ? $error : $options['error']);
             goto top;
         }
@@ -736,7 +789,7 @@ class Console
     {
         top:
         $input = strtolower(static::input("$prompt [y/n]: "));
-        if (!in_array(substr($input,0,1), array('y', 'n'))) {
+        if (!in_array(substr($input, 0, 1), array('y', 'n'))) {
             static::output("Please, type 'y' or 'n'");
             goto top;
         }
@@ -763,7 +816,9 @@ class Console
             }
             echo " ? - Show help\n";
             goto top;
-        } elseif (!in_array($input, array_keys($options))) goto top;
+        } elseif (!in_array($input, array_keys($options))) {
+            goto top;
+        }
         return $input;
     }
 
@@ -775,51 +830,51 @@ class Console
      * @param int $size the size of the status bar (optional)
      * @see http://snipplr.com/view/29548/
      */
-    public static function showProgress($done, $total, $size=30)
+    public static function showProgress($done, $total, $size = 30)
     {
         static $start;
 
         // if we go over our bound, just ignore it
-        if($done > $total) {
+        if ($done > $total) {
             return;
         }
 
-        if(empty($start)) {
-            $start=time();
+        if (empty($start)) {
+            $start = time();
         }
 
         $now = time();
 
-        $percent=(double)($done/$total);
-        $bar=floor($percent*$size);
+        $percent = (double)($done / $total);
+        $bar     = floor($percent * $size);
 
-        $status="\r[";
-        $status.=str_repeat("=", $bar);
-        if($bar<$size){
-            $status.=">";
-            $status.=str_repeat(" ", $size-$bar);
+        $status = "\r[";
+        $status .= str_repeat("=", $bar);
+        if ($bar < $size) {
+            $status .= ">";
+            $status .= str_repeat(" ", $size - $bar);
         } else {
-            $status.="=";
+            $status .= "=";
         }
 
-        $display=number_format($percent*100, 0);
+        $display = number_format($percent * 100, 0);
 
-        $status.="] $display%  $done/$total";
+        $status .= "] $display%  $done/$total";
 
-        $rate = ($now-$start)/$done;
+        $rate = ($now - $start) / $done;
         $left = $total - $done;
-        $eta = round($rate * $left, 2);
+        $eta  = round($rate * $left, 2);
 
         $elapsed = $now - $start;
 
-        $status.= " remaining: ".number_format($eta)." sec.  elapsed: ".number_format($elapsed)." sec.";
+        $status .= " remaining: " . number_format($eta) . " sec.  elapsed: " . number_format($elapsed) . " sec.";
 
         static::stdout("$status  ");
 
         flush();
 
         // when done, send a newline
-        if($done == $total) {
+        if ($done == $total) {
             echo "\n";
         }
     }

From fc7fc8032bf9268a44e15fc38a2a936795ef2609 Mon Sep 17 00:00:00 2001
From: Antonio Ramirez <ramirez.cobos@gmail.com>
Date: Mon, 6 May 2013 13:06:17 +0200
Subject: [PATCH 047/152] remove for now

---
 tests/unit/framework/helpers/ConsoleTest.php | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 tests/unit/framework/helpers/ConsoleTest.php

diff --git a/tests/unit/framework/helpers/ConsoleTest.php b/tests/unit/framework/helpers/ConsoleTest.php
deleted file mode 100644
index 4e1dcaf..0000000
--- a/tests/unit/framework/helpers/ConsoleTest.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace yiiunit\framework\helpers;
-
-use yii\helpers\Console;
-
-class ConsoleTest extends \yii\test\TestCase
-{
-    /* TODO */
-}
\ No newline at end of file

From e9ad7d6e367b0a6c1816c3a5f5b6a863ffa37ba2 Mon Sep 17 00:00:00 2001
From: resurtm <resurtm@gmail.com>
Date: Mon, 6 May 2013 17:46:34 +0600
Subject: [PATCH 048/152] Rollback word consistencty over entire codebase (ref.
 #139).

---
 framework/db/Connection.php  | 2 +-
 framework/db/Migration.php   | 8 ++++----
 framework/db/Transaction.php | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/framework/db/Connection.php b/framework/db/Connection.php
index f71b940..03b10a8 100644
--- a/framework/db/Connection.php
+++ b/framework/db/Connection.php
@@ -66,7 +66,7 @@ use yii\caching\Cache;
  *     // ... executing other SQL statements ...
  *     $transaction->commit();
  * } catch(Exception $e) {
- *     $transaction->rollBack();
+ *     $transaction->rollback();
  * }
  * ~~~
  *
diff --git a/framework/db/Migration.php b/framework/db/Migration.php
index 88abab5..f51e597 100644
--- a/framework/db/Migration.php
+++ b/framework/db/Migration.php
@@ -64,14 +64,14 @@ class Migration extends \yii\base\Component
 		$transaction = $this->db->beginTransaction();
 		try {
 			if ($this->safeUp() === false) {
-				$transaction->rollBack();
+				$transaction->rollback();
 				return false;
 			}
 			$transaction->commit();
 		} catch (\Exception $e) {
 			echo "Exception: " . $e->getMessage() . ' (' . $e->getFile() . ':' . $e->getLine() . ")\n";
 			echo $e->getTraceAsString() . "\n";
-			$transaction->rollBack();
+			$transaction->rollback();
 			return false;
 		}
 		return null;
@@ -89,14 +89,14 @@ class Migration extends \yii\base\Component
 		$transaction = $this->db->beginTransaction();
 		try {
 			if ($this->safeDown() === false) {
-				$transaction->rollBack();
+				$transaction->rollback();
 				return false;
 			}
 			$transaction->commit();
 		} catch (\Exception $e) {
 			echo "Exception: " . $e->getMessage() . ' (' . $e->getFile() . ':' . $e->getLine() . ")\n";
 			echo $e->getTraceAsString() . "\n";
-			$transaction->rollBack();
+			$transaction->rollback();
 			return false;
 		}
 		return null;
diff --git a/framework/db/Transaction.php b/framework/db/Transaction.php
index d66c38e..195a8c8 100644
--- a/framework/db/Transaction.php
+++ b/framework/db/Transaction.php
@@ -25,7 +25,7 @@ use yii\base\InvalidConfigException;
  *     //.... other SQL executions
  *     $transaction->commit();
  * } catch(Exception $e) {
- *     $transaction->rollBack();
+ *     $transaction->rollback();
  * }
  * ~~~
  *
@@ -42,14 +42,14 @@ class Transaction extends \yii\base\Object
 	public $db;
 	/**
 	 * @var boolean whether this transaction is active. Only an active transaction
-	 * can [[commit()]] or [[rollBack()]]. This property is set true when the transaction is started.
+	 * can [[commit()]] or [[rollback()]]. This property is set true when the transaction is started.
 	 */
 	private $_active = false;
 
 	/**
 	 * Returns a value indicating whether this transaction is active.
 	 * @return boolean whether this transaction is active. Only an active transaction
-	 * can [[commit()]] or [[rollBack()]].
+	 * can [[commit()]] or [[rollback()]].
 	 */
 	public function getIsActive()
 	{

From 034d88e5e480d2a681f336acc3b0bdd7c758cc42 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Mon, 6 May 2013 08:04:35 -0400
Subject: [PATCH 049/152] Fixes issue #134

---
 docs/api/db/ActiveRecord.md     | 4 ++--
 framework/db/ActiveQuery.php    | 3 ++-
 tests/unit/data/ar/Customer.php | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/api/db/ActiveRecord.md b/docs/api/db/ActiveRecord.md
index 822c548..4e82793 100644
--- a/docs/api/db/ActiveRecord.md
+++ b/docs/api/db/ActiveRecord.md
@@ -412,7 +412,7 @@ class Customer extends \yii\db\ActiveRecord
 	/**
 	 * @param ActiveQuery $query
 	 */
-	public function active($query)
+	public static function active($query)
 	{
 		$query->andWhere('status = 1');
 	}
@@ -435,7 +435,7 @@ class Customer extends \yii\db\ActiveRecord
 	 * @param ActiveQuery $query
 	 * @param integer $age
 	 */
-	public function olderThan($query, $age = 30)
+	public static function olderThan($query, $age = 30)
 	{
 		$query->andWhere('age > :age', array(':age' => $age));
 	}
diff --git a/framework/db/ActiveQuery.php b/framework/db/ActiveQuery.php
index 43c3059..3999600 100644
--- a/framework/db/ActiveQuery.php
+++ b/framework/db/ActiveQuery.php
@@ -88,7 +88,8 @@ class ActiveQuery extends Query
 	{
 		if (method_exists($this->modelClass, $name)) {
 			array_unshift($params, $this);
-			return call_user_func_array(array($this->modelClass, $name), $params);
+			call_user_func_array(array($this->modelClass, $name), $params);
+			return $this;
 		} else {
 			return parent::__call($name, $params);
 		}
diff --git a/tests/unit/data/ar/Customer.php b/tests/unit/data/ar/Customer.php
index 9b3eab6..b26b51b 100644
--- a/tests/unit/data/ar/Customer.php
+++ b/tests/unit/data/ar/Customer.php
@@ -22,6 +22,6 @@ class Customer extends ActiveRecord
 
 	public static function active($query)
 	{
-		return $query->andWhere('status=1');
+		$query->andWhere('status=1');
 	}
 }

From b19f640b66b373751a0b1679a2e37811bc24402b Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Mon, 6 May 2013 11:14:25 -0400
Subject: [PATCH 050/152] Added Breadcrumbs.php

---
 framework/widgets/Breadcrumbs.php | 100 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)
 create mode 100644 framework/widgets/Breadcrumbs.php

diff --git a/framework/widgets/Breadcrumbs.php b/framework/widgets/Breadcrumbs.php
new file mode 100644
index 0000000..f60908f
--- /dev/null
+++ b/framework/widgets/Breadcrumbs.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use Yii;
+use yii\base\Widget;
+use yii\helpers\Html;
+
+/**
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Breadcrumbs extends Widget
+{
+	/**
+	 * @var array the HTML attributes for the breadcrumb container tag. The "tag" element is
+	 * specially handled which specifies the tag name of the container element. If not set, it will default to "ul".
+	 */
+	public $options = array('tag' => 'ul', 'class' => 'breadcrumb');
+	/**
+	 * @var boolean whether to HTML encode the link labels. Defaults to true.
+	 */
+	public $encodeLabels = true;
+	/**
+	 * @var string the first hyperlink in the breadcrumbs (called home link).
+	 * If this property is not set, it defaults to a link pointing to {@link CWebApplication::homeUrl} with label 'Home'.
+	 * If this property is false, the home link will not be rendered.
+	 */
+	public $homeLink;
+	/**
+	 * @var array list of hyperlinks to appear in the breadcrumbs. If this property is empty,
+	 * the widget will not render anything. Each key-value pair in the array
+	 * will be used to generate a hyperlink by calling CHtml::link(key, value). For this reason, the key
+	 * refers to the label of the link while the value can be a string or an array (used to
+	 * create a URL). For more details, please refer to {@link CHtml::link}.
+	 * If an element's key is an integer, it means the element will be rendered as a label only (meaning the current page).
+	 *
+	 * The following example will generate breadcrumbs as "Home > Sample post > Edit", where "Home" points to the homepage,
+	 * "Sample post" points to the "index.php?r=post/view&id=12" page, and "Edit" is a label. Note that the "Home" link
+	 * is specified via {@link homeLink} separately.
+	 *
+	 * <pre>
+	 * array(
+	 *     'Sample post'=>array('post/view', 'id'=>12),
+	 *     'Edit',
+	 * )
+	 * </pre>
+	 */
+	public $links = array();
+	/**
+	 * @var string String, specifies how each active item is rendered. Defaults to
+	 * "<a href="{url}">{label}</a>", where "{label}" will be replaced by the corresponding item
+	 * label while "{url}" will be replaced by the URL of the item.
+	 * @since 1.1.11
+	 */
+	public $itemTemplate = "<li>{link} <span class=\"divider\">/</span></li>\n";
+	/**
+	 * @var string String, specifies how each inactive item is rendered. Defaults to
+	 * "<span>{label}</span>", where "{label}" will be replaced by the corresponding item label.
+	 * Note that inactive template does not have "{url}" parameter.
+	 * @since 1.1.11
+	 */
+	public $activeItemTemplate = "<li class=\"active\">{link}</li>\n";
+	/**
+	 * @var string the separator between links in the breadcrumbs. Defaults to ' &raquo; '.
+	 */
+	public $separator = ' &raquo; ';
+
+	/**
+	 * Renders the content of the portlet.
+	 */
+	public function run()
+	{
+		if (!empty($this->links)) {
+			return;
+		}
+		$links = array();
+		if ($this->homeLink === null) {
+			$links[] = Html::a(Html::encode('yii|Home'), Yii::$app->homeUrl);
+		} elseif ($this->homeLink !== false) {
+			$links[] = $this->homeLink;
+		}
+		foreach ($this->links as $link) {
+			if (strpos($link, '<a') !== false) {
+				$links[] = strtr($this->itemTemplate, array('{link}' => $link));
+			} else {
+				$links[] = strtr($this->activeItemTemplate, array('{link}' => $link));
+			}
+		}
+		$tagName = isset($this->options['tag']) ? $this->options['tag'] : 'ul';
+		unset($this->options['tag']);
+		echo Html::tag($tagName, implode('', $this->links), $this->options);
+	}
+}
\ No newline at end of file

From 02319b99a075ad2cccad5b846b526755bc0da755 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Mon, 6 May 2013 12:14:40 -0400
Subject: [PATCH 051/152] Fixes issue #54: Implemented Breadcrumbs.

---
 apps/bootstrap/protected/views/layouts/main.php |  3 +
 apps/bootstrap/protected/views/site/about.php   |  1 +
 apps/bootstrap/protected/views/site/contact.php |  1 +
 apps/bootstrap/protected/views/site/login.php   |  1 +
 framework/widgets/Breadcrumbs.php               | 99 +++++++++++++++----------
 5 files changed, 67 insertions(+), 38 deletions(-)

diff --git a/apps/bootstrap/protected/views/layouts/main.php b/apps/bootstrap/protected/views/layouts/main.php
index 8fb915a..1240053 100644
--- a/apps/bootstrap/protected/views/layouts/main.php
+++ b/apps/bootstrap/protected/views/layouts/main.php
@@ -39,6 +39,9 @@ $this->registerAssetBundle('app');
 		<!-- /.navbar -->
 	</div>
 
+	<?php $this->widget('yii\widgets\Breadcrumbs', array(
+		'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : array(),
+	)); ?>
 	<?php echo $content; ?>
 
 	<hr>
diff --git a/apps/bootstrap/protected/views/site/about.php b/apps/bootstrap/protected/views/site/about.php
index 7ebc5d5..86e19e1 100644
--- a/apps/bootstrap/protected/views/site/about.php
+++ b/apps/bootstrap/protected/views/site/about.php
@@ -4,6 +4,7 @@ use yii\helpers\Html;
  * @var yii\base\View $this
  */
 $this->title = 'About';
+$this->params['breadcrumbs'][] = $this->title;
 ?>
 <h1><?php echo Html::encode($this->title); ?></h1>
 
diff --git a/apps/bootstrap/protected/views/site/contact.php b/apps/bootstrap/protected/views/site/contact.php
index 4ca40f1..5cb5a8e 100644
--- a/apps/bootstrap/protected/views/site/contact.php
+++ b/apps/bootstrap/protected/views/site/contact.php
@@ -6,6 +6,7 @@ use yii\helpers\Html;
  * @var app\models\ContactForm $model
  */
 $this->title = 'Contact';
+$this->params['breadcrumbs'][] = $this->title;
 ?>
 <h1><?php echo Html::encode($this->title); ?></h1>
 
diff --git a/apps/bootstrap/protected/views/site/login.php b/apps/bootstrap/protected/views/site/login.php
index 8672eeb..f7f842e 100644
--- a/apps/bootstrap/protected/views/site/login.php
+++ b/apps/bootstrap/protected/views/site/login.php
@@ -6,6 +6,7 @@ use yii\helpers\Html;
  * @var app\models\LoginForm $model
  */
 $this->title = 'Login';
+$this->params['breadcrumbs'][] = $this->title;
 ?>
 <h1><?php echo Html::encode($this->title); ?></h1>
 
diff --git a/framework/widgets/Breadcrumbs.php b/framework/widgets/Breadcrumbs.php
index f60908f..a55d00f 100644
--- a/framework/widgets/Breadcrumbs.php
+++ b/framework/widgets/Breadcrumbs.php
@@ -5,13 +5,40 @@
  * @license http://www.yiiframework.com/license/
  */
 
-namespace yii\web;
+namespace yii\widgets;
 
 use Yii;
 use yii\base\Widget;
+use yii\base\InvalidConfigException;
 use yii\helpers\Html;
 
 /**
+ * Breadcrumbs displays a list of links indicating the position of the current page in the whole site hierarchy.
+ *
+ * For example, breadcrumbs like "Home / Sample Post / Edit" means the user is viewing an edit page
+ * for the "Sample Post". He can click on "Sample Post" to view that page, or he can click on "Home"
+ * to return to the homepage.
+ *
+ * To use Breadcrumbs, you need to configure its [[links]] property, which specifiesthe links to be displayed. For example,
+ *
+ * ~~~
+ * $this->widget('yii\widgets\Breadcrumbs', array(
+ *     'links' => array(
+ *         array('label' => 'Sample Post', 'url' => array('post/edit', 'id' => 1)),
+ *         'Edit',
+ *     ),
+ * ));
+ * ~~~
+ *
+ * Because breadcrumbs usually appears in nearly every page of a website, you may consider place it in a layout view.
+ * You can then use a view parameter (e.g. `$this->params['breadcrumbs']`) to configure the links in different
+ * views. In the layout view, you assign this view parameter to the [[links]] property like the following:
+ *
+ * ~~~
+ * $this->widget('yii\widgets\Breadcrumbs', array(
+ *     'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : array(),
+ * ));
+ * ~~~
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
@@ -24,77 +51,73 @@ class Breadcrumbs extends Widget
 	 */
 	public $options = array('tag' => 'ul', 'class' => 'breadcrumb');
 	/**
-	 * @var boolean whether to HTML encode the link labels. Defaults to true.
+	 * @var boolean whether to HTML-encode the link labels.
 	 */
 	public $encodeLabels = true;
 	/**
 	 * @var string the first hyperlink in the breadcrumbs (called home link).
-	 * If this property is not set, it defaults to a link pointing to {@link CWebApplication::homeUrl} with label 'Home'.
-	 * If this property is false, the home link will not be rendered.
+	 * If this property is not set, it will default to a link pointing to [[\yii\web\Application::homeUrl]]
+	 * with the label 'Home'. If this property is false, the home link will not be rendered.
 	 */
 	public $homeLink;
 	/**
-	 * @var array list of hyperlinks to appear in the breadcrumbs. If this property is empty,
-	 * the widget will not render anything. Each key-value pair in the array
-	 * will be used to generate a hyperlink by calling CHtml::link(key, value). For this reason, the key
-	 * refers to the label of the link while the value can be a string or an array (used to
-	 * create a URL). For more details, please refer to {@link CHtml::link}.
-	 * If an element's key is an integer, it means the element will be rendered as a label only (meaning the current page).
-	 *
-	 * The following example will generate breadcrumbs as "Home > Sample post > Edit", where "Home" points to the homepage,
-	 * "Sample post" points to the "index.php?r=post/view&id=12" page, and "Edit" is a label. Note that the "Home" link
-	 * is specified via {@link homeLink} separately.
+	 * @var array list of links to appear in the breadcrumbs. If this property is empty,
+	 * the widget will not render anything. Each array element represents a single link in the breadcrumbs
+	 * with the following structure:
 	 *
-	 * <pre>
+	 * ~~~
 	 * array(
-	 *     'Sample post'=>array('post/view', 'id'=>12),
-	 *     'Edit',
+	 *     'label' => 'label of the link',  // required
+	 *     'url' => 'url of the link',      // optional, will be processed by Html::url()
 	 * )
-	 * </pre>
+	 * ~~~
+	 *
+	 * If a link is active, you only need to specify its "label", and instead of writing `array('label' => $label)`,
+	 * you should simply use `$label`.
 	 */
 	public $links = array();
 	/**
-	 * @var string String, specifies how each active item is rendered. Defaults to
-	 * "<a href="{url}">{label}</a>", where "{label}" will be replaced by the corresponding item
-	 * label while "{url}" will be replaced by the URL of the item.
-	 * @since 1.1.11
+	 * @var string the template used to render each inactive item in the breadcrumbs. The token `{link}`
+	 * will be replaced with the actual HTML link for each inactive item.
 	 */
 	public $itemTemplate = "<li>{link} <span class=\"divider\">/</span></li>\n";
 	/**
-	 * @var string String, specifies how each inactive item is rendered. Defaults to
-	 * "<span>{label}</span>", where "{label}" will be replaced by the corresponding item label.
-	 * Note that inactive template does not have "{url}" parameter.
-	 * @since 1.1.11
+	 * @var string the template used to render each active item in the breadcrumbs. The token `{link}`
+	 * will be replaced with the actual HTML link for each active item.
 	 */
 	public $activeItemTemplate = "<li class=\"active\">{link}</li>\n";
-	/**
-	 * @var string the separator between links in the breadcrumbs. Defaults to ' &raquo; '.
-	 */
-	public $separator = ' &raquo; ';
 
 	/**
-	 * Renders the content of the portlet.
+	 * Renders the widget.
 	 */
 	public function run()
 	{
-		if (!empty($this->links)) {
+		if (empty($this->links)) {
 			return;
 		}
 		$links = array();
 		if ($this->homeLink === null) {
-			$links[] = Html::a(Html::encode('yii|Home'), Yii::$app->homeUrl);
+			$links[] = strtr($this->itemTemplate, array('{link}' => Html::a(Yii::t('yii|Home'), Yii::$app->homeUrl)));
 		} elseif ($this->homeLink !== false) {
-			$links[] = $this->homeLink;
+			$links[] = strtr($this->itemTemplate, array('{link}' => $this->homeLink));
 		}
 		foreach ($this->links as $link) {
-			if (strpos($link, '<a') !== false) {
-				$links[] = strtr($this->itemTemplate, array('{link}' => $link));
+			if (!is_array($link)) {
+				$link = array('label' => $link);
+			}
+			if (isset($link['label'])) {
+				$label = $this->encodeLabels ? Html::encode($link['label']) : $link['label'];
+			} else {
+				throw new InvalidConfigException('The "label" element is required for each link.');
+			}
+			if (isset($link['url'])) {
+				$links[] = strtr($this->itemTemplate, array('{link}' => Html::a($label, $link['url'])));
 			} else {
-				$links[] = strtr($this->activeItemTemplate, array('{link}' => $link));
+				$links[] = strtr($this->activeItemTemplate, array('{link}' => $label));
 			}
 		}
 		$tagName = isset($this->options['tag']) ? $this->options['tag'] : 'ul';
 		unset($this->options['tag']);
-		echo Html::tag($tagName, implode('', $this->links), $this->options);
+		echo Html::tag($tagName, implode('', $links), $this->options);
 	}
 }
\ No newline at end of file

From f01414fff2a888123e90d13143036147929456ef Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Mon, 6 May 2013 13:34:28 -0400
Subject: [PATCH 052/152] Refactored Breadcrumbs.

---
 framework/widgets/ActiveForm.php  |  1 -
 framework/widgets/Breadcrumbs.php | 54 +++++++++++++++++++++++++--------------
 2 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/framework/widgets/ActiveForm.php b/framework/widgets/ActiveForm.php
index c11bceb..61416e2 100644
--- a/framework/widgets/ActiveForm.php
+++ b/framework/widgets/ActiveForm.php
@@ -12,7 +12,6 @@ use yii\base\Widget;
 use yii\base\Model;
 use yii\helpers\Html;
 use yii\helpers\Json;
-use yii\helpers\JsExpression;
 
 /**
  * ActiveForm ...
diff --git a/framework/widgets/Breadcrumbs.php b/framework/widgets/Breadcrumbs.php
index a55d00f..22d09b3 100644
--- a/framework/widgets/Breadcrumbs.php
+++ b/framework/widgets/Breadcrumbs.php
@@ -46,10 +46,13 @@ use yii\helpers\Html;
 class Breadcrumbs extends Widget
 {
 	/**
-	 * @var array the HTML attributes for the breadcrumb container tag. The "tag" element is
-	 * specially handled which specifies the tag name of the container element. If not set, it will default to "ul".
+	 * @var string the name of the breadcrumb container tag.
 	 */
-	public $options = array('tag' => 'ul', 'class' => 'breadcrumb');
+	public $tag = 'ul';
+	/**
+	 * @var array the HTML attributes for the breadcrumb container tag.
+	 */
+	public $options = array('class' => 'breadcrumb');
 	/**
 	 * @var boolean whether to HTML-encode the link labels.
 	 */
@@ -97,27 +100,40 @@ class Breadcrumbs extends Widget
 		}
 		$links = array();
 		if ($this->homeLink === null) {
-			$links[] = strtr($this->itemTemplate, array('{link}' => Html::a(Yii::t('yii|Home'), Yii::$app->homeUrl)));
+			$links[] = $this->renderItem(array(
+				'label' => Yii::t('yii|Home'),
+				'url' => Yii::$app->homeUrl,
+			), $this->itemTemplate);
 		} elseif ($this->homeLink !== false) {
-			$links[] = strtr($this->itemTemplate, array('{link}' => $this->homeLink));
+			$links[] = $this->renderItem($this->homeLink, $this->itemTemplate);
 		}
 		foreach ($this->links as $link) {
 			if (!is_array($link)) {
 				$link = array('label' => $link);
 			}
-			if (isset($link['label'])) {
-				$label = $this->encodeLabels ? Html::encode($link['label']) : $link['label'];
-			} else {
-				throw new InvalidConfigException('The "label" element is required for each link.');
-			}
-			if (isset($link['url'])) {
-				$links[] = strtr($this->itemTemplate, array('{link}' => Html::a($label, $link['url'])));
-			} else {
-				$links[] = strtr($this->activeItemTemplate, array('{link}' => $label));
-			}
+			$links[] = $this->renderItem($link, isset($link['url']) ? $this->itemTemplate : $this->activeItemTemplate);
+		}
+		echo Html::tag($this->tag, implode('', $links), $this->options);
+	}
+
+	/**
+	 * Renders a single breadcrumb item.
+	 * @param array $link the link to be rendered. It must contain the "label" element. The "url" element is optional.
+	 * @param string $template the template to be used to rendered the link. The token "{link}" will be replaced by the link.
+	 * @return string the rendering result
+	 * @throws InvalidConfigException if `$link` does not have "label" element.
+	 */
+	protected function renderItem($link, $template)
+	{
+		if (isset($link['label'])) {
+			$label = $this->encodeLabels ? Html::encode($link['label']) : $link['label'];
+		} else {
+			throw new InvalidConfigException('The "label" element is required for each link.');
+		}
+		if (isset($link['url'])) {
+			return strtr($template, array('{link}' => Html::a($label, $link['url'])));
+		} else {
+			return strtr($template, array('{link}' => $label));
 		}
-		$tagName = isset($this->options['tag']) ? $this->options['tag'] : 'ul';
-		unset($this->options['tag']);
-		echo Html::tag($tagName, implode('', $links), $this->options);
 	}
-}
\ No newline at end of file
+}

From c6642a3d65336ebe0550d0d282e61b07ab140c68 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Mon, 6 May 2013 14:50:16 -0400
Subject: [PATCH 053/152] upgrading instructions WIP

---
 docs/guide/index.md           |   2 +-
 docs/guide/upgrade-from-v1.md | 163 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 164 insertions(+), 1 deletion(-)
 create mode 100644 docs/guide/upgrade-from-v1.md

diff --git a/docs/guide/index.md b/docs/guide/index.md
index 6ad733c..dd72ca3 100644
--- a/docs/guide/index.md
+++ b/docs/guide/index.md
@@ -27,4 +27,4 @@
 * [Performance Tuning](performance.md)
 * [Testing](testing.md)
 * [Automatic Code Generation](gii.md)
-* [Upgrading from 1.1 to 2.0](upgrade.md)
+* [Upgrading from 1.1 to 2.0](upgrade-from-v1.md)
diff --git a/docs/guide/upgrade-from-v1.md b/docs/guide/upgrade-from-v1.md
new file mode 100644
index 0000000..af3c9ca
--- /dev/null
+++ b/docs/guide/upgrade-from-v1.md
@@ -0,0 +1,163 @@
+Upgrading from Yii 1.1
+======================
+
+In this chapter, we list the major changes introduced in Yii 2.0 since version 1.1.
+We hope this list will make it easier for you to upgrade from Yii 1.1 and quickly
+master Yii 2.0 based on your existing Yii knowledge.
+
+
+Component and Object
+--------------------
+
+Yii 2.0 breaks the `CComponent` class in 1.1 into two classes: `Object` and `Component`.
+The `Object` class is a lightweight base class that allows defining class properties
+via getters and setters. The `Component` class extends from `Object` and supports
+the event feature and the behavior feature.
+
+If your class does not need the event or behavior feature, you should consider using
+`Object` as the based class. This is usually the case for classes that represent basic
+data structures.
+
+
+Object Configuration
+--------------------
+
+The `Object` class introduces a convention for configuring objects. In general, any
+descendant class of `Object` should follow this convention when declaring a constructor:
+
+~~~
+class MyClass extends \yii\Object
+{
+    public function __construct($param1, $param2, $config = array())
+    {
+        // ...
+        parent::__construct($config);
+    }
+
+    public function init()
+    {
+        parent::init();
+        // ... at this point, all configurations have been applied ...
+    }
+}
+~~~
+
+In descendant classes, you can override the `init()` method to do initialization work
+that should be done after all configurations are applied.
+
+By following this convention, you will be able to use the powerful object creation method via:
+
+~~~
+$object = Yii::createObject(array(
+    'class' => 'MyClass',
+    'property1' => 'abc',
+    'property2' => 'cde',
+), $param1, $param2);
+~~~
+
+
+Events
+------
+
+There is no longer the need to define an `on`-method in order to define an event in Yii 2.0.
+Instead, you can use whatever event names. To attach a handler to an event, you should
+use the `on` method now:
+
+~~~
+$component->on($eventName, $handler);
+// To detach the handler, use:
+// $component->off($eventName, $handler);
+~~~
+
+When you attach a handler, you can now associate it with some parameters which can be later
+accessed via the event parameter by the handler:
+
+~~~
+$component->on($eventName, $handler, $params);
+~~~
+
+Because of this change, you can now use "global" events. Simply trigger and attach handlers to
+an event of the application instance:
+
+~~~
+Yii::$app->on($eventName, $handler);
+....
+// this will trigger the event and cause $handler to be invoked.
+Yii::$app->trigger($eventName);
+~~~
+
+
+View
+----
+
+Yii 2.0 introduces a `View` class to represent the view part in the MVC pattern.
+It can be configured globally through the "view" application component. It is also
+accessible in any view file via `$this`. This is one of the biggest changes compared to 1.1:
+**`$this` in a view file no longer refers to the controller or widget object.**
+It refers to the view object that is used to render the view file. To access the controller
+or the widget object, you have to use `$this->context` now.
+
+Because you can access the view object through the "view" application component,
+you can now render a view file like the following anywhere in your code, not necessarily
+in controllers or widgets:
+
+~~~
+$content = Yii::$app->view->renderFile($viewFile, $params);
+// You can also explicitly create a new View instance to do the rendering
+// $view = new View;
+// $view->renderFile($viewFile, $params);
+~~~
+
+Also, there is no more `CClientScript` in Yii 2.0. The `View` class has taken over its role
+with significant improvements. For more details, please see the "assets" subsection.
+
+TBD: built-in renderers
+
+Models
+------
+
+Controllers
+-----------
+
+Themes
+------
+
+Console Applications
+--------------------
+
+I18N
+----
+
+Behaviors
+---------
+
+TBD
+
+Action filters are replaced by behaviors (`ActiionFilter`).
+
+
+Assets
+------
+
+Static Helpers
+--------------
+
+`ActiveForm`
+------------
+
+
+Query Builder
+-------------
+
+
+ActiveRecord
+------------
+
+User and Identity
+-----------------
+
+URL Management
+--------------
+
+Response
+--------
\ No newline at end of file

From 235ad40c2bee853ae225642d9d241323a4e1bd67 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Mon, 6 May 2013 14:52:26 -0400
Subject: [PATCH 054/152] Menu WIP

---
 framework/widgets/Menu.php | 282 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 282 insertions(+)
 create mode 100644 framework/widgets/Menu.php

diff --git a/framework/widgets/Menu.php b/framework/widgets/Menu.php
new file mode 100644
index 0000000..3af620d
--- /dev/null
+++ b/framework/widgets/Menu.php
@@ -0,0 +1,282 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\widgets;
+
+use yii\base\Widget;
+use yii\helpers\Html;
+
+/**
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Menu extends Widget
+{
+	/**
+	 * @var array list of menu items. Each menu item is specified as an array of name-value pairs.
+	 * Possible option names include the following:
+	 * <ul>
+	 * <li>label: string, optional, specifies the menu item label. When {@link encodeLabel} is true, the label
+	 * will be HTML-encoded. If the label is not specified, it defaults to an empty string.</li>
+	 * <li>url: string or array, optional, specifies the URL of the menu item. It is passed to {@link Html::normalizeUrl}
+	 * to generate a valid URL. If this is not set, the menu item will be rendered as a span text.</li>
+	 * <li>visible: boolean, optional, whether this menu item is visible. Defaults to true.
+	 * This can be used to control the visibility of menu items based on user permissions.</li>
+	 * <li>items: array, optional, specifies the sub-menu items. Its format is the same as the parent items.</li>
+	 * <li>active: boolean, optional, whether this menu item is in active state (currently selected).
+	 * If a menu item is active and {@link activeClass} is not empty, its CSS class will be appended with {@link activeClass}.
+	 * If this option is not set, the menu item will be set active automatically when the current request
+	 * is triggered by {@link url}. Note that the GET parameters not specified in the 'url' option will be ignored.</li>
+	 * <li>template: string, optional, the template used to render this menu item.
+	 * When this option is set, it will override the global setting {@link itemTemplate}.
+	 * Please see {@link itemTemplate} for more details. This option has been available since version 1.1.1.</li>
+	 * <li>linkOptions: array, optional, additional HTML attributes to be rendered for the link or span tag of the menu item.</li>
+	 * <li>itemOptions: array, optional, additional HTML attributes to be rendered for the container tag of the menu item.</li>
+	 * <li>submenuOptions: array, optional, additional HTML attributes to be rendered for the container of the submenu if this menu item has one.
+	 * When this option is set, the {@link submenuHtmlOptions} property will be ignored for this particular submenu.
+	 * This option has been available since version 1.1.6.</li>
+	 * </ul>
+	 */
+	public $items = array();
+	/**
+	 * @var string the template used to render an individual menu item. In this template,
+	 * the token "{menu}" will be replaced with the corresponding menu link or text.
+	 * If this property is not set, each menu will be rendered without any decoration.
+	 * This property will be overridden by the 'template' option set in individual menu items via {@items}.
+	 * @since 1.1.1
+	 */
+	public $itemTemplate;
+	/**
+	 * @var boolean whether the labels for menu items should be HTML-encoded. Defaults to true.
+	 */
+	public $encodeLabel = true;
+	/**
+	 * @var string the CSS class to be appended to the active menu item. Defaults to 'active'.
+	 * If empty, the CSS class of menu items will not be changed.
+	 */
+	public $activeCssClass = 'active';
+	/**
+	 * @var boolean whether to automatically activate items according to whether their route setting
+	 * matches the currently requested route. Defaults to true.
+	 * @since 1.1.3
+	 */
+	public $activateItems = true;
+	/**
+	 * @var boolean whether to activate parent menu items when one of the corresponding child menu items is active.
+	 * The activated parent menu items will also have its CSS classes appended with {@link activeCssClass}.
+	 * Defaults to false.
+	 */
+	public $activateParents = false;
+	/**
+	 * @var boolean whether to hide empty menu items. An empty menu item is one whose 'url' option is not
+	 * set and which doesn't contain visible child menu items. Defaults to true.
+	 */
+	public $hideEmptyItems = true;
+	/**
+	 * @var array HTML attributes for the menu's root container tag
+	 */
+	public $options = array();
+	/**
+	 * @var array HTML attributes for the submenu's container tag.
+	 */
+	public $submenuHtmlOptions = array();
+	/**
+	 * @var string the HTML element name that will be used to wrap the label of all menu links.
+	 * For example, if this property is set as 'span', a menu item may be rendered as
+	 * &lt;li&gt;&lt;a href="url"&gt;&lt;span&gt;label&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+	 * This is useful when implementing menu items using the sliding window technique.
+	 * Defaults to null, meaning no wrapper tag will be generated.
+	 * @since 1.1.4
+	 */
+	public $linkLabelWrapper;
+	/**
+	 * @var array HTML attributes for the links' wrap element specified in
+	 * {@link linkLabelWrapper}.
+	 * @since 1.1.13
+	 */
+	public $linkLabelWrapperHtmlOptions = array();
+	/**
+	 * @var string the CSS class that will be assigned to the first item in the main menu or each submenu.
+	 * Defaults to null, meaning no such CSS class will be assigned.
+	 * @since 1.1.4
+	 */
+	public $firstItemCssClass;
+	/**
+	 * @var string the CSS class that will be assigned to the last item in the main menu or each submenu.
+	 * Defaults to null, meaning no such CSS class will be assigned.
+	 * @since 1.1.4
+	 */
+	public $lastItemCssClass;
+	/**
+	 * @var string the CSS class that will be assigned to every item.
+	 * Defaults to null, meaning no such CSS class will be assigned.
+	 * @since 1.1.9
+	 */
+	public $itemCssClass;
+
+	/**
+	 * Initializes the menu widget.
+	 * This method mainly normalizes the {@link items} property.
+	 * If this method is overridden, make sure the parent implementation is invoked.
+	 */
+	public function init()
+	{
+		$route = $this->getController()->getRoute();
+		$this->items = $this->normalizeItems($this->items, $route, $hasActiveChild);
+	}
+
+	/**
+	 * Calls {@link renderMenu} to render the menu.
+	 */
+	public function run()
+	{
+		if (count($this->items)) {
+			echo Html::beginTag('ul', $this->options) . "\n";
+			$this->renderItems($this->items);
+			echo Html::endTag('ul');
+		}
+	}
+
+	/**
+	 * Recursively renders the menu items.
+	 * @param array $items the menu items to be rendered recursively
+	 */
+	protected function renderItems($items)
+	{
+		$count = 0;
+		$n = count($items);
+		foreach ($items as $item) {
+			$count++;
+			$options = isset($item['itemOptions']) ? $item['itemOptions'] : array();
+			$class = array();
+			if ($item['active'] && $this->activeCssClass != '') {
+				$class[] = $this->activeCssClass;
+			}
+			if ($count === 1 && $this->firstItemCssClass !== null) {
+				$class[] = $this->firstItemCssClass;
+			}
+			if ($count === $n && $this->lastItemCssClass !== null) {
+				$class[] = $this->lastItemCssClass;
+			}
+			if ($this->itemCssClass !== null) {
+				$class[] = $this->itemCssClass;
+			}
+			if ($class !== array()) {
+				if (empty($options['class'])) {
+					$options['class'] = implode(' ', $class);
+				} else {
+					$options['class'] .= ' ' . implode(' ', $class);
+				}
+			}
+
+			echo Html::beginTag('li', $options);
+
+			$menu = $this->renderItem($item);
+			if (isset($this->itemTemplate) || isset($item['template'])) {
+				$template = isset($item['template']) ? $item['template'] : $this->itemTemplate;
+				echo strtr($template, array('{menu}' => $menu));
+			} else {
+				echo $menu;
+			}
+
+			if (isset($item['items']) && count($item['items'])) {
+				echo "\n" . Html::beginTag('ul', isset($item['submenuOptions']) ? $item['submenuOptions'] : $this->submenuHtmlOptions) . "\n";
+				$this->renderItems($item['items']);
+				echo Html::endTag('ul') . "\n";
+			}
+
+			echo Html::endTag('li') . "\n";
+		}
+	}
+
+	/**
+	 * Renders the content of a menu item.
+	 * Note that the container and the sub-menus are not rendered here.
+	 * @param array $item the menu item to be rendered. Please see {@link items} on what data might be in the item.
+	 * @return string
+	 * @since 1.1.6
+	 */
+	protected function renderItem($item)
+	{
+		if (isset($item['url'])) {
+			$label = $this->linkLabelWrapper === null ? $item['label'] : Html::tag($this->linkLabelWrapper, $this->linkLabelWrapperHtmlOptions, $item['label']);
+			return Html::a($label, $item['url'], isset($item['linkOptions']) ? $item['linkOptions'] : array());
+		} else {
+			return Html::tag('span', isset($item['linkOptions']) ? $item['linkOptions'] : array(), $item['label']);
+		}
+	}
+
+	/**
+	 * Normalizes the {@link items} property so that the 'active' state is properly identified for every menu item.
+	 * @param array $items the items to be normalized.
+	 * @param string $route the route of the current request.
+	 * @param boolean $active whether there is an active child menu item.
+	 * @return array the normalized menu items
+	 */
+	protected function normalizeItems($items, $route, &$active)
+	{
+		foreach ($items as $i => $item) {
+			if (isset($item['visible']) && !$item['visible']) {
+				unset($items[$i]);
+				continue;
+			}
+			if (!isset($item['label'])) {
+				$item['label'] = '';
+			}
+			if ($this->encodeLabel) {
+				$items[$i]['label'] = Html::encode($item['label']);
+			}
+			$hasActiveChild = false;
+			if (isset($item['items'])) {
+				$items[$i]['items'] = $this->normalizeItems($item['items'], $route, $hasActiveChild);
+				if (empty($items[$i]['items']) && $this->hideEmptyItems) {
+					unset($items[$i]['items']);
+					if (!isset($item['url'])) {
+						unset($items[$i]);
+						continue;
+					}
+				}
+			}
+			if (!isset($item['active'])) {
+				if ($this->activateParents && $hasActiveChild || $this->activateItems && $this->isItemActive($item, $route)) {
+					$active = $items[$i]['active'] = true;
+				} else {
+					$items[$i]['active'] = false;
+				}
+			} elseif ($item['active']) {
+				$active = true;
+			}
+		}
+		return array_values($items);
+	}
+
+	/**
+	 * Checks whether a menu item is active.
+	 * This is done by checking if the currently requested URL is generated by the 'url' option
+	 * of the menu item. Note that the GET parameters not specified in the 'url' option will be ignored.
+	 * @param array $item the menu item to be checked
+	 * @param string $route the route of the current request
+	 * @return boolean whether the menu item is active
+	 */
+	protected function isItemActive($item, $route)
+	{
+		if (isset($item['url']) && is_array($item['url']) && !strcasecmp(trim($item['url'][0], '/'), $route)) {
+			unset($item['url']['#']);
+			if (count($item['url']) > 1) {
+				foreach (array_splice($item['url'], 1) as $name => $value) {
+					if (!isset($_GET[$name]) || $_GET[$name] != $value) {
+						return false;
+					}
+				}
+			}
+			return true;
+		}
+		return false;
+	}
+
+}

From 3d40b171e077e051db6e277afe5634d149095716 Mon Sep 17 00:00:00 2001
From: slavcopost <slavcopost@gmail.com>
Date: Mon, 6 May 2013 23:27:11 +0300
Subject: [PATCH 055/152] Fix attaching behavior via config

---
 framework/base/Component.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/framework/base/Component.php b/framework/base/Component.php
index 582cf03..e2520d1 100644
--- a/framework/base/Component.php
+++ b/framework/base/Component.php
@@ -8,6 +8,7 @@
 namespace yii\base;
 
 use Yii;
+use yii\helpers\base\VarDumper;
 
 /**
  * @include @yii/base/Component.md
@@ -90,6 +91,7 @@ class Component extends Object
 			// as behavior: attach behavior
 			$name = trim(substr($name, 3));
 			$this->attachBehavior($name, $value instanceof Behavior ? $value : Yii::createObject($value));
+			return;
 		} else {
 			// behavior property
 			$this->ensureBehaviors();

From 1415c12c5a90f553f55a31d8a07b58c7e2adfa2c Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Mon, 6 May 2013 16:34:20 -0400
Subject: [PATCH 056/152] Changed default value of View::renderers.

---
 framework/base/View.php | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/framework/base/View.php b/framework/base/View.php
index 4718d90..af1f0d5 100644
--- a/framework/base/View.php
+++ b/framework/base/View.php
@@ -72,23 +72,21 @@ class View extends Component
 	/**
 	 * @var array a list of available renderers indexed by their corresponding supported file extensions.
 	 * Each renderer may be a view renderer object or the configuration for creating the renderer object.
-	 * For example,
-	 *
-	 * ~~~
-	 * array(
-	 *     'tpl' => array(
-	 *         'class' => 'yii\renderers\SmartyRenderer',
-	 *     ),
-	 *     'twig' => array(
-	 *         'class' => 'yii\renderers\TwigRenderer',
-	 *     ),
-	 * )
-	 * ~~~
+	 * The default setting supports both Smarty and Twig (their corresponding file extension is "tpl"
+	 * and "twig" respectively. Please refer to [[SmartyRenderer]] and [[TwigRenderer]] on how to install
+	 * the needed libraries for these template engines.
 	 *
 	 * If no renderer is available for the given view file, the view file will be treated as a normal PHP
 	 * and rendered via [[renderPhpFile()]].
 	 */
-	public $renderers = array();
+	public $renderers = array(
+		'tpl' => array(
+			'class' => 'yii\renderers\SmartyRenderer',
+		),
+		'twig' => array(
+			'class' => 'yii\renderers\TwigRenderer',
+		),
+	);
 	/**
 	 * @var Theme|array the theme object or the configuration array for creating the theme object.
 	 * If not set, it means theming is not enabled.

From a94c43231165e101e2c7273a8d4e459bbf737675 Mon Sep 17 00:00:00 2001
From: slavcopost <slavcopost@gmail.com>
Date: Mon, 6 May 2013 23:40:32 +0300
Subject: [PATCH 057/152] Fix attaching behavior via config

---
 framework/base/Component.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/framework/base/Component.php b/framework/base/Component.php
index e2520d1..8e75835 100644
--- a/framework/base/Component.php
+++ b/framework/base/Component.php
@@ -8,7 +8,6 @@
 namespace yii\base;
 
 use Yii;
-use yii\helpers\base\VarDumper;
 
 /**
  * @include @yii/base/Component.md

From 36d452ae167f0aa1a798e4049ad8cc216ca79f19 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Mon, 6 May 2013 19:20:20 -0400
Subject: [PATCH 058/152] Finished the initial draft of upgrading instructions

---
 docs/guide/upgrade-from-v1.md | 309 ++++++++++++++++++++++++++++++++++++++++--
 readme.md                     |  13 +-
 2 files changed, 308 insertions(+), 14 deletions(-)

diff --git a/docs/guide/upgrade-from-v1.md b/docs/guide/upgrade-from-v1.md
index af3c9ca..1aab3d1 100644
--- a/docs/guide/upgrade-from-v1.md
+++ b/docs/guide/upgrade-from-v1.md
@@ -22,30 +22,36 @@ data structures.
 Object Configuration
 --------------------
 
-The `Object` class introduces a convention for configuring objects. In general, any
-descendant class of `Object` should follow this convention when declaring a constructor:
+The `Object` class introduces a uniform way of configuring objects. Any descendant class
+of `Object` should declare its constructor (if needed) in the following way so that
+it can be properly configured:
 
 ~~~
 class MyClass extends \yii\Object
 {
     public function __construct($param1, $param2, $config = array())
     {
-        // ...
+        // ... initialization before configuration is applied
+
         parent::__construct($config);
     }
 
     public function init()
     {
         parent::init();
-        // ... at this point, all configurations have been applied ...
+
+        // ... initialization after configuration is applied
     }
 }
 ~~~
 
-In descendant classes, you can override the `init()` method to do initialization work
-that should be done after all configurations are applied.
+In the above, the last parameter of the constructor must take a configuration array
+which contains name-value pairs for initializing the properties at the end of the constructor.
+You can override the `init()` method to do initialization work that should be done after
+the configuration is applied.
 
-By following this convention, you will be able to use the powerful object creation method via:
+By following this convention, you will be able to create and configure a new object
+using a configuration array like the following:
 
 ~~~
 $object = Yii::createObject(array(
@@ -87,6 +93,23 @@ Yii::$app->trigger($eventName);
 ~~~
 
 
+Path Alias
+----------
+
+Yii 2.0 expands the usage of path aliases to both file/directory paths and URLs. An alias
+must start with a `@` character so that it can be differentiated from file/directory paths and URLs.
+For example, the alias `@yii` refers to the Yii installation directory. Path aliases are
+supported in most places in the Yii core code. For example, `FileCache::cachePath` can take
+both a path alias and a normal directory path.
+
+Path alias is also closely related with class namespaces. It is recommended that a path
+alias defined for each root namespace so that you can use Yii class autoloader without
+any further configuration. For example, because `@yii` refers to the Yii installation directory,
+a class like `yii\web\Request` can be autoloaded by Yii. If you use a third party library
+such as Zend Framework, you may define a path alias `@Zend` which refers to its installation directory.
+And Yii will be able to autoload any class in this library.
+
+
 View
 ----
 
@@ -111,53 +134,313 @@ $content = Yii::$app->view->renderFile($viewFile, $params);
 Also, there is no more `CClientScript` in Yii 2.0. The `View` class has taken over its role
 with significant improvements. For more details, please see the "assets" subsection.
 
-TBD: built-in renderers
+While Yii 2.0 continues to use PHP as its main template language, it comes with built-in
+support for two popular template engines: Smarty and Twig. The Prado template engine is
+no longer supported. To use these template engines, simply configure the "view" application 
+component as follows,
+
+~~~
+'view' => array(
+    'renders' => array(
+        array(
+            'tpl' => array(
+                'class' => 'yii\renderers\SmartyRenderer',
+            ),
+            'twig' => array(
+                'class' => 'yii\renderers\TwigRenderer',
+            ),
+        )
+    ),
+)
+~~~
+
 
 Models
 ------
 
+A model is now associated with a form name returned its `formName()` method. This is
+mainly used when using HTML forms to collect user inputs for a model. Previously in 1.1,
+this is usually hardcoded as the class name of the model.
+
+
+Yii 2.0 introduces a new method called `scenarios()` to declare which attributes require
+validation under which scenario. Child classes should overwrite `scenarios()` to return
+a list of scenarios and the corresponding attributes that need to be validated when
+`validate()` is called. For example,
+
+~~~
+public function scenarios()
+{
+    return array(
+        'backend' => array('email', 'role'),
+        'frontend' => array('email', '!name'),
+    );
+}
+~~~
+
+This method also determines which attributes are safe and which are not. In particular,
+given a scenario, if an attribute appears in the corresponding attribute list in `scenarios()`
+and the name is not prefixed with `!`, it is considered *safe*.
+
+Because of the above change, Yii 2.0 no longer has "safe" and "unsafe" validators.
+
+If your model only has one scenario (very common), you do not have to overwrite `scenarios()`,
+and everything will still work like the 1.1 way.
+
+
 Controllers
 -----------
 
+The `render()` and `renderPartial()` methods now return the rendering results instead of directly
+sending them out. You have to `echo` them explicitly, e.g., `echo $this->render(...);`.
+
+A new method called `populate()` is introduced to simplify the data population from user inputs
+to a model. For example,
+
+~~~
+$post = new Post;
+if ($this->populate($_POST, $model)) {...}
+// which is equivalent to:
+if (isset($_POST['Post'])) {
+    $post->attributes = $_POST['Post'];
+}
+~~~
+
+
 Themes
 ------
 
+Theme works completely different in 2.0. It is now based on a path map to "translate" a source
+view into a themed view. For example, if the path map for a theme is
+`array('/www/views' => '/www/themes/basic')`, then the themed version for a view file
+`/www/views/site/index.php` will be `/www/themes/basic/site/index.php`.
+
+For this reason, theme can now be applied to any view file, even if a view rendered outside
+of the context of a controller or a widget.
+
+There is no more `CThemeManager`. Instead, `theme` is a configurable property of the "view"
+application component.
+
+
 Console Applications
 --------------------
 
+Console applications are now composed by controllers, too, like Web applications. In fact,
+console controllers and Web controllers share the same base controller class.
+
+Each console controller is like `CConsoleCommand` in 1.1. It consists of one or several
+actions. You use the `yiic <route>` command to execute a console command, where `<route>`
+stands for a controller route (e.g. `sitemap/index`). Additional anonymous arguments
+are passed as the parameters to the corresponding controller action method, and named arguments
+are treated as global options declared in `globalOptions()`.
+
+Yii 2.0 supports automatic generation of command help information from comment blocks.
+
+
 I18N
 ----
 
-Behaviors
----------
+Yii 2.0 removes date formatter and number formatter in favor of the PECL intl PHP module.
 
-TBD
+Message translation is still supported, but managed via the "i18n" application component.
+The component manages a set of message sources, which allows you to use different message
+sources based on message categories. For more information, see the class documentation for `I18N`.
+
+The message translation method is changed by merging the message category into the message being
+translated. For example, `Yii::t('yii|message to be translated')`.
 
-Action filters are replaced by behaviors (`ActiionFilter`).
+
+
+Action Filters
+--------------
+
+Action filters are implemented via behaviors now. You should extend from `ActionFilter` to
+define a new filter. To use a filter, you should attach the filter class to the controller
+as a behavior. For example, to use the `AccessControl` filter, you should have the following
+code in a controller:
+
+~~~
+public function behaviors()
+{
+    return array(
+        'access' => array(
+            'class' => 'yii\web\AccessControl',
+            'rules' => array(
+                array('allow' => true, 'actions' => array('admin'), 'roles' => array('@')),
+                array('allow' => false),
+            ),
+        ),
+    );
+}
+~~~
 
 
 Assets
 ------
 
+Yii 2.0 introduces a new concept called *asset bundle*. It is a bit similar to script
+packages (managed by `CClientScript`) in 1.1, but with better support.
+
+An asset bundle is a collection of asset files (e.g. JavaScript files, CSS files, image files, etc.)
+under a directory. By registering an asset bundle via `View::registerAssetBundle()`, you
+will be able to make the assets in that bundle accessible via Web, and the current page
+will automatically contain references to the JavaScript and CSS files in that bundle.
+
+
+
 Static Helpers
 --------------
 
+Yii 2.0 introduces many commonly used static helper classes, such as `Html`, `ArrayHelper`,
+`StringHelper`. These classes are designed to be easily extended. Note that static classes
+are usually hard to be extended because of the fixed class name references. But Yii 2.0
+introduces the class map (via `Yii::$classMap`) to overcome this difficulty.
+
+
 `ActiveForm`
 ------------
 
+Yii 2.0 introduces the *field* concept for building a form using `ActiveForm`. A field
+is a container consisting of a label, an input, and an error message. It is represented
+as an `ActiveField` object. Using fields, you can build a form more cleanly than before:
+
+~~~
+<?php $form = $this->beginWidget('yii\widgets\ActiveForm'); ?>
+	<?php echo $form->field($model, 'username')->textInput(); ?>
+	<?php echo $form->field($model, 'password')->passwordInput(); ?>
+	<div class="form-actions">
+		<?php echo Html::submitButton('Login'); ?>
+	</div>
+<?php $this->endWidget(); ?>
+~~~
+
 
 Query Builder
 -------------
 
+In 1.1, query building is scattered among several classes, including `CDbCommand`,
+`CDbCriteria`, and `CDbCommandBuilder`. Yii 2.0 uses `Query` to represent a DB query
+and `QueryBuilder` to generate SQL statements from query objects. For example,
+
+~~~
+$query = new \yii\db\Query;
+$query->select('id, name')
+      ->from('tbl_user')
+      ->limit(10);
+
+$command = $query->createCommand();
+$sql = $command->sql;
+$rows = $command->queryAll();
+~~~
+
+Best of all, such query building methods can be used together with `ActiveRecord`,
+as explained in the next sub-section.
+
 
 ActiveRecord
 ------------
 
+ActiveRecord has undergone significant changes in Yii 2.0. The most important one
+is about relational ActiveRecord query. In 1.1, you have to declare the relations
+in the `relations()` method. In 2.0, this is done via getter methods that return
+an `ActiveQuery` object. For example, the following method declares an "orders" relation:
+
+~~~
+class Customer extends \yii\db\ActiveRecord
+{
+	public function getOrders()
+	{
+		return $this->hasMany('Order', array('customer_id' => 'id'));
+	}
+}
+~~~
+
+You can use `$customer->orders` to access the customer's orders. You can also
+use `$customer->getOrders()->andWhere('status=1')->all()` to perform on-the-fly
+relational query with customized query conditions.
+
+When loading relational records in an eager way, Yii 2.0 does it differently from 1.1.
+In particular, in 1.1 a JOIN query would be used to bring both the primary and the relational
+records; while in 2.0, two SQL statements are executed without using JOIN: the first
+statement brings back the primary records and the second brings back the relational records
+by filtering with the primary keys of the primary records.
+
+
+Yii 2.0 no longer uses the `model()` method when performing queries. Instead, you
+use the `find()` method like the following:
+
+~~~
+// to retrieve all *active* customers and order them by their ID:
+$customers = Customer::find()
+	->where(array('status' => $active))
+	->orderBy('id')
+	->all();
+// return the customer whose PK is 1
+$customer = Customer::find(1);
+~~~
+
+The `find()` method returns an instance of `ActiveQuery` which is a subclass of `Query`.
+Therefore, you can use all query methods of `Query`.
+
+Instead of returning ActiveRecord objects, you may call `ActiveQuery::asArray()` to
+return results in terms of arrays. This is more efficient and is especially useful
+when you need to return large number of records. For example,
+
+~~~
+$customers = Customer::find()->asArray()->all();
+~~~
+
+
+Auto-quoting Table and Column Names
+------------------------------------
+
+Yii 2.0 supports automatic quoting of database table and column names. A name enclosed
+within double curly brackets is treated as a table name, and a name enclosed within
+double square brackets is treated as a column name. They will be quoted according to
+the database driver being used. For example,
+
+~~~
+$command = $connection->createCommand('SELECT [[id]] FROM {{posts}}');
+echo $command->sql;  // MySQL: SELECT `id` FROM `posts`
+~~~
+
+This feature is especially useful if you are developing an application that supports
+different DBMS.
+
+
 User and Identity
 -----------------
 
+The `CWebUser` class in 1.1 is now replaced by `\yii\Web\User`, and there is no more
+`CUserIdentity` class. Instead, you should implement the `Identity` interface which
+is much more straightforward to implement. The bootstrap application provides such an example.
+
+
 URL Management
 --------------
 
+URL management is similar to 1.1. A major enhancement is that it now supports optional
+parameters. For example, if you have rule declared as follows, then it will match
+both `post/popular` and `post/1/popular`. In 1.1, you would have to use two rules to achieve
+the same goal.
+
+~~~
+array(
+	'pattern' => 'post/<page:\d+>/<tag>',
+	'route' => 'post/index',
+	'defaults' => array('page' => 1),
+)
+~~~
+
+
 Response
---------
\ No newline at end of file
+--------
+
+Extensions
+----------
+
+Integration with Composer
+-------------------------
+
+TBD
+
diff --git a/readme.md b/readme.md
index f395e95..178acd4 100644
--- a/readme.md
+++ b/readme.md
@@ -27,10 +27,21 @@ REQUIREMENTS
 The minimum requirement by Yii is that your Web server supports PHP 5.3.?.
 
 
+DOCUMENTATION
+-------------
+
+For 1.1 users, you may refer to [Upgrading from Yii 1.1](docs/guide/upgrade-from-v1.md)
+to have a general idea of what has changed in 2.0.
+
+We are writing more documentation to get you started and learn more in depth.
+
+
 HOW TO PARTICIPATE
 ------------------
 
-You are welcome to participate in Yii 2 development in the following ways:
+**Your participation to Yii 2 development is very welcome!**
+
+You may participate in the following ways:
 
 * [Report issues](https://github.com/yiisoft/yii2/issues)
 * [Give us feedback or start a design discussion](http://www.yiiframework.com/forum/index.php/forum/42-design-discussions-for-yii-20/)

From 881a85d463a4593d510aa2f907b01ce4ac167e31 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Mon, 6 May 2013 20:24:22 -0300
Subject: [PATCH 059/152] Fixed doc about renderers.

---
 docs/guide/upgrade-from-v1.md | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/docs/guide/upgrade-from-v1.md b/docs/guide/upgrade-from-v1.md
index 1aab3d1..5da5254 100644
--- a/docs/guide/upgrade-from-v1.md
+++ b/docs/guide/upgrade-from-v1.md
@@ -136,23 +136,9 @@ with significant improvements. For more details, please see the "assets" subsect
 
 While Yii 2.0 continues to use PHP as its main template language, it comes with built-in
 support for two popular template engines: Smarty and Twig. The Prado template engine is
-no longer supported. To use these template engines, simply configure the "view" application 
-component as follows,
-
-~~~
-'view' => array(
-    'renders' => array(
-        array(
-            'tpl' => array(
-                'class' => 'yii\renderers\SmartyRenderer',
-            ),
-            'twig' => array(
-                'class' => 'yii\renderers\TwigRenderer',
-            ),
-        )
-    ),
-)
-~~~
+no longer supported. To use these template engines, you just need to use `tpl` as the file
+extension for your Smarty views, or `twig` for Twig views. You may also configure the 
+`View::renderers` property to use other template engines.
 
 
 Models

From 647a80278277ba3bf3cc0f4dc19cdc44f88d8ae2 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Mon, 6 May 2013 20:33:03 -0300
Subject: [PATCH 060/152] Added dirty attribute description.

---
 docs/guide/upgrade-from-v1.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/guide/upgrade-from-v1.md b/docs/guide/upgrade-from-v1.md
index 5da5254..3b24201 100644
--- a/docs/guide/upgrade-from-v1.md
+++ b/docs/guide/upgrade-from-v1.md
@@ -377,6 +377,11 @@ $customers = Customer::find()->asArray()->all();
 ~~~
 
 
+By default, ActiveRecord now only saves dirty attributes. In 1.1, all attributes
+would be saved to database when you call `save()`, regardless they are changed or not,
+unless you explicitly list the attributes to save.
+
+
 Auto-quoting Table and Column Names
 ------------------------------------
 

From ce1e725a6bba4ceb0795bac3ecc8c35052e4146c Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Mon, 6 May 2013 21:20:26 -0300
Subject: [PATCH 061/152] Added namespace section.

---
 docs/guide/upgrade-from-v1.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/guide/upgrade-from-v1.md b/docs/guide/upgrade-from-v1.md
index 3b24201..b9365e5 100644
--- a/docs/guide/upgrade-from-v1.md
+++ b/docs/guide/upgrade-from-v1.md
@@ -6,6 +6,17 @@ We hope this list will make it easier for you to upgrade from Yii 1.1 and quickl
 master Yii 2.0 based on your existing Yii knowledge.
 
 
+Namespace
+---------
+
+The most obvious change in Yii 2.0 is the use of namespaces. Almost every core class
+is namespaced, e.g., `yii\web\Request`. The "C" prefix is no longer used in class names.
+The naming of the namespaces follows the directory structure. For example, `yii\web\Request`
+indicates the corresponding class file is `web/Request.php` under the Yii framework folder.
+You can use any core class without explicitly include that class file, thanks to the Yii
+class loader.
+
+
 Component and Object
 --------------------
 

From 50aa72467fe19e0b44b15f26427721fe0326a367 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Mon, 6 May 2013 20:24:19 -0400
Subject: [PATCH 062/152] Renamed YiiBase to \yii\YiiBase.

---
 framework/YiiBase.php | 4 +++-
 framework/yii.php     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/framework/YiiBase.php b/framework/YiiBase.php
index ed975c9..c911f78 100644
--- a/framework/YiiBase.php
+++ b/framework/YiiBase.php
@@ -4,6 +4,8 @@
  * @copyright Copyright (c) 2008 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */
+namespace yii;
+
 use yii\base\Exception;
 use yii\base\InvalidConfigException;
 use yii\base\InvalidParamException;
@@ -60,7 +62,7 @@ class YiiBase
 	 */
 	public static $enableIncludePath = true;
 	/**
-	 * @var yii\console\Application|yii\web\Application the application instance
+	 * @var \yii\console\Application|\yii\web\Application the application instance
 	 */
 	public static $app;
 	/**
diff --git a/framework/yii.php b/framework/yii.php
index 828dc4f..109e2fd 100644
--- a/framework/yii.php
+++ b/framework/yii.php
@@ -18,7 +18,7 @@ require(__DIR__ . '/YiiBase.php');
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class Yii extends YiiBase
+class Yii extends \yii\YiiBase
 {
 }
 

From 6b9a0531b829598fce010b622638112c2e2d3e3b Mon Sep 17 00:00:00 2001
From: Luciano Baraglia <luciano.baraglia@gmail.com>
Date: Tue, 7 May 2013 02:01:00 -0300
Subject: [PATCH 063/152] Controllers section example fix

---
 docs/guide/upgrade-from-v1.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/upgrade-from-v1.md b/docs/guide/upgrade-from-v1.md
index b9365e5..ff9e5cf 100644
--- a/docs/guide/upgrade-from-v1.md
+++ b/docs/guide/upgrade-from-v1.md
@@ -195,7 +195,7 @@ A new method called `populate()` is introduced to simplify the data population f
 to a model. For example,
 
 ~~~
-$post = new Post;
+$model = new Post;
 if ($this->populate($_POST, $model)) {...}
 // which is equivalent to:
 if (isset($_POST['Post'])) {

From 9844c2e526e99e6953c9cd5be3d814bbfd6a8649 Mon Sep 17 00:00:00 2001
From: br0sk <john.eskilsson@gmail.com>
Date: Tue, 7 May 2013 08:41:33 +0200
Subject: [PATCH 064/152] Fixed typo

---
 docs/guide/upgrade-from-v1.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/upgrade-from-v1.md b/docs/guide/upgrade-from-v1.md
index b9365e5..1e044cd 100644
--- a/docs/guide/upgrade-from-v1.md
+++ b/docs/guide/upgrade-from-v1.md
@@ -26,7 +26,7 @@ via getters and setters. The `Component` class extends from `Object` and support
 the event feature and the behavior feature.
 
 If your class does not need the event or behavior feature, you should consider using
-`Object` as the based class. This is usually the case for classes that represent basic
+`Object` as the base class. This is usually the case for classes that represent basic
 data structures.
 
 

From 9a1221e7c45b60a1adba73386d488d8acb06d0ea Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 7 May 2013 12:25:00 +0400
Subject: [PATCH 065/152] Wrapped code with github-style blocks with PHP
 highlighting

---
 docs/guide/upgrade-from-v1.md | 53 ++++++++++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/docs/guide/upgrade-from-v1.md b/docs/guide/upgrade-from-v1.md
index d065a4d..a82be57 100644
--- a/docs/guide/upgrade-from-v1.md
+++ b/docs/guide/upgrade-from-v1.md
@@ -37,7 +37,7 @@ The `Object` class introduces a uniform way of configuring objects. Any descenda
 of `Object` should declare its constructor (if needed) in the following way so that
 it can be properly configured:
 
-~~~
+```php
 class MyClass extends \yii\Object
 {
     public function __construct($param1, $param2, $config = array())
@@ -54,8 +54,8 @@ class MyClass extends \yii\Object
         // ... initialization after configuration is applied
     }
 }
+```
 ~~~
-
 In the above, the last parameter of the constructor must take a configuration array
 which contains name-value pairs for initializing the properties at the end of the constructor.
 You can override the `init()` method to do initialization work that should be done after
@@ -64,12 +64,13 @@ the configuration is applied.
 By following this convention, you will be able to create and configure a new object
 using a configuration array like the following:
 
-~~~
+```php
 $object = Yii::createObject(array(
     'class' => 'MyClass',
     'property1' => 'abc',
     'property2' => 'cde',
 ), $param1, $param2);
+```
 ~~~
 
 
@@ -80,28 +81,30 @@ There is no longer the need to define an `on`-method in order to define an event
 Instead, you can use whatever event names. To attach a handler to an event, you should
 use the `on` method now:
 
-~~~
+```php
 $component->on($eventName, $handler);
 // To detach the handler, use:
 // $component->off($eventName, $handler);
+```
 ~~~
 
 When you attach a handler, you can now associate it with some parameters which can be later
 accessed via the event parameter by the handler:
 
-~~~
+```php
 $component->on($eventName, $handler, $params);
+```
 ~~~
 
 Because of this change, you can now use "global" events. Simply trigger and attach handlers to
 an event of the application instance:
 
-~~~
+```php
 Yii::$app->on($eventName, $handler);
 ....
 // this will trigger the event and cause $handler to be invoked.
 Yii::$app->trigger($eventName);
-~~~
+```
 
 
 Path Alias
@@ -135,11 +138,12 @@ Because you can access the view object through the "view" application component,
 you can now render a view file like the following anywhere in your code, not necessarily
 in controllers or widgets:
 
-~~~
+```php
 $content = Yii::$app->view->renderFile($viewFile, $params);
 // You can also explicitly create a new View instance to do the rendering
 // $view = new View;
 // $view->renderFile($viewFile, $params);
+```
 ~~~
 
 Also, there is no more `CClientScript` in Yii 2.0. The `View` class has taken over its role
@@ -165,7 +169,7 @@ validation under which scenario. Child classes should overwrite `scenarios()` to
 a list of scenarios and the corresponding attributes that need to be validated when
 `validate()` is called. For example,
 
-~~~
+```php
 public function scenarios()
 {
     return array(
@@ -173,6 +177,7 @@ public function scenarios()
         'frontend' => array('email', '!name'),
     );
 }
+```
 ~~~
 
 This method also determines which attributes are safe and which are not. In particular,
@@ -194,13 +199,14 @@ sending them out. You have to `echo` them explicitly, e.g., `echo $this->render(
 A new method called `populate()` is introduced to simplify the data population from user inputs
 to a model. For example,
 
-~~~
+```php
 $model = new Post;
 if ($this->populate($_POST, $model)) {...}
 // which is equivalent to:
 if (isset($_POST['Post'])) {
     $post->attributes = $_POST['Post'];
 }
+```
 ~~~
 
 
@@ -256,7 +262,7 @@ define a new filter. To use a filter, you should attach the filter class to the
 as a behavior. For example, to use the `AccessControl` filter, you should have the following
 code in a controller:
 
-~~~
+```php
 public function behaviors()
 {
     return array(
@@ -269,6 +275,7 @@ public function behaviors()
         ),
     );
 }
+```
 ~~~
 
 
@@ -301,7 +308,7 @@ Yii 2.0 introduces the *field* concept for building a form using `ActiveForm`. A
 is a container consisting of a label, an input, and an error message. It is represented
 as an `ActiveField` object. Using fields, you can build a form more cleanly than before:
 
-~~~
+```php
 <?php $form = $this->beginWidget('yii\widgets\ActiveForm'); ?>
 	<?php echo $form->field($model, 'username')->textInput(); ?>
 	<?php echo $form->field($model, 'password')->passwordInput(); ?>
@@ -309,6 +316,7 @@ as an `ActiveField` object. Using fields, you can build a form more cleanly than
 		<?php echo Html::submitButton('Login'); ?>
 	</div>
 <?php $this->endWidget(); ?>
+```
 ~~~
 
 
@@ -319,7 +327,7 @@ In 1.1, query building is scattered among several classes, including `CDbCommand
 `CDbCriteria`, and `CDbCommandBuilder`. Yii 2.0 uses `Query` to represent a DB query
 and `QueryBuilder` to generate SQL statements from query objects. For example,
 
-~~~
+```php
 $query = new \yii\db\Query;
 $query->select('id, name')
       ->from('tbl_user')
@@ -328,6 +336,7 @@ $query->select('id, name')
 $command = $query->createCommand();
 $sql = $command->sql;
 $rows = $command->queryAll();
+```
 ~~~
 
 Best of all, such query building methods can be used together with `ActiveRecord`,
@@ -342,7 +351,7 @@ is about relational ActiveRecord query. In 1.1, you have to declare the relation
 in the `relations()` method. In 2.0, this is done via getter methods that return
 an `ActiveQuery` object. For example, the following method declares an "orders" relation:
 
-~~~
+```php
 class Customer extends \yii\db\ActiveRecord
 {
 	public function getOrders()
@@ -350,6 +359,7 @@ class Customer extends \yii\db\ActiveRecord
 		return $this->hasMany('Order', array('customer_id' => 'id'));
 	}
 }
+```
 ~~~
 
 You can use `$customer->orders` to access the customer's orders. You can also
@@ -366,7 +376,7 @@ by filtering with the primary keys of the primary records.
 Yii 2.0 no longer uses the `model()` method when performing queries. Instead, you
 use the `find()` method like the following:
 
-~~~
+```php
 // to retrieve all *active* customers and order them by their ID:
 $customers = Customer::find()
 	->where(array('status' => $active))
@@ -374,6 +384,7 @@ $customers = Customer::find()
 	->all();
 // return the customer whose PK is 1
 $customer = Customer::find(1);
+```
 ~~~
 
 The `find()` method returns an instance of `ActiveQuery` which is a subclass of `Query`.
@@ -383,10 +394,9 @@ Instead of returning ActiveRecord objects, you may call `ActiveQuery::asArray()`
 return results in terms of arrays. This is more efficient and is especially useful
 when you need to return large number of records. For example,
 
-~~~
+```php
 $customers = Customer::find()->asArray()->all();
-~~~
-
+```
 
 By default, ActiveRecord now only saves dirty attributes. In 1.1, all attributes
 would be saved to database when you call `save()`, regardless they are changed or not,
@@ -401,11 +411,11 @@ within double curly brackets is treated as a table name, and a name enclosed wit
 double square brackets is treated as a column name. They will be quoted according to
 the database driver being used. For example,
 
-~~~
+```php
 $command = $connection->createCommand('SELECT [[id]] FROM {{posts}}');
 echo $command->sql;  // MySQL: SELECT `id` FROM `posts`
+```
 ~~~
-
 This feature is especially useful if you are developing an application that supports
 different DBMS.
 
@@ -426,12 +436,13 @@ parameters. For example, if you have rule declared as follows, then it will matc
 both `post/popular` and `post/1/popular`. In 1.1, you would have to use two rules to achieve
 the same goal.
 
-~~~
+```php
 array(
 	'pattern' => 'post/<page:\d+>/<tag>',
 	'route' => 'post/index',
 	'defaults' => array('page' => 1),
 )
+```
 ~~~
 
 

From a5ab4aa22c47c60ab5fcf40429ab2a17f2149a02 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 7 May 2013 12:25:56 +0400
Subject: [PATCH 066/152] fix

---
 docs/guide/upgrade-from-v1.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/upgrade-from-v1.md b/docs/guide/upgrade-from-v1.md
index a82be57..f241630 100644
--- a/docs/guide/upgrade-from-v1.md
+++ b/docs/guide/upgrade-from-v1.md
@@ -55,7 +55,7 @@ class MyClass extends \yii\Object
     }
 }
 ```
-~~~
+
 In the above, the last parameter of the constructor must take a configuration array
 which contains name-value pairs for initializing the properties at the end of the constructor.
 You can override the `init()` method to do initialization work that should be done after

From 91e6f8220c07715a7a67d6672d73dd7fe18f2103 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 7 May 2013 12:27:07 +0400
Subject: [PATCH 067/152] fix

---
 docs/guide/upgrade-from-v1.md | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/guide/upgrade-from-v1.md b/docs/guide/upgrade-from-v1.md
index f241630..b6e5d52 100644
--- a/docs/guide/upgrade-from-v1.md
+++ b/docs/guide/upgrade-from-v1.md
@@ -71,7 +71,7 @@ $object = Yii::createObject(array(
     'property2' => 'cde',
 ), $param1, $param2);
 ```
-~~~
+
 
 
 Events
@@ -86,7 +86,7 @@ $component->on($eventName, $handler);
 // To detach the handler, use:
 // $component->off($eventName, $handler);
 ```
-~~~
+
 
 When you attach a handler, you can now associate it with some parameters which can be later
 accessed via the event parameter by the handler:
@@ -94,7 +94,7 @@ accessed via the event parameter by the handler:
 ```php
 $component->on($eventName, $handler, $params);
 ```
-~~~
+
 
 Because of this change, you can now use "global" events. Simply trigger and attach handlers to
 an event of the application instance:
@@ -144,7 +144,7 @@ $content = Yii::$app->view->renderFile($viewFile, $params);
 // $view = new View;
 // $view->renderFile($viewFile, $params);
 ```
-~~~
+
 
 Also, there is no more `CClientScript` in Yii 2.0. The `View` class has taken over its role
 with significant improvements. For more details, please see the "assets" subsection.
@@ -178,7 +178,7 @@ public function scenarios()
     );
 }
 ```
-~~~
+
 
 This method also determines which attributes are safe and which are not. In particular,
 given a scenario, if an attribute appears in the corresponding attribute list in `scenarios()`
@@ -207,7 +207,7 @@ if (isset($_POST['Post'])) {
     $post->attributes = $_POST['Post'];
 }
 ```
-~~~
+
 
 
 Themes
@@ -276,7 +276,7 @@ public function behaviors()
     );
 }
 ```
-~~~
+
 
 
 Assets
@@ -317,7 +317,7 @@ as an `ActiveField` object. Using fields, you can build a form more cleanly than
 	</div>
 <?php $this->endWidget(); ?>
 ```
-~~~
+
 
 
 Query Builder
@@ -337,7 +337,7 @@ $command = $query->createCommand();
 $sql = $command->sql;
 $rows = $command->queryAll();
 ```
-~~~
+
 
 Best of all, such query building methods can be used together with `ActiveRecord`,
 as explained in the next sub-section.
@@ -360,7 +360,7 @@ class Customer extends \yii\db\ActiveRecord
 	}
 }
 ```
-~~~
+
 
 You can use `$customer->orders` to access the customer's orders. You can also
 use `$customer->getOrders()->andWhere('status=1')->all()` to perform on-the-fly
@@ -385,7 +385,7 @@ $customers = Customer::find()
 // return the customer whose PK is 1
 $customer = Customer::find(1);
 ```
-~~~
+
 
 The `find()` method returns an instance of `ActiveQuery` which is a subclass of `Query`.
 Therefore, you can use all query methods of `Query`.
@@ -415,7 +415,7 @@ the database driver being used. For example,
 $command = $connection->createCommand('SELECT [[id]] FROM {{posts}}');
 echo $command->sql;  // MySQL: SELECT `id` FROM `posts`
 ```
-~~~
+
 This feature is especially useful if you are developing an application that supports
 different DBMS.
 
@@ -443,7 +443,7 @@ array(
 	'defaults' => array('page' => 1),
 )
 ```
-~~~
+
 
 
 Response

From 3ba55c1bb962c794cc33229892f4d38344d8a6b2 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 7 May 2013 14:19:53 +0400
Subject: [PATCH 068/152] added composer.json

---
 composer.json | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 composer.json

diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..c6c97b8
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,72 @@
+{
+	"name": "yiisoft/yii2",
+	"description": "Yii2 Web Programming Framework",
+	"keywords": ["yii", "framework"],
+	"homepage": "http://www.yiiframework.com/",
+	"type": "library",
+	"license": "BSD-3-Clause",
+	"authors": [
+		{
+			"name": "Qiang Xue",
+			"email": "qiang.xue@gmail.com",
+			"homepage": "http://www.yiiframework.com/",
+			"role": "Founder and project lead"
+		},
+		{
+			"name": "Alexander Makarov",
+			"email": "sam@rmcreative.ru",
+			"homepage": "http://rmcreative.ru/",
+			"role": "Core framework development"
+		},
+		{
+			"name": "Maurizio Domba",
+			"homepage": "http://mdomba.info/",
+			"role": "Core framework development"
+		},
+		{
+			"name": "Carsten Brandt",
+			"email": "mail@cebe.cc",
+			"homepage": "http://cebe.cc/",
+			"role": "Core framework development"
+		},
+		{
+			"name": "Timur Ruziev",
+			"email": "resurtm@gmail.com",
+			"homepage": "http://resurtm.com/",
+			"role": "Core framework development"
+		},
+		{
+			"name": "Paul Klimov",
+			"email": "klimov.paul@gmail.com",
+			"role": "Core framework development"
+		},
+		{
+			"name": "Wei Zhuo",
+			"email": "weizhuo@gmail.com",
+			"role": "Project site maintenance and development"
+		},
+		{
+			"name": "Sebastián Thierer",
+			"email": "sebas@artfos.com",
+			"role": "Component development"
+		},
+		{
+			"name": "Jeffrey Winesett",
+			"email": "jefftulsa@gmail.com",
+			"role": "Documentation and marketing"
+		}
+	],
+	"support": {
+		"issues": "https://github.com/yiisoft/yii2/issues?state=open",
+		"forum": "http://www.yiiframework.com/forum/",
+		"wiki": "http://www.yiiframework.com/wiki/",
+		"irc": "irc://irc.freenode.net/yii",
+		"source": "https://github.com/yiisoft/yii2"
+	},
+	"bin": [
+		"framework/yiic"
+	],
+	"require": {
+		"php": ">=5.3.0"
+	}
+}

From 34b0da0dc4ecfa9ac83d7deff6efad3b3b7aab12 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 7 May 2013 14:44:48 +0400
Subject: [PATCH 069/152] Added twig, smarty and php-markdown dependencies,
 vendor is gitignored now

---
 .gitignore    | 5 ++++-
 composer.json | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 89fc2a8..9291d3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,7 @@ nbproject
 .settings
 
 # windows thumbnail cache
-Thumbs.db
\ No newline at end of file
+Thumbs.db
+
+# composer vendor dir
+vendor
\ No newline at end of file
diff --git a/composer.json b/composer.json
index c6c97b8..6a5c383 100644
--- a/composer.json
+++ b/composer.json
@@ -67,6 +67,9 @@
 		"framework/yiic"
 	],
 	"require": {
-		"php": ">=5.3.0"
+		"php": ">=5.3.0",
+		"michelf/php-markdown": "1.3",
+		"twig/twig": "1.12.*",
+		"smarty/smarty": "3.1.*"
 	}
 }

From 8c18feb1b54ac2370a703c63f8c2335234d6d1d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anderson=20M=C3=BCller?= <anderson.a.muller@gmail.com>
Date: Tue, 7 May 2013 14:11:52 +0300
Subject: [PATCH 070/152] Fixes the variable name

---
 docs/guide/upgrade-from-v1.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/upgrade-from-v1.md b/docs/guide/upgrade-from-v1.md
index b6e5d52..d35e6e0 100644
--- a/docs/guide/upgrade-from-v1.md
+++ b/docs/guide/upgrade-from-v1.md
@@ -204,7 +204,7 @@ $model = new Post;
 if ($this->populate($_POST, $model)) {...}
 // which is equivalent to:
 if (isset($_POST['Post'])) {
-    $post->attributes = $_POST['Post'];
+    $model->attributes = $_POST['Post'];
 }
 ```
 

From f3c17594c63b009f6568fc9126a0fc36c5a8c80b Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Tue, 7 May 2013 07:18:39 -0400
Subject: [PATCH 071/152] Fixes issue #155.

---
 framework/db/ActiveRecord.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/framework/db/ActiveRecord.php b/framework/db/ActiveRecord.php
index 45c53fb..709d139 100644
--- a/framework/db/ActiveRecord.php
+++ b/framework/db/ActiveRecord.php
@@ -8,6 +8,7 @@
 
 namespace yii\db;
 
+use yii\base\InvalidConfigException;
 use yii\base\Model;
 use yii\base\InvalidParamException;
 use yii\base\ModelEvent;
@@ -112,6 +113,7 @@ class ActiveRecord extends Model
 	 * @return ActiveQuery|ActiveRecord|null When `$q` is null, a new [[ActiveQuery]] instance
 	 * is returned; when `$q` is a scalar or an array, an ActiveRecord object matching it will be
 	 * returned (null will be returned if there is no matching).
+	 * @throws InvalidConfigException if the AR class does not have a primary key
 	 * @see createQuery()
 	 */
 	public static function find($q = null)
@@ -122,7 +124,11 @@ class ActiveRecord extends Model
 		} elseif ($q !== null) {
 			// query by primary key
 			$primaryKey = static::primaryKey();
-			return $query->where(array($primaryKey[0] => $q))->one();
+			if (isset($primaryKey[0])) {
+				return $query->where(array($primaryKey[0] => $q))->one();
+			} else {
+				throw new InvalidConfigException(get_called_class() . ' must have a primary key.');
+			}
 		}
 		return $query;
 	}

From dd5969147dd1ec392d3edba4fb03b0c55af8ede1 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Tue, 7 May 2013 07:39:24 -0400
Subject: [PATCH 072/152] move JsExpression to web.

---
 framework/helpers/JsExpression.php                 | 45 ----------------------
 framework/helpers/base/Json.php                    |  2 +-
 framework/validators/EmailValidator.php            |  2 +-
 framework/validators/NumberValidator.php           |  2 +-
 .../validators/RegularExpressionValidator.php      |  2 +-
 framework/validators/UrlValidator.php              |  2 +-
 framework/web/JsExpression.php                     | 45 ++++++++++++++++++++++
 framework/widgets/ActiveField.php                  |  2 +-
 tests/unit/framework/helpers/JsonTest.php          |  2 +-
 9 files changed, 52 insertions(+), 52 deletions(-)
 delete mode 100644 framework/helpers/JsExpression.php
 create mode 100644 framework/web/JsExpression.php

diff --git a/framework/helpers/JsExpression.php b/framework/helpers/JsExpression.php
deleted file mode 100644
index 5a1f9bd..0000000
--- a/framework/helpers/JsExpression.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\helpers;
-
-use yii\base\Object;
-
-/**
- * JsExpression marks a string as a JavaScript expression.
- * When using [[Json::encode()]] to encode a value, JsonExpression objects
- * will be specially handled and encoded as a JavaScript expression instead of a string.
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class JsExpression extends Object
-{
-	/**
-	 * @var string the JavaScript expression represented by this object
-	 */
-	public $expression;
-
-	/**
-	 * Constructor.
-	 * @param string $expression the JavaScript expression represented by this object
-	 * @param array $config additional configurations for this object
-	 */
-	public function __construct($expression, $config = array())
-	{
-		$this->expression = $expression;
-		parent::__construct($config);
-	}
-
-	/**
-	 * The PHP magic function converting an object into a string.
-	 * @return string the JavaScript expression.
-	 */
-	public function __toString()
-	{
-		return $this->expression;
-	}
-}
diff --git a/framework/helpers/base/Json.php b/framework/helpers/base/Json.php
index c92e208..262dd81 100644
--- a/framework/helpers/base/Json.php
+++ b/framework/helpers/base/Json.php
@@ -8,7 +8,7 @@
 namespace yii\helpers\base;
 
 use yii\base\InvalidParamException;
-use yii\helpers\JsExpression;
+use yii\web\JsExpression;
 
 /**
  * Json is a helper class providing JSON data encoding and decoding.
diff --git a/framework/validators/EmailValidator.php b/framework/validators/EmailValidator.php
index ad74dd6..949b3f9 100644
--- a/framework/validators/EmailValidator.php
+++ b/framework/validators/EmailValidator.php
@@ -9,7 +9,7 @@ namespace yii\validators;
 
 use Yii;
 use yii\helpers\Html;
-use yii\helpers\JsExpression;
+use yii\web\JsExpression;
 use yii\helpers\Json;
 
 /**
diff --git a/framework/validators/NumberValidator.php b/framework/validators/NumberValidator.php
index c0f81cd..10f0e52 100644
--- a/framework/validators/NumberValidator.php
+++ b/framework/validators/NumberValidator.php
@@ -9,7 +9,7 @@ namespace yii\validators;
 
 use Yii;
 use yii\helpers\Html;
-use yii\helpers\JsExpression;
+use yii\web\JsExpression;
 use yii\helpers\Json;
 
 /**
diff --git a/framework/validators/RegularExpressionValidator.php b/framework/validators/RegularExpressionValidator.php
index 79a1a3c..23419b9 100644
--- a/framework/validators/RegularExpressionValidator.php
+++ b/framework/validators/RegularExpressionValidator.php
@@ -10,7 +10,7 @@ namespace yii\validators;
 use Yii;
 use yii\base\InvalidConfigException;
 use yii\helpers\Html;
-use yii\helpers\JsExpression;
+use yii\web\JsExpression;
 use yii\helpers\Json;
 
 /**
diff --git a/framework/validators/UrlValidator.php b/framework/validators/UrlValidator.php
index 0ed59bd..c418353 100644
--- a/framework/validators/UrlValidator.php
+++ b/framework/validators/UrlValidator.php
@@ -9,7 +9,7 @@ namespace yii\validators;
 
 use Yii;
 use yii\helpers\Html;
-use yii\helpers\JsExpression;
+use yii\web\JsExpression;
 use yii\helpers\Json;
 
 /**
diff --git a/framework/web/JsExpression.php b/framework/web/JsExpression.php
new file mode 100644
index 0000000..027c065
--- /dev/null
+++ b/framework/web/JsExpression.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use yii\base\Object;
+
+/**
+ * JsExpression marks a string as a JavaScript expression.
+ * When using [[Json::encode()]] to encode a value, JsonExpression objects
+ * will be specially handled and encoded as a JavaScript expression instead of a string.
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class JsExpression extends Object
+{
+	/**
+	 * @var string the JavaScript expression represented by this object
+	 */
+	public $expression;
+
+	/**
+	 * Constructor.
+	 * @param string $expression the JavaScript expression represented by this object
+	 * @param array $config additional configurations for this object
+	 */
+	public function __construct($expression, $config = array())
+	{
+		$this->expression = $expression;
+		parent::__construct($config);
+	}
+
+	/**
+	 * The PHP magic function converting an object into a string.
+	 * @return string the JavaScript expression.
+	 */
+	public function __toString()
+	{
+		return $this->expression;
+	}
+}
diff --git a/framework/widgets/ActiveField.php b/framework/widgets/ActiveField.php
index 336966f..0e0381f 100644
--- a/framework/widgets/ActiveField.php
+++ b/framework/widgets/ActiveField.php
@@ -10,7 +10,7 @@ use yii\base\Component;
 use yii\db\ActiveRecord;
 use yii\helpers\Html;
 use yii\base\Model;
-use yii\helpers\JsExpression;
+use yii\web\JsExpression;
 
 /**
  * @author Qiang Xue <qiang.xue@gmail.com>
diff --git a/tests/unit/framework/helpers/JsonTest.php b/tests/unit/framework/helpers/JsonTest.php
index 6a78cd1..1795ce6 100644
--- a/tests/unit/framework/helpers/JsonTest.php
+++ b/tests/unit/framework/helpers/JsonTest.php
@@ -4,7 +4,7 @@
 namespace yiiunit\framework\helpers;
 
 use yii\helpers\Json;
-use yii\helpers\JsExpression;
+use yii\web\JsExpression;
 
 class JsonTest extends \yii\test\TestCase
 {

From f12518f45cec142086b8058b754bdaef022eb3bf Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Tue, 7 May 2013 18:10:50 +0400
Subject: [PATCH 073/152] ActiveRecord::insert() and ActiveRecord::update()
 refactoring

---
 framework/db/ActiveRecord.php | 91 ++++++++++++++++++++-----------------------
 1 file changed, 42 insertions(+), 49 deletions(-)

diff --git a/framework/db/ActiveRecord.php b/framework/db/ActiveRecord.php
index 709d139..87d4809 100644
--- a/framework/db/ActiveRecord.php
+++ b/framework/db/ActiveRecord.php
@@ -667,36 +667,33 @@ class ActiveRecord extends Model
 	 */
 	public function insert($runValidation = true, $attributes = null)
 	{
-		if ($runValidation && !$this->validate($attributes)) {
+		if ($runValidation && !$this->validate($attributes) && !$this->beforeSave(true)) {
 			return false;
 		}
-		if ($this->beforeSave(true)) {
-			$values = $this->getDirtyAttributes($attributes);
-			if ($values === array()) {
-				foreach ($this->primaryKey() as $key) {
-					$values[$key] = isset($this->_attributes[$key]) ? $this->_attributes[$key] : null;
-				}
+		$values = $this->getDirtyAttributes($attributes);
+		if (empty($values)) {
+			foreach ($this->primaryKey() as $key) {
+				$values[$key] = isset($this->_attributes[$key]) ? $this->_attributes[$key] : null;
 			}
-			$db = static::getDb();
-			$command = $db->createCommand()->insert($this->tableName(), $values);
-			if ($command->execute()) {
-				$table = $this->getTableSchema();
-				if ($table->sequenceName !== null) {
-					foreach ($table->primaryKey as $name) {
-						if (!isset($this->_attributes[$name])) {
-							$this->_oldAttributes[$name] = $this->_attributes[$name] = $db->getLastInsertID($table->sequenceName);
-							break;
-						}
+		}
+		$db = static::getDb();
+		$command = $db->createCommand()->insert($this->tableName(), $values);
+		if ($command->execute()) {
+			$table = $this->getTableSchema();
+			if ($table->sequenceName !== null) {
+				foreach ($table->primaryKey as $name) {
+					if (!isset($this->_attributes[$name])) {
+						$this->_oldAttributes[$name] = $this->_attributes[$name] = $db->getLastInsertID($table->sequenceName);
+						break;
 					}
 				}
-				foreach ($values as $name => $value) {
-					$this->_oldAttributes[$name] = $value;
-				}
-				$this->afterSave(true);
-				return true;
 			}
+			foreach ($values as $name => $value) {
+				$this->_oldAttributes[$name] = $value;
+			}
+			$this->afterSave(true);
+			return true;
 		}
-		return false;
 	}
 
 	/**
@@ -750,39 +747,35 @@ class ActiveRecord extends Model
 	 */
 	public function update($runValidation = true, $attributes = null)
 	{
-		if ($runValidation && !$this->validate($attributes)) {
+		if ($runValidation && !$this->validate($attributes) && !$this->beforeSave(false)) {
 			return false;
 		}
-		if ($this->beforeSave(false)) {
-			$values = $this->getDirtyAttributes($attributes);
-			if ($values !== array()) {
-				$condition = $this->getOldPrimaryKey(true);
-				$lock = $this->optimisticLock();
-				if ($lock !== null) {
-					if (!isset($values[$lock])) {
-						$values[$lock] = $this->$lock + 1;
-					}
-					$condition[$lock] = $this->$lock;
-				}
-				// We do not check the return value of updateAll() because it's possible
-				// that the UPDATE statement doesn't change anything and thus returns 0.
-				$rows = $this->updateAll($values, $condition);
-
-				if ($lock !== null && !$rows) {
-					throw new StaleObjectException('The object being updated is outdated.');
+		$values = $this->getDirtyAttributes($attributes);
+		if (!empty($values)) {
+			$condition = $this->getOldPrimaryKey(true);
+			$lock = $this->optimisticLock();
+			if ($lock !== null) {
+				if (!isset($values[$lock])) {
+					$values[$lock] = $this->$lock + 1;
 				}
+				$condition[$lock] = $this->$lock;
+			}
+			// We do not check the return value of updateAll() because it's possible
+			// that the UPDATE statement doesn't change anything and thus returns 0.
+			$rows = $this->updateAll($values, $condition);
 
-				foreach ($values as $name => $value) {
-					$this->_oldAttributes[$name] = $this->_attributes[$name];
-				}
+			if ($lock !== null && !$rows) {
+				throw new StaleObjectException('The object being updated is outdated.');
+			}
 
-				$this->afterSave(false);
-				return $rows;
-			} else {
-				return 0;
+			foreach ($values as $name => $value) {
+				$this->_oldAttributes[$name] = $this->_attributes[$name];
 			}
+
+			$this->afterSave(false);
+			return $rows;
 		} else {
-			return false;
+			return 0;
 		}
 	}
 

From 37f3a400cd782cd1009344e2e44ffecc1a09d7fb Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Tue, 7 May 2013 18:36:38 +0400
Subject: [PATCH 074/152] ActiveRecord::getRelation() bugfix

---
 framework/db/ActiveRecord.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/db/ActiveRecord.php b/framework/db/ActiveRecord.php
index 709d139..feb4c02 100644
--- a/framework/db/ActiveRecord.php
+++ b/framework/db/ActiveRecord.php
@@ -1131,8 +1131,8 @@ class ActiveRecord extends Model
 				return $relation;
 			}
 		} catch (UnknownMethodException $e) {
+			throw new InvalidParamException(get_class($this) . ' has no relation named "' . $name . '".');
 		}
-		throw new InvalidParamException(get_class($this) . ' has no relation named "' . $name . '".');
 	}
 
 	/**

From e3f6faf5756cd4105f6c371708a9878a762a72f6 Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Tue, 7 May 2013 18:40:31 +0400
Subject: [PATCH 075/152] && => || fix

---
 framework/db/ActiveRecord.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/db/ActiveRecord.php b/framework/db/ActiveRecord.php
index 87d4809..16c3f77 100644
--- a/framework/db/ActiveRecord.php
+++ b/framework/db/ActiveRecord.php
@@ -667,7 +667,7 @@ class ActiveRecord extends Model
 	 */
 	public function insert($runValidation = true, $attributes = null)
 	{
-		if ($runValidation && !$this->validate($attributes) && !$this->beforeSave(true)) {
+		if ($runValidation && !$this->validate($attributes) || !$this->beforeSave(true)) {
 			return false;
 		}
 		$values = $this->getDirtyAttributes($attributes);
@@ -747,7 +747,7 @@ class ActiveRecord extends Model
 	 */
 	public function update($runValidation = true, $attributes = null)
 	{
-		if ($runValidation && !$this->validate($attributes) && !$this->beforeSave(false)) {
+		if ($runValidation && !$this->validate($attributes) || !$this->beforeSave(false)) {
 			return false;
 		}
 		$values = $this->getDirtyAttributes($attributes);

From e1c788233aa3a22157e6603a3c9805b1c4c25f48 Mon Sep 17 00:00:00 2001
From: Antonio Ramirez <amigo.cobos@gmail.com>
Date: Tue, 7 May 2013 17:46:08 +0200
Subject: [PATCH 076/152] fixed typo

---
 framework/helpers/Console.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/helpers/Console.php b/framework/helpers/Console.php
index 43c64c9..4851ed3 100644
--- a/framework/helpers/Console.php
+++ b/framework/helpers/Console.php
@@ -18,6 +18,6 @@ namespace yii\helpers;
  * @author Carsten Brandt <mail@cebe.cc>
  * @since 2.0
  */
-class ConsoleColor extends base\Console
+class Console extends base\Console
 {
 }

From d7df7053e02808b51e72a987ca67bd2170158c31 Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Tue, 7 May 2013 19:51:29 +0400
Subject: [PATCH 077/152] === array() => empty()

---
 framework/YiiBase.php                               |  2 +-
 framework/console/controllers/MigrateController.php | 13 ++++++++-----
 framework/db/Command.php                            |  2 +-
 framework/db/QueryBuilder.php                       |  6 +++---
 framework/helpers/base/Json.php                     |  2 +-
 framework/i18n/I18N.php                             |  2 +-
 framework/validators/FileValidator.php              |  8 ++++----
 framework/validators/Validator.php                  |  3 +--
 framework/web/Sort.php                              |  2 +-
 framework/web/UrlManager.php                        |  2 +-
 framework/widgets/FragmentCache.php                 |  6 +++---
 11 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/framework/YiiBase.php b/framework/YiiBase.php
index c911f78..b608150 100644
--- a/framework/YiiBase.php
+++ b/framework/YiiBase.php
@@ -456,7 +456,7 @@ class YiiBase
 			}
 			return $reflection->newInstanceArgs($args);
 		} else {
-			return $config === array() ? new $class : new $class($config);
+			return empty($config) ? new $class : new $class($config);
 		}
 	}
 
diff --git a/framework/console/controllers/MigrateController.php b/framework/console/controllers/MigrateController.php
index 3f816f1..fb06c66 100644
--- a/framework/console/controllers/MigrateController.php
+++ b/framework/console/controllers/MigrateController.php
@@ -144,7 +144,8 @@ class MigrateController extends Controller
 	 */
 	public function actionUp($limit = 0)
 	{
-		if (($migrations = $this->getNewMigrations()) === array()) {
+		$migrations = $this->getNewMigrations();
+		if (empty($migrations)) {
 			echo "No new migration found. Your system is up-to-date.\n";
 			Yii::$app->end();
 		}
@@ -198,7 +199,8 @@ class MigrateController extends Controller
 			throw new Exception("The step argument must be greater than 0.");
 		}
 
-		if (($migrations = $this->getMigrationHistory($limit)) === array()) {
+		$migrations = $this->getMigrationHistory($limit);
+		if (empty($migrations)) {
 			echo "No migration has been done before.\n";
 			return;
 		}
@@ -244,7 +246,8 @@ class MigrateController extends Controller
 			throw new Exception("The step argument must be greater than 0.");
 		}
 
-		if (($migrations = $this->getMigrationHistory($limit)) === array()) {
+		$migrations = $this->getMigrationHistory($limit);
+		if (empty($migrations)) {
 			echo "No migration has been done before.\n";
 			return;
 		}
@@ -407,7 +410,7 @@ class MigrateController extends Controller
 	{
 		$limit = (int)$limit;
 		$migrations = $this->getMigrationHistory($limit);
-		if ($migrations === array()) {
+		if (empty($migrations)) {
 			echo "No migration has been done before.\n";
 		} else {
 			$n = count($migrations);
@@ -441,7 +444,7 @@ class MigrateController extends Controller
 	{
 		$limit = (int)$limit;
 		$migrations = $this->getNewMigrations();
-		if ($migrations === array()) {
+		if (empty($migrations)) {
 			echo "No new migrations found. Your system is up-to-date.\n";
 		} else {
 			$n = count($migrations);
diff --git a/framework/db/Command.php b/framework/db/Command.php
index dc6c972..a117685 100644
--- a/framework/db/Command.php
+++ b/framework/db/Command.php
@@ -106,7 +106,7 @@ class Command extends \yii\base\Component
 	 */
 	public function getRawSql()
 	{
-		if ($this->_params === array()) {
+		if (empty($this->_params)) {
 			return $this->_sql;
 		} else {
 			$params = array();
diff --git a/framework/db/QueryBuilder.php b/framework/db/QueryBuilder.php
index 441d287..258ad44 100644
--- a/framework/db/QueryBuilder.php
+++ b/framework/db/QueryBuilder.php
@@ -722,7 +722,7 @@ class QueryBuilder extends \yii\base\Object
 
 		if (!is_array($condition)) {
 			return (string)$condition;
-		} elseif ($condition === array()) {
+		} elseif (empty($condition)) {
 			return '';
 		}
 		if (isset($condition[0])) { // operator format: operator, operand 1, operand 2, ...
@@ -813,7 +813,7 @@ class QueryBuilder extends \yii\base\Object
 
 		$values = (array)$values;
 
-		if ($values === array() || $column === array()) {
+		if (empty($values) || empty($column)) {
 			return $operator === 'IN' ? '0=1' : '';
 		}
 
@@ -885,7 +885,7 @@ class QueryBuilder extends \yii\base\Object
 
 		$values = (array)$values;
 
-		if ($values === array()) {
+		if (empty($values)) {
 			return $operator === 'LIKE' || $operator === 'OR LIKE' ? '0=1' : '';
 		}
 
diff --git a/framework/helpers/base/Json.php b/framework/helpers/base/Json.php
index 262dd81..8de55f9 100644
--- a/framework/helpers/base/Json.php
+++ b/framework/helpers/base/Json.php
@@ -34,7 +34,7 @@ class Json
 		$expressions = array();
 		$value = static::processData($value, $expressions);
 		$json = json_encode($value, $options);
-		return $expressions === array() ? $json : strtr($json, $expressions);
+		return empty($expressions) ? $json : strtr($json, $expressions);
 	}
 
 	/**
diff --git a/framework/i18n/I18N.php b/framework/i18n/I18N.php
index 8667abc..7fae5b0 100644
--- a/framework/i18n/I18N.php
+++ b/framework/i18n/I18N.php
@@ -109,7 +109,7 @@ class I18N extends Component
 			unset($params[0]);
 		}
 
-		return $params === array() ? $message : strtr($message, $params);
+		return empty($params) ? $message : strtr($message, $params);
 	}
 
 	/**
diff --git a/framework/validators/FileValidator.php b/framework/validators/FileValidator.php
index ebe6cad..cc36d07 100644
--- a/framework/validators/FileValidator.php
+++ b/framework/validators/FileValidator.php
@@ -116,7 +116,7 @@ class FileValidator extends Validator
 		}
 		if (!is_array($this->types)) {
 			$this->types = preg_split('/[\s,]+/', strtolower($this->types), -1, PREG_SPLIT_NO_EMPTY);
-		}		
+		}
 	}
 
 	/**
@@ -138,8 +138,8 @@ class FileValidator extends Validator
 				}
 			}
 			$object->$attribute = array_values($files);
-			if ($files === array()) {
-				$this->addError($object, $attribute, $this->uploadRequired);				
+			if (empty($files)) {
+				$this->addError($object, $attribute, $this->uploadRequired);
 			}
 			if (count($files) > $this->maxFiles) {
 				$this->addError($object, $attribute, $this->tooMany, array('{attribute}' => $attribute, '{limit}' => $this->maxFiles));
@@ -153,7 +153,7 @@ class FileValidator extends Validator
 			if ($file instanceof UploadedFile && $file->getError() != UPLOAD_ERR_NO_FILE) {
 				$this->validateFile($object, $attribute, $file);
 			} else {
-				$this->addError($object, $attribute, $this->uploadRequired);				
+				$this->addError($object, $attribute, $this->uploadRequired);
 			}
 		}
 	}
diff --git a/framework/validators/Validator.php b/framework/validators/Validator.php
index 677191b..1ac3f27 100644
--- a/framework/validators/Validator.php
+++ b/framework/validators/Validator.php
@@ -262,7 +262,6 @@ abstract class Validator extends Component
 	 */
 	public function isEmpty($value, $trim = false)
 	{
-		return $value === null || $value === array() || $value === ''
-			|| $trim && is_scalar($value) && trim($value) === '';
+		return $value === null || empty($value) || $value === '' || $trim && is_scalar($value) && trim($value) === '';
 	}
 }
diff --git a/framework/web/Sort.php b/framework/web/Sort.php
index 99084c1..324e733 100644
--- a/framework/web/Sort.php
+++ b/framework/web/Sort.php
@@ -251,7 +251,7 @@ class Sort extends \yii\base\Object
 					}
 				}
 			}
-			if ($this->_attributeOrders === array() && is_array($this->defaults)) {
+			if (empty($this->_attributeOrders) && is_array($this->defaults)) {
 				$this->_attributeOrders = $this->defaults;
 			}
 		}
diff --git a/framework/web/UrlManager.php b/framework/web/UrlManager.php
index a300033..23a20cf 100644
--- a/framework/web/UrlManager.php
+++ b/framework/web/UrlManager.php
@@ -90,7 +90,7 @@ class UrlManager extends Component
 	 */
 	protected function compileRules()
 	{
-		if (!$this->enablePrettyUrl || $this->rules === array()) {
+		if (!$this->enablePrettyUrl || empty($this->rules)) {
 			return;
 		}
 		if (is_string($this->cache)) {
diff --git a/framework/widgets/FragmentCache.php b/framework/widgets/FragmentCache.php
index 5b37f6e..aa24acd 100644
--- a/framework/widgets/FragmentCache.php
+++ b/framework/widgets/FragmentCache.php
@@ -107,7 +107,7 @@ class FragmentCache extends Widget
 			$data = array($content, $this->dynamicPlaceholders);
 			$this->cache->set($this->calculateKey(), $data, $this->duration, $this->dependency);
 
-			if ($this->view->cacheStack === array() && !empty($this->dynamicPlaceholders)) {
+			if (empty($this->view->cacheStack) && !empty($this->dynamicPlaceholders)) {
 				$content = $this->updateDynamicContent($content, $this->dynamicPlaceholders);
 			}
 			echo $content;
@@ -133,7 +133,7 @@ class FragmentCache extends Widget
 				if (is_array($data) && count($data) === 2) {
 					list ($content, $placeholders) = $data;
 					if (is_array($placeholders) && count($placeholders) > 0) {
-						if ($this->view->cacheStack === array()) {
+						if (empty($this->view->cacheStack)) {
 							// outermost cache: replace placeholder with dynamic content
 							$content = $this->updateDynamicContent($content, $placeholders);
 						}
@@ -171,4 +171,4 @@ class FragmentCache extends Widget
 		}
 		return $this->cache->buildKey($factors);
 	}
-}
+}

From 48d04fbb8cd3b1cd6830cfae6ed74894e4da6081 Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Tue, 7 May 2013 19:57:27 +0400
Subject: [PATCH 078/152] !== array() => !empty()

---
 framework/YiiBase.php                            |  2 +-
 framework/base/Controller.php                    |  2 +-
 framework/base/Dictionary.php                    |  4 ++--
 framework/base/Vector.php                        |  2 +-
 framework/console/Controller.php                 |  8 ++++----
 framework/console/controllers/HelpController.php |  6 +++---
 framework/db/ActiveQuery.php                     |  2 +-
 framework/db/Query.php                           |  2 +-
 framework/db/QueryBuilder.php                    |  2 +-
 framework/helpers/base/ArrayHelper.php           |  2 +-
 framework/helpers/base/Html.php                  | 14 +++++++-------
 framework/web/UrlManager.php                     |  4 ++--
 framework/web/UrlRule.php                        |  4 ++--
 framework/widgets/ActiveField.php                |  6 +++---
 framework/widgets/ActiveForm.php                 |  4 ++--
 framework/widgets/Menu.php                       |  2 +-
 16 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/framework/YiiBase.php b/framework/YiiBase.php
index b608150..aeed6f5 100644
--- a/framework/YiiBase.php
+++ b/framework/YiiBase.php
@@ -451,7 +451,7 @@ class YiiBase
 			}
 			$args = func_get_args();
 			array_shift($args); // remove $config
-			if ($config !== array()) {
+			if (!empty($config)) {
 				$args[] = $config;
 			}
 			return $reflection->newInstanceArgs($args);
diff --git a/framework/base/Controller.php b/framework/base/Controller.php
index 583de60..87f5b0e 100644
--- a/framework/base/Controller.php
+++ b/framework/base/Controller.php
@@ -183,7 +183,7 @@ class Controller extends Component
 			}
 		}
 
-		if ($missing !== array()) {
+		if (!empty($missing)) {
 			throw new InvalidRequestException(Yii::t('yii|Missing required parameters: {params}', array(
 				'{params}' => implode(', ', $missing),
 			)));
diff --git a/framework/base/Dictionary.php b/framework/base/Dictionary.php
index 52262cb..5807d93 100644
--- a/framework/base/Dictionary.php
+++ b/framework/base/Dictionary.php
@@ -51,7 +51,7 @@ class Dictionary extends Object implements \IteratorAggregate, \ArrayAccess, \Co
 	 */
 	public function __construct($data = array(), $config = array())
 	{
-		if ($data !== array()) {
+		if (!empty($data)) {
 			$this->copyFrom($data);
 		}
 		parent::__construct($config);
@@ -187,7 +187,7 @@ class Dictionary extends Object implements \IteratorAggregate, \ArrayAccess, \Co
 	public function copyFrom($data)
 	{
 		if (is_array($data) || $data instanceof \Traversable) {
-			if ($this->_d !== array()) {
+			if (!empty($this->_d)) {
 				$this->removeAll();
 			}
 			if ($data instanceof self) {
diff --git a/framework/base/Vector.php b/framework/base/Vector.php
index 7d43fdb..6418077 100644
--- a/framework/base/Vector.php
+++ b/framework/base/Vector.php
@@ -58,7 +58,7 @@ class Vector extends Object implements \IteratorAggregate, \ArrayAccess, \Counta
 	 */
 	public function __construct($data = array(), $config = array())
 	{
-		if ($data !== array()) {
+		if (!empty($data)) {
 			$this->copyFrom($data);
 		}
 		parent::__construct($config);
diff --git a/framework/console/Controller.php b/framework/console/Controller.php
index 2eaf4b8..b168ff1 100644
--- a/framework/console/Controller.php
+++ b/framework/console/Controller.php
@@ -45,7 +45,7 @@ class Controller extends \yii\base\Controller
 	 */
 	public function runAction($id, $params = array())
 	{
-		if ($params !== array()) {
+		if (!empty($params)) {
 			$options = $this->globalOptions();
 			foreach ($params as $name => $value) {
 				if (in_array($name, $options, true)) {
@@ -69,7 +69,7 @@ class Controller extends \yii\base\Controller
 	 */
 	public function bindActionParams($action, $params)
 	{
-		if ($params !== array()) {
+		if (!empty($params)) {
 			$options = $this->globalOptions();
 			foreach ($params as $name => $value) {
 				if (in_array($name, $options, true)) {
@@ -81,7 +81,7 @@ class Controller extends \yii\base\Controller
 
 		$args = isset($params[Request::ANONYMOUS_PARAMS]) ? $params[Request::ANONYMOUS_PARAMS] : array();
 		unset($params[Request::ANONYMOUS_PARAMS]);
-		if ($params !== array()) {
+		if (!empty($params)) {
 			throw new Exception(Yii::t('yii|Unknown options: {params}', array(
 				'{params}' => implode(', ', array_keys($params)),
 			)));
@@ -105,7 +105,7 @@ class Controller extends \yii\base\Controller
 			}
 		}
 
-		if ($missing !== array()) {
+		if (!empty($missing)) {
 			throw new Exception(Yii::t('yii|Missing required arguments: {params}', array(
 				'{params}' => implode(', ', $missing),
 			)));
diff --git a/framework/console/controllers/HelpController.php b/framework/console/controllers/HelpController.php
index 82bd6fe..6a66fd0 100644
--- a/framework/console/controllers/HelpController.php
+++ b/framework/console/controllers/HelpController.php
@@ -142,7 +142,7 @@ class HelpController extends Controller
 	protected function getHelp()
 	{
 		$commands = $this->getCommands();
-		if ($commands !== array()) {
+		if (!empty($commands)) {
 			echo "The following commands are available:\n\n";
 			foreach ($commands as $command) {
 				echo "* $command\n";
@@ -172,7 +172,7 @@ class HelpController extends Controller
 		}
 
 		$actions = $this->getActions($controller);
-		if ($actions !== array()) {
+		if (!empty($actions)) {
 			echo "\nSUB-COMMANDS\n\n";
 			$prefix = $controller->getUniqueId();
 			foreach ($actions as $action) {
@@ -280,7 +280,7 @@ class HelpController extends Controller
 		}
 
 		$options = $this->getOptionHelps($controller);
-		if ($options !== array()) {
+		if (!empty($options)) {
 			echo "\nOPTIONS\n\n";
 			echo implode("\n\n", $options) . "\n\n";
 		}
diff --git a/framework/db/ActiveQuery.php b/framework/db/ActiveQuery.php
index 3999600..dac94c8 100644
--- a/framework/db/ActiveQuery.php
+++ b/framework/db/ActiveQuery.php
@@ -103,7 +103,7 @@ class ActiveQuery extends Query
 	{
 		$command = $this->createCommand();
 		$rows = $command->queryAll();
-		if ($rows !== array()) {
+		if (!empty($rows)) {
 			$models = $this->createModels($rows);
 			if (!empty($this->with)) {
 				$this->populateRelations($models, $this->with);
diff --git a/framework/db/Query.php b/framework/db/Query.php
index 6f76265..b1fc718 100644
--- a/framework/db/Query.php
+++ b/framework/db/Query.php
@@ -589,7 +589,7 @@ class Query extends \yii\base\Component
 	 */
 	public function addParams($params)
 	{
-		if ($params !== array()) {
+		if (!empty($params)) {
 			if ($this->params === null) {
 				$this->params = $params;
 			} else {
diff --git a/framework/db/QueryBuilder.php b/framework/db/QueryBuilder.php
index 258ad44..25474a5 100644
--- a/framework/db/QueryBuilder.php
+++ b/framework/db/QueryBuilder.php
@@ -777,7 +777,7 @@ class QueryBuilder extends \yii\base\Object
 				$parts[] = $operand;
 			}
 		}
-		if ($parts !== array()) {
+		if (!empty($parts)) {
 			return '(' . implode(") $operator (", $parts) . ')';
 		} else {
 			return '';
diff --git a/framework/helpers/base/ArrayHelper.php b/framework/helpers/base/ArrayHelper.php
index 86445d7..672c7b9 100644
--- a/framework/helpers/base/ArrayHelper.php
+++ b/framework/helpers/base/ArrayHelper.php
@@ -36,7 +36,7 @@ class ArrayHelper
 	{
 		$args = func_get_args();
 		$res = array_shift($args);
-		while ($args !== array()) {
+		while (!empty($args)) {
 			$next = array_shift($args);
 			foreach ($next as $k => $v) {
 				if (is_integer($k)) {
diff --git a/framework/helpers/base/Html.php b/framework/helpers/base/Html.php
index 15db823..f601772 100644
--- a/framework/helpers/base/Html.php
+++ b/framework/helpers/base/Html.php
@@ -324,7 +324,7 @@ class Html
 		$options['action'] = $action;
 		$options['method'] = $method;
 		$form = static::beginTag('form', $options);
-		if ($hiddenInputs !== array()) {
+		if (!empty($hiddenInputs)) {
 			$form .= "\n" . implode("\n", $hiddenInputs);
 		}
 
@@ -618,7 +618,7 @@ class Html
 	 *   is present, a hidden input will be generated so that if the radio button is not checked and is submitted,
 	 *   the value of this attribute will still be submitted to the server via the hidden input.
 	 *
-	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will 
+	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will
 	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
 	 *
 	 * @return string the generated radio button tag
@@ -647,7 +647,7 @@ class Html
 	 *   is present, a hidden input will be generated so that if the checkbox is not checked and is submitted,
 	 *   the value of this attribute will still be submitted to the server via the hidden input.
 	 *
-	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will 
+	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will
 	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
 	 *
 	 * @return string the generated checkbox tag
@@ -694,9 +694,9 @@ class Html
 	 * - groups: array, the attributes for the optgroup tags. The structure of this is similar to that of 'options',
 	 *   except that the array keys represent the optgroup labels specified in $items.
 	 *
-	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will 
+	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will
 	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
-	 * 
+	 *
 	 * @return string the generated drop-down list tag
 	 */
 	public static function dropDownList($name, $selection = null, $items = array(), $options = array())
@@ -737,9 +737,9 @@ class Html
 	 *   When this attribute is set, a hidden field will be generated so that if no option is selected in multiple
 	 *   mode, we can still obtain the posted unselect value.
 	 *
-	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will 
+	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will
 	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
-	 * 
+	 *
 	 * @return string the generated list box tag
 	 */
 	public static function listBox($name, $selection = null, $items = array(), $options = array())
diff --git a/framework/web/UrlManager.php b/framework/web/UrlManager.php
index 23a20cf..aab7979 100644
--- a/framework/web/UrlManager.php
+++ b/framework/web/UrlManager.php
@@ -190,13 +190,13 @@ class UrlManager extends Component
 			if ($this->suffix !== null) {
 				$route .= $this->suffix;
 			}
-			if ($params !== array()) {
+			if (!empty($params)) {
 				$route .= '?' . http_build_query($params);
 			}
 			return rtrim($baseUrl, '/') . '/' . $route . $anchor;
 		} else {
 			$url = $baseUrl . '?' . $this->routeVar . '=' . $route;
-			if ($params !== array()) {
+			if (!empty($params)) {
 				$url .= '&' . http_build_query($params);
 			}
 			return $url;
diff --git a/framework/web/UrlRule.php b/framework/web/UrlRule.php
index d9cb4fd..53bd747 100644
--- a/framework/web/UrlRule.php
+++ b/framework/web/UrlRule.php
@@ -144,7 +144,7 @@ class UrlRule extends Object
 		$this->_template = preg_replace('/<(\w+):?([^>]+)?>/', '<$1>', $this->pattern);
 		$this->pattern = '#^' . trim(strtr($this->_template, $tr), '/') . '$#u';
 
-		if ($this->_routeParams !== array()) {
+		if (!empty($this->_routeParams)) {
 			$this->_routeRule = '#^' . strtr($this->route, $tr2) . '$#u';
 		}
 	}
@@ -275,7 +275,7 @@ class UrlRule extends Object
 			$url .= ($this->suffix === null ? $manager->suffix : $this->suffix);
 		}
 
-		if ($params !== array()) {
+		if (!empty($params)) {
 			$url .= '?' . http_build_query($params);
 		}
 		return $url;
diff --git a/framework/widgets/ActiveField.php b/framework/widgets/ActiveField.php
index 0e0381f..aaa9470 100644
--- a/framework/widgets/ActiveField.php
+++ b/framework/widgets/ActiveField.php
@@ -104,7 +104,7 @@ class ActiveField extends Component
 	public function begin()
 	{
 		$options = $this->getClientOptions();
-		if ($options !== array()) {
+		if (!empty($options)) {
 			$this->form->attributes[$this->attribute] = $options;
 		}
 
@@ -123,7 +123,7 @@ class ActiveField extends Component
 
 		return Html::beginTag($this->tag, $options);
 	}
-	
+
 	public function end()
 	{
 		return Html::endTag($this->tag);
@@ -143,7 +143,7 @@ class ActiveField extends Component
 					$validators[] = $js;
 				}
 			}
-			if ($validators !== array()) {
+			if (!empty($validators)) {
 				$options['validate'] = new JsExpression("function(attribute,value,messages){" . implode('', $validators) . '}');
 			}
 		}
diff --git a/framework/widgets/ActiveForm.php b/framework/widgets/ActiveForm.php
index 61416e2..24451b9 100644
--- a/framework/widgets/ActiveForm.php
+++ b/framework/widgets/ActiveForm.php
@@ -130,7 +130,7 @@ class ActiveForm extends Widget
 	 */
 	public function run()
 	{
-		if ($this->attributes !== array()) {
+		if (!empty($this->attributes)) {
 			$id = $this->options['id'];
 			$options = Json::encode($this->getClientOptions());
 			$attributes = Json::encode($this->attributes);
@@ -197,7 +197,7 @@ class ActiveForm extends Widget
 			$options['class'] .= ' ' . $this->errorSummaryCssClass;
 		}
 
-		if ($lines !== array()) {
+		if (!empty($lines)) {
 			$content = "<ul><li>" . implode("</li>\n<li>", $lines) . "</li><ul>";
 			return Html::tag('div', $header . $content . $footer, $options);
 		} else {
diff --git a/framework/widgets/Menu.php b/framework/widgets/Menu.php
index 3af620d..c10b33b 100644
--- a/framework/widgets/Menu.php
+++ b/framework/widgets/Menu.php
@@ -166,7 +166,7 @@ class Menu extends Widget
 			if ($this->itemCssClass !== null) {
 				$class[] = $this->itemCssClass;
 			}
-			if ($class !== array()) {
+			if (!empty($class)) {
 				if (empty($options['class'])) {
 					$options['class'] = implode(' ', $class);
 				} else {

From 684295fe0b44bffd053d3f2f273295dc36b893d6 Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Tue, 7 May 2013 20:11:31 +0400
Subject: [PATCH 079/152] Fixes

---
 framework/db/QueryBuilder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/db/QueryBuilder.php b/framework/db/QueryBuilder.php
index 25474a5..5c5584e 100644
--- a/framework/db/QueryBuilder.php
+++ b/framework/db/QueryBuilder.php
@@ -813,7 +813,7 @@ class QueryBuilder extends \yii\base\Object
 
 		$values = (array)$values;
 
-		if (empty($values) || empty($column)) {
+		if (empty($values) || $column === array()) {
 			return $operator === 'IN' ? '0=1' : '';
 		}
 

From 82bcd0b298a7e801f727179cc638209534813c55 Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Tue, 7 May 2013 20:13:15 +0400
Subject: [PATCH 080/152] Fixes

---
 framework/validators/Validator.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/framework/validators/Validator.php b/framework/validators/Validator.php
index 1ac3f27..677191b 100644
--- a/framework/validators/Validator.php
+++ b/framework/validators/Validator.php
@@ -262,6 +262,7 @@ abstract class Validator extends Component
 	 */
 	public function isEmpty($value, $trim = false)
 	{
-		return $value === null || empty($value) || $value === '' || $trim && is_scalar($value) && trim($value) === '';
+		return $value === null || $value === array() || $value === ''
+			|| $trim && is_scalar($value) && trim($value) === '';
 	}
 }

From ca9194a3658228bcf10ea3e1a848eb08146dc267 Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Tue, 7 May 2013 20:17:35 +0400
Subject: [PATCH 081/152] Code style fixes

---
 tests/unit/framework/caching/ApcCacheTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/unit/framework/caching/ApcCacheTest.php b/tests/unit/framework/caching/ApcCacheTest.php
index 859f6a6..6018ce7 100644
--- a/tests/unit/framework/caching/ApcCacheTest.php
+++ b/tests/unit/framework/caching/ApcCacheTest.php
@@ -15,13 +15,13 @@ class ApcCacheTest extends CacheTest
 	 */
 	protected function getCacheInstance()
 	{
-		if(!extension_loaded("apc")) {
+		if (!extension_loaded("apc")) {
 			$this->markTestSkipped("APC not installed. Skipping.");
-		} else if ('cli' === PHP_SAPI && !ini_get('apc.enable_cli')) {
+		} elseif ('cli' === PHP_SAPI && !ini_get('apc.enable_cli')) {
 			$this->markTestSkipped("APC cli is not enabled. Skipping.");
 		}
 
-		if($this->_cacheInstance === null) {
+		if ($this->_cacheInstance === null) {
 			$this->_cacheInstance = new ApcCache();
 		}
 		return $this->_cacheInstance;

From 17807874b67ce5c728b0da6ee719a4c8d0d36d3d Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Tue, 7 May 2013 15:46:21 -0400
Subject: [PATCH 082/152] Fixes issue #53: implemented Menu.

---
 apps/bootstrap/protected/views/layouts/main.php |  21 +-
 framework/base/Controller.php                   |   1 -
 framework/widgets/Menu.php                      | 247 ++++++++++++------------
 3 files changed, 137 insertions(+), 132 deletions(-)

diff --git a/apps/bootstrap/protected/views/layouts/main.php b/apps/bootstrap/protected/views/layouts/main.php
index 1240053..0eaeb99 100644
--- a/apps/bootstrap/protected/views/layouts/main.php
+++ b/apps/bootstrap/protected/views/layouts/main.php
@@ -23,16 +23,17 @@ $this->registerAssetBundle('app');
 		<div class="navbar">
 			<div class="navbar-inner">
 				<div class="container">
-					<ul class="nav">
-						<li><?php echo Html::a('Home', Yii::$app->homeUrl); ?></li>
-						<li><?php echo Html::a('About', array('/site/about')); ?></li>
-						<li><?php echo Html::a('Contact', array('/site/contact')); ?></li>
-						<?php if (Yii::$app->user->isGuest): ?>
-						<li><?php echo Html::a('Login', array('/site/login')); ?></li>
-						<?php else: ?>
-						<li><?php echo Html::a('Logout (' . Html::encode(Yii::$app->user->identity->username) . ')', array('/site/logout')); ?></li>
-						<?php endif; ?>
-					</ul>
+					<?php $this->widget('yii\widgets\Menu', array(
+						'options' => array('class' => 'nav'),
+						'items' => array(
+							array('label' => 'Home', 'url' => array('/site/index')),
+							array('label' => 'About', 'url' => array('/site/about')),
+							array('label' => 'Contact', 'url' => array('/site/contact')),
+							Yii::$app->user->isGuest ?
+								array('label' => 'Login', 'url' => array('/site/login')) :
+								array('label' => 'Logout (' . Yii::$app->user->identity->username .')' , 'url' => array('/site/logout')),
+						),
+					)); ?>
 				</div>
 			</div>
 		</div>
diff --git a/framework/base/Controller.php b/framework/base/Controller.php
index 87f5b0e..9572636 100644
--- a/framework/base/Controller.php
+++ b/framework/base/Controller.php
@@ -8,7 +8,6 @@
 namespace yii\base;
 
 use Yii;
-use yii\helpers\FileHelper;
 use yii\helpers\StringHelper;
 
 /**
diff --git a/framework/widgets/Menu.php b/framework/widgets/Menu.php
index c10b33b..b8f69e1 100644
--- a/framework/widgets/Menu.php
+++ b/framework/widgets/Menu.php
@@ -7,165 +7,173 @@
 
 namespace yii\widgets;
 
+use Yii;
 use yii\base\Widget;
 use yii\helpers\Html;
 
 /**
+ * Menu displays a multi-level menu using nested HTML lists.
  *
+ * The main property of Menu is [[items]], which specifies the possible items in the menu.
+ * A menu item can contain sub-items which specify the sub-menu under that menu item.
+ * 
+ * Menu checks the current route and request parameters to toggle certain menu items
+ * with active state.
+ * 
+ * Note that Menu only renders the HTML tags about the menu. It does do any styling.
+ * You are responsible to provide CSS styles to make it look like a real menu.
+ *
+ * The following example shows how to use Menu:
+ * 
+ * ~~~
+ * $this->widget('yii\widgets\Menu', array(
+ *     'items' => array(
+ *         // Important: you need to specify url as 'controller/action',
+ *         // not just as 'controller' even if default acion is used.
+ *         array('label' => 'Home', 'url' => array('site/index')),
+ *         // 'Products' menu item will be selected as long as the route is 'product/index'
+ *         array('label' => 'Products', 'url' => array('product/index'), 'items' => array(
+ *             array('label' => 'New Arrivals', 'url' => array('product/index', 'tag' => 'new')),
+ *             array('label' => 'Most Popular', 'url' => array('product/index', 'tag' => 'popular')),
+ *         )),
+ *         array('label' => 'Login', 'url' => array('site/login'), 'visible' => Yii::app()->user->isGuest),
+ *     ),
+ * ));
+ * ~~~
+ * 
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
 class Menu extends Widget
 {
 	/**
-	 * @var array list of menu items. Each menu item is specified as an array of name-value pairs.
-	 * Possible option names include the following:
-	 * <ul>
-	 * <li>label: string, optional, specifies the menu item label. When {@link encodeLabel} is true, the label
-	 * will be HTML-encoded. If the label is not specified, it defaults to an empty string.</li>
-	 * <li>url: string or array, optional, specifies the URL of the menu item. It is passed to {@link Html::normalizeUrl}
-	 * to generate a valid URL. If this is not set, the menu item will be rendered as a span text.</li>
-	 * <li>visible: boolean, optional, whether this menu item is visible. Defaults to true.
-	 * This can be used to control the visibility of menu items based on user permissions.</li>
-	 * <li>items: array, optional, specifies the sub-menu items. Its format is the same as the parent items.</li>
-	 * <li>active: boolean, optional, whether this menu item is in active state (currently selected).
-	 * If a menu item is active and {@link activeClass} is not empty, its CSS class will be appended with {@link activeClass}.
-	 * If this option is not set, the menu item will be set active automatically when the current request
-	 * is triggered by {@link url}. Note that the GET parameters not specified in the 'url' option will be ignored.</li>
-	 * <li>template: string, optional, the template used to render this menu item.
-	 * When this option is set, it will override the global setting {@link itemTemplate}.
-	 * Please see {@link itemTemplate} for more details. This option has been available since version 1.1.1.</li>
-	 * <li>linkOptions: array, optional, additional HTML attributes to be rendered for the link or span tag of the menu item.</li>
-	 * <li>itemOptions: array, optional, additional HTML attributes to be rendered for the container tag of the menu item.</li>
-	 * <li>submenuOptions: array, optional, additional HTML attributes to be rendered for the container of the submenu if this menu item has one.
-	 * When this option is set, the {@link submenuHtmlOptions} property will be ignored for this particular submenu.
-	 * This option has been available since version 1.1.6.</li>
-	 * </ul>
+	 * @var array list of menu items. Each menu item should be an array of the following structure:
+	 *
+	 * - label: string, optional, specifies the menu item label. When [[encodeLabels]] is true, the label
+	 *   will be HTML-encoded. If the label is not specified, an empty string will be used.
+	 * - url: string or array, optional, specifies the URL of the menu item. It will be processed by [[Html::url]].
+	 *   When this is set, the actual menu item content will be generated using [[linkTemplate]];
+	 *   otherwise, [[labelTemplate]] will be used.
+	 * - visible: boolean, optional, whether this menu item is visible. Defaults to true.
+	 * - items: array, optional, specifies the sub-menu items. Its format is the same as the parent items.
+	 * - active: boolean, optional, whether this menu item is in active state (currently selected).
+	 *   If a menu item is active, its CSS class will be appended with [[activeCssClass]].
+	 *   If this option is not set, the menu item will be set active automatically when the current request
+	 *   is triggered by [[url]]. For more details, please refer to [[isItemActive()]].
+	 * - template: string, optional, the template used to render the content of this menu item.
+	 *   The token `{url}` will be replaced by the URL associated with this menu item,
+	 *   and the token `{label}` will be replaced by the label of the menu item.
+	 *   If this option is not set, [[linkTemplate]] or [[labelTemplate]] will be used instead. 
 	 */
 	public $items = array();
 	/**
-	 * @var string the template used to render an individual menu item. In this template,
-	 * the token "{menu}" will be replaced with the corresponding menu link or text.
-	 * If this property is not set, each menu will be rendered without any decoration.
-	 * This property will be overridden by the 'template' option set in individual menu items via {@items}.
-	 * @since 1.1.1
+	 * @var string the template used to render the body of a menu which is a link.
+	 * In this template, the token `{url}` will be replaced with the corresponding link URL;
+	 * while `{label}` will be replaced with the link text.
+	 * This property will be overridden by the `template` option set in individual menu items via [[items]].
+	 */
+	public $linkTemplate = '<a href="{url}">{label}</a>';
+	/**
+	 * @var string the template used to render the body of a menu which is NOT a link.
+	 * In this template, the token `{label}` will be replaced with the label of the menu item.
+	 * This property will be overridden by the `template` option set in individual menu items via [[items]].
 	 */
-	public $itemTemplate;
+	public $labelTemplate = '{label}';
 	/**
-	 * @var boolean whether the labels for menu items should be HTML-encoded. Defaults to true.
+	 * @var string the template used to render a list of sub-menus.
+	 * In this template, the token `{items}` will be replaced with the renderer sub-menu items.
 	 */
-	public $encodeLabel = true;
+	public $submenuTemplate = "\n<ul>\n{items}\n</ul>\n";
 	/**
-	 * @var string the CSS class to be appended to the active menu item. Defaults to 'active'.
-	 * If empty, the CSS class of menu items will not be changed.
+	 * @var boolean whether the labels for menu items should be HTML-encoded.
+	 */
+	public $encodeLabels = true;
+	/**
+	 * @var string the CSS class to be appended to the active menu item.
 	 */
 	public $activeCssClass = 'active';
 	/**
 	 * @var boolean whether to automatically activate items according to whether their route setting
-	 * matches the currently requested route. Defaults to true.
-	 * @since 1.1.3
+	 * matches the currently requested route.
+	 * @see isItemActive
 	 */
 	public $activateItems = true;
 	/**
 	 * @var boolean whether to activate parent menu items when one of the corresponding child menu items is active.
-	 * The activated parent menu items will also have its CSS classes appended with {@link activeCssClass}.
-	 * Defaults to false.
+	 * The activated parent menu items will also have its CSS classes appended with [[activeCssClass]].
 	 */
 	public $activateParents = false;
 	/**
-	 * @var boolean whether to hide empty menu items. An empty menu item is one whose 'url' option is not
-	 * set and which doesn't contain visible child menu items. Defaults to true.
+	 * @var boolean whether to hide empty menu items. An empty menu item is one whose `url` option is not
+	 * set and which has no visible child menu items.
 	 */
 	public $hideEmptyItems = true;
 	/**
-	 * @var array HTML attributes for the menu's root container tag
+	 * @var array the HTML attributes for the menu's container tag.
 	 */
 	public $options = array();
 	/**
-	 * @var array HTML attributes for the submenu's container tag.
-	 */
-	public $submenuHtmlOptions = array();
-	/**
-	 * @var string the HTML element name that will be used to wrap the label of all menu links.
-	 * For example, if this property is set as 'span', a menu item may be rendered as
-	 * &lt;li&gt;&lt;a href="url"&gt;&lt;span&gt;label&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-	 * This is useful when implementing menu items using the sliding window technique.
-	 * Defaults to null, meaning no wrapper tag will be generated.
-	 * @since 1.1.4
-	 */
-	public $linkLabelWrapper;
-	/**
-	 * @var array HTML attributes for the links' wrap element specified in
-	 * {@link linkLabelWrapper}.
-	 * @since 1.1.13
-	 */
-	public $linkLabelWrapperHtmlOptions = array();
-	/**
 	 * @var string the CSS class that will be assigned to the first item in the main menu or each submenu.
 	 * Defaults to null, meaning no such CSS class will be assigned.
-	 * @since 1.1.4
 	 */
 	public $firstItemCssClass;
 	/**
 	 * @var string the CSS class that will be assigned to the last item in the main menu or each submenu.
 	 * Defaults to null, meaning no such CSS class will be assigned.
-	 * @since 1.1.4
 	 */
 	public $lastItemCssClass;
 	/**
-	 * @var string the CSS class that will be assigned to every item.
-	 * Defaults to null, meaning no such CSS class will be assigned.
-	 * @since 1.1.9
+	 * @var string the route used to determine if a menu item is active or not.
+	 * If not set, it will use the route of the current request. 
+	 * @see params
+	 * @see isItemActive
 	 */
-	public $itemCssClass;
-
+	public $route;
 	/**
-	 * Initializes the menu widget.
-	 * This method mainly normalizes the {@link items} property.
-	 * If this method is overridden, make sure the parent implementation is invoked.
+	 * @var array the parameters used to determine if a menu item is active or not.
+	 * If not set, it will use `$_GET`.
+	 * @see route
+	 * @see isItemActive
 	 */
-	public function init()
-	{
-		$route = $this->getController()->getRoute();
-		$this->items = $this->normalizeItems($this->items, $route, $hasActiveChild);
-	}
+	public $params;
+
 
 	/**
-	 * Calls {@link renderMenu} to render the menu.
+	 * Renders the menu.
 	 */
 	public function run()
 	{
-		if (count($this->items)) {
-			echo Html::beginTag('ul', $this->options) . "\n";
-			$this->renderItems($this->items);
-			echo Html::endTag('ul');
+		if ($this->route === null && Yii::$app->controller !== null) {
+			$this->route = Yii::$app->controller->getRoute();
+		}
+		if ($this->params === null) {
+			$this->params = $_GET;
 		}
+		$items = $this->normalizeItems($this->items, $hasActiveChild);
+		echo Html::tag('ul', $this->renderItems($items), $this->options);
 	}
 
 	/**
-	 * Recursively renders the menu items.
+	 * Recursively renders the menu items (without the container tag).
 	 * @param array $items the menu items to be rendered recursively
+	 * @return string the rendering result
 	 */
 	protected function renderItems($items)
 	{
-		$count = 0;
 		$n = count($items);
-		foreach ($items as $item) {
-			$count++;
+		$lines = array();
+		foreach ($items as $i => $item) {
 			$options = isset($item['itemOptions']) ? $item['itemOptions'] : array();
 			$class = array();
-			if ($item['active'] && $this->activeCssClass != '') {
+			if ($item['active']) {
 				$class[] = $this->activeCssClass;
 			}
-			if ($count === 1 && $this->firstItemCssClass !== null) {
+			if ($i === 0 && $this->firstItemCssClass !== null) {
 				$class[] = $this->firstItemCssClass;
 			}
-			if ($count === $n && $this->lastItemCssClass !== null) {
+			if ($i === $n - 1 && $this->lastItemCssClass !== null) {
 				$class[] = $this->lastItemCssClass;
 			}
-			if ($this->itemCssClass !== null) {
-				$class[] = $this->itemCssClass;
-			}
 			if (!empty($class)) {
 				if (empty($options['class'])) {
 					$options['class'] = implode(' ', $class);
@@ -174,51 +182,46 @@ class Menu extends Widget
 				}
 			}
 
-			echo Html::beginTag('li', $options);
-
 			$menu = $this->renderItem($item);
-			if (isset($this->itemTemplate) || isset($item['template'])) {
-				$template = isset($item['template']) ? $item['template'] : $this->itemTemplate;
-				echo strtr($template, array('{menu}' => $menu));
-			} else {
-				echo $menu;
+			if (!empty($item['items'])) {
+				$menu .= strtr($this->submenuTemplate, array(
+					'{items}' => $this->renderItems($item['items']),
+				));
 			}
-
-			if (isset($item['items']) && count($item['items'])) {
-				echo "\n" . Html::beginTag('ul', isset($item['submenuOptions']) ? $item['submenuOptions'] : $this->submenuHtmlOptions) . "\n";
-				$this->renderItems($item['items']);
-				echo Html::endTag('ul') . "\n";
-			}
-
-			echo Html::endTag('li') . "\n";
+			$lines[] = Html::tag('li', $menu, $options);
 		}
+		return implode("\n", $lines);
 	}
 
 	/**
 	 * Renders the content of a menu item.
 	 * Note that the container and the sub-menus are not rendered here.
-	 * @param array $item the menu item to be rendered. Please see {@link items} on what data might be in the item.
-	 * @return string
-	 * @since 1.1.6
+	 * @param array $item the menu item to be rendered. Please refer to [[items]] to see what data might be in the item.
+	 * @return string the rendering result
 	 */
 	protected function renderItem($item)
 	{
 		if (isset($item['url'])) {
-			$label = $this->linkLabelWrapper === null ? $item['label'] : Html::tag($this->linkLabelWrapper, $this->linkLabelWrapperHtmlOptions, $item['label']);
-			return Html::a($label, $item['url'], isset($item['linkOptions']) ? $item['linkOptions'] : array());
+			$template = isset($item['template']) ? $item['template'] : $this->linkTemplate;
+			return strtr($template, array(
+				'{url}' => Html::url($item['url']),
+				'{label}' => $item['label'],
+			));
 		} else {
-			return Html::tag('span', isset($item['linkOptions']) ? $item['linkOptions'] : array(), $item['label']);
+			$template = isset($item['template']) ? $item['template'] : $this->labelTemplate;
+			return strtr($template, array(
+				'{label}' => $item['label'],
+			));
 		}
 	}
 
 	/**
-	 * Normalizes the {@link items} property so that the 'active' state is properly identified for every menu item.
+	 * Normalizes the [[items]] property to remove invisible items and activate certain items.
 	 * @param array $items the items to be normalized.
-	 * @param string $route the route of the current request.
 	 * @param boolean $active whether there is an active child menu item.
 	 * @return array the normalized menu items
 	 */
-	protected function normalizeItems($items, $route, &$active)
+	protected function normalizeItems($items, &$active)
 	{
 		foreach ($items as $i => $item) {
 			if (isset($item['visible']) && !$item['visible']) {
@@ -228,7 +231,7 @@ class Menu extends Widget
 			if (!isset($item['label'])) {
 				$item['label'] = '';
 			}
-			if ($this->encodeLabel) {
+			if ($this->encodeLabels) {
 				$items[$i]['label'] = Html::encode($item['label']);
 			}
 			$hasActiveChild = false;
@@ -243,7 +246,7 @@ class Menu extends Widget
 				}
 			}
 			if (!isset($item['active'])) {
-				if ($this->activateParents && $hasActiveChild || $this->activateItems && $this->isItemActive($item, $route)) {
+				if ($this->activateParents && $hasActiveChild || $this->activateItems && $this->isItemActive($item)) {
 					$active = $items[$i]['active'] = true;
 				} else {
 					$items[$i]['active'] = false;
@@ -257,19 +260,21 @@ class Menu extends Widget
 
 	/**
 	 * Checks whether a menu item is active.
-	 * This is done by checking if the currently requested URL is generated by the 'url' option
-	 * of the menu item. Note that the GET parameters not specified in the 'url' option will be ignored.
+	 * This is done by checking if [[route]] and [[params]] match that specified in the `url` option of the menu item.
+	 * When the `url` option of a menu item is specified in terms of an array, its first element is treated
+	 * as the route for the item and the rest of the elements are the associated parameters.
+	 * Only when its route and parameters match [[route]] and [[params]], respectively, will a menu item
+	 * be considered active.
 	 * @param array $item the menu item to be checked
-	 * @param string $route the route of the current request
 	 * @return boolean whether the menu item is active
 	 */
-	protected function isItemActive($item, $route)
+	protected function isItemActive($item)
 	{
-		if (isset($item['url']) && is_array($item['url']) && !strcasecmp(trim($item['url'][0], '/'), $route)) {
+		if (isset($item['url']) && is_array($item['url']) && trim($item['url'][0], '/') === $this->route) {
 			unset($item['url']['#']);
 			if (count($item['url']) > 1) {
 				foreach (array_splice($item['url'], 1) as $name => $value) {
-					if (!isset($_GET[$name]) || $_GET[$name] != $value) {
+					if (!isset($this->params[$name]) || $this->params[$name] != $value) {
 						return false;
 					}
 				}

From f2258e760f03d636056c2c7cb48a8bd45c10d913 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Wed, 8 May 2013 00:31:43 +0400
Subject: [PATCH 083/152] Added Purifier and Markdown helpers, added
 composer.lock

---
 composer.json                       |   3 +-
 composer.lock                       | 212 ++++++++++++++++++++++++++++++++++++
 framework/helpers/Markdown.php      |  33 ++++++
 framework/helpers/Purifier.php      |  34 ++++++
 framework/helpers/base/Markdown.php |  51 +++++++++
 framework/helpers/base/Purifier.php |  43 ++++++++
 6 files changed, 375 insertions(+), 1 deletion(-)
 create mode 100644 composer.lock
 create mode 100644 framework/helpers/Markdown.php
 create mode 100644 framework/helpers/Purifier.php
 create mode 100644 framework/helpers/base/Markdown.php
 create mode 100644 framework/helpers/base/Purifier.php

diff --git a/composer.json b/composer.json
index 6a5c383..b797b2f 100644
--- a/composer.json
+++ b/composer.json
@@ -70,6 +70,7 @@
 		"php": ">=5.3.0",
 		"michelf/php-markdown": "1.3",
 		"twig/twig": "1.12.*",
-		"smarty/smarty": "3.1.*"
+		"smarty/smarty": "3.1.*",
+		"ezyang/htmlpurifier": "v4.5.0"
 	}
 }
diff --git a/composer.lock b/composer.lock
new file mode 100644
index 0000000..c269cf3
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,212 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
+    ],
+    "hash": "8036953eff9eafbdbd4c431929a1d223",
+    "packages": [
+        {
+            "name": "ezyang/htmlpurifier",
+            "version": "v4.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ezyang/htmlpurifier.git",
+                "reference": "v4.5.0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/v4.5.0",
+                "reference": "v4.5.0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "HTMLPurifier": "library/"
+                },
+                "files": [
+                    "library/HTMLPurifier.composer.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL"
+            ],
+            "authors": [
+                {
+                    "name": "Edward Z. Yang",
+                    "email": "admin@htmlpurifier.org",
+                    "homepage": "http://ezyang.com"
+                }
+            ],
+            "description": "Standards compliant HTML filter written in PHP",
+            "homepage": "http://htmlpurifier.org/",
+            "keywords": [
+                "html"
+            ],
+            "time": "2013-02-18 00:04:08"
+        },
+        {
+            "name": "michelf/php-markdown",
+            "version": "1.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/michelf/php-markdown.git",
+                "reference": "1.3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/michelf/php-markdown/zipball/1.3",
+                "reference": "1.3",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-lib": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Michelf": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Michel Fortin",
+                    "email": "michel.fortin@michelf.ca",
+                    "homepage": "http://michelf.ca/",
+                    "role": "Developer"
+                },
+                {
+                    "name": "John Gruber",
+                    "homepage": "http://daringfireball.net/"
+                }
+            ],
+            "description": "PHP Markdown",
+            "homepage": "http://michelf.ca/projects/php-markdown/",
+            "keywords": [
+                "markdown"
+            ],
+            "time": "2013-04-11 18:53:11"
+        },
+        {
+            "name": "smarty/smarty",
+            "version": "v3.1.13",
+            "source": {
+                "type": "svn",
+                "url": "http://smarty-php.googlecode.com/svn",
+                "reference": "/tags/v3.1.13/@4699"
+            },
+            "require": {
+                "php": ">=5.2"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "distribution/libs/Smarty.class.php",
+                    "distribution/libs/SmartyBC.class.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "Monte Ohrt",
+                    "email": "monte@ohrt.com"
+                },
+                {
+                    "name": "Uwe Tews",
+                    "email": "uwe.tews@googlemail.com"
+                },
+                {
+                    "name": "Rodney Rehm",
+                    "email": "rodney.rehm@medialize.de"
+                }
+            ],
+            "description": "Smarty - the compiling PHP template engine",
+            "homepage": "http://www.smarty.net",
+            "keywords": [
+                "templating"
+            ],
+            "time": "2013-01-26 12:03:52"
+        },
+        {
+            "name": "twig/twig",
+            "version": "v1.12.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/fabpot/Twig.git",
+                "reference": "v1.12.3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/fabpot/Twig/zipball/v1.12.3",
+                "reference": "v1.12.3",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.12-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Twig_": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Armin Ronacher",
+                    "email": "armin.ronacher@active-4.com"
+                }
+            ],
+            "description": "Twig, the flexible, fast, and secure template language for PHP",
+            "homepage": "http://twig.sensiolabs.org",
+            "keywords": [
+                "templating"
+            ],
+            "time": "2013-04-08 12:40:11"
+        }
+    ],
+    "packages-dev": [
+
+    ],
+    "aliases": [
+
+    ],
+    "minimum-stability": "stable",
+    "stability-flags": [
+
+    ],
+    "platform": {
+        "php": ">=5.3.0"
+    },
+    "platform-dev": [
+
+    ]
+}
diff --git a/framework/helpers/Markdown.php b/framework/helpers/Markdown.php
new file mode 100644
index 0000000..a8fd0c8
--- /dev/null
+++ b/framework/helpers/Markdown.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @link http://www.yiiframework.com/
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\helpers;
+
+/**
+ * Markdown provides an ability to transform markdown into HTML.
+ *
+ * Basic usage is the following:
+ *
+ * ```php
+ * $my_html = Markdown::process($my_text);
+ * ```
+ *
+ * If you want to configure the parser:
+ *
+ * ```php
+ * $my_html = Markdown::process($my_text, array(
+ *     'fn_id_prefix' => 'footnote_',
+ * ));
+ * ```
+ *
+ * For more details please refer to [PHP Markdown library documentation](http://michelf.ca/projects/php-markdown/).
+ * @author Alexander Makarov <sam@rmcreative.ru>
+ * @since 2.0
+ */
+class Markdown extends base\Markdown
+{
+}
diff --git a/framework/helpers/Purifier.php b/framework/helpers/Purifier.php
new file mode 100644
index 0000000..b659531
--- /dev/null
+++ b/framework/helpers/Purifier.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @link http://www.yiiframework.com/
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\helpers;
+
+/**
+ * Purifier provides an ability to clean up HTML from any harmful code.
+ *
+ * Basic usage is the following:
+ *
+ * ```php
+ * $my_html = Purifier::process($my_text);
+ * ```
+ *
+ * If you want to configure it:
+ *
+ * ```php
+ * $my_html = Purifier::process($my_text, array(
+ *     'Attr.EnableID' => true,
+ * ));
+ * ```
+ *
+ * For more details please refer to HTMLPurifier documentation](http://htmlpurifier.org/).
+ *
+ * @author Alexander Makarov <sam@rmcreative.ru>
+ * @since 2.0
+ */
+class Purifier extends base\Purifier
+{
+}
diff --git a/framework/helpers/base/Markdown.php b/framework/helpers/base/Markdown.php
new file mode 100644
index 0000000..562403f
--- /dev/null
+++ b/framework/helpers/base/Markdown.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @link http://www.yiiframework.com/
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\helpers\base;
+
+\Yii::setAlias('@Michelf', \Yii::getAlias('@yii').'/../vendor/michelf/php-markdown/Michelf');
+use Michelf\MarkdownExtra;
+
+/**
+ * Markdown provides an ability to transform markdown into HTML.
+ *
+ * Basic usage is the following:
+ *
+ * ```php
+ * $my_html = Markdown::process($my_text);
+ * ```
+ *
+ * If you want to configure the parser:
+ *
+ * ```php
+ * $my_html = Markdown::process($my_text, array(
+ *     'fn_id_prefix' => 'footnote_',
+ * ));
+ * ```
+ *
+ * For more details please refer to [PHP Markdown library documentation](http://michelf.ca/projects/php-markdown/).
+ * @author Alexander Makarov <sam@rmcreative.ru>
+ * @since 2.0
+ */
+class Markdown
+{
+	/**
+	 * @var MarkdownExtra
+	 */
+	protected static $markdown;
+
+	public static function process($content, $config = array())
+	{
+		if (static::$markdown===null) {
+			static::$markdown = new MarkdownExtra();
+		}
+		foreach ($config as $name => $value) {
+			static::$markdown->{$name} = $value;
+		}
+		return static::$markdown->transform($content);
+	}
+}
diff --git a/framework/helpers/base/Purifier.php b/framework/helpers/base/Purifier.php
new file mode 100644
index 0000000..cc4ab12
--- /dev/null
+++ b/framework/helpers/base/Purifier.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @link http://www.yiiframework.com/
+ * @license http://www.yiiframework.com/license/
+ */
+namespace yii\helpers\base;
+
+if (!class_exists('HTMLPurifier_Bootstrap', false)) {
+	require_once(\Yii::getAlias('@yii').'/../vendor/ezyang/htmlpurifier/library'.DIRECTORY_SEPARATOR.'HTMLPurifier.auto.php');
+}
+
+/**
+ * Purifier provides an ability to clean up HTML from any harmful code.
+ *
+ * Basic usage is the following:
+ *
+ * ```php
+ * $my_html = Purifier::process($my_text);
+ * ```
+ *
+ * If you want to configure it:
+ *
+ * ```php
+ * $my_html = Purifier::process($my_text, array(
+ *     'Attr.EnableID' => true,
+ * ));
+ * ```
+ *
+ * For more details please refer to HTMLPurifier documentation](http://htmlpurifier.org/).
+ *
+ * @author Alexander Makarov <sam@rmcreative.ru>
+ * @since 2.0
+ */
+class Purifier
+{
+	public static function process($content, $config = null)
+	{
+		$purifier=\HTMLPurifier::instance($config);
+		$purifier->config->set('Cache.SerializerPath', \Yii::$app->getRuntimePath());
+		return $purifier->purify($content);
+	}
+}

From 92ec41cc7bdb499a029ab73b12ffff2f4561d662 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Wed, 8 May 2013 01:30:08 +0400
Subject: [PATCH 084/152] Moved Composer vendor dir into framework

---
 .gitignore                          | 2 +-
 composer.json                       | 3 +++
 composer.lock                       | 2 +-
 framework/helpers/base/Markdown.php | 2 +-
 framework/helpers/base/Purifier.php | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9291d3e..d8b54c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,4 @@ nbproject
 Thumbs.db
 
 # composer vendor dir
-vendor
\ No newline at end of file
+/framework/vendor
\ No newline at end of file
diff --git a/composer.json b/composer.json
index b797b2f..c6b616a 100644
--- a/composer.json
+++ b/composer.json
@@ -63,6 +63,9 @@
 		"irc": "irc://irc.freenode.net/yii",
 		"source": "https://github.com/yiisoft/yii2"
 	},
+	"config": {
+		"vendor-dir": "framework/vendor"
+	},
 	"bin": [
 		"framework/yiic"
 	],
diff --git a/composer.lock b/composer.lock
index c269cf3..1cae3d4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3,7 +3,7 @@
         "This file locks the dependencies of your project to a known state",
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
     ],
-    "hash": "8036953eff9eafbdbd4c431929a1d223",
+    "hash": "7d46ce9c4d8d5f4ecae1611ea8f0b49c",
     "packages": [
         {
             "name": "ezyang/htmlpurifier",
diff --git a/framework/helpers/base/Markdown.php b/framework/helpers/base/Markdown.php
index 562403f..58987d3 100644
--- a/framework/helpers/base/Markdown.php
+++ b/framework/helpers/base/Markdown.php
@@ -7,7 +7,7 @@
 
 namespace yii\helpers\base;
 
-\Yii::setAlias('@Michelf', \Yii::getAlias('@yii').'/../vendor/michelf/php-markdown/Michelf');
+\Yii::setAlias('@Michelf', \Yii::getAlias('@yii/vendor/michelf/php-markdown/Michelf'));
 use Michelf\MarkdownExtra;
 
 /**
diff --git a/framework/helpers/base/Purifier.php b/framework/helpers/base/Purifier.php
index cc4ab12..1342374 100644
--- a/framework/helpers/base/Purifier.php
+++ b/framework/helpers/base/Purifier.php
@@ -7,7 +7,7 @@
 namespace yii\helpers\base;
 
 if (!class_exists('HTMLPurifier_Bootstrap', false)) {
-	require_once(\Yii::getAlias('@yii').'/../vendor/ezyang/htmlpurifier/library'.DIRECTORY_SEPARATOR.'HTMLPurifier.auto.php');
+	require_once(\Yii::getAlias('@yii/vendor/ezyang/htmlpurifier/library/HTMLPurifier.auto.php'));
 }
 
 /**

From 6faf8344a9654e92039d87c4105259c2c3f9a202 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Tue, 7 May 2013 23:38:54 +0200
Subject: [PATCH 085/152] Spaces -> Tabs

---
 framework/helpers/Console.php      |    3 +-
 framework/helpers/base/Console.php | 1721 ++++++++++++++++++------------------
 2 files changed, 862 insertions(+), 862 deletions(-)

diff --git a/framework/helpers/Console.php b/framework/helpers/Console.php
index 4851ed3..0055107 100644
--- a/framework/helpers/Console.php
+++ b/framework/helpers/Console.php
@@ -7,9 +7,8 @@
 
 namespace yii\helpers;
 
-// todo test this on all kinds of terminals, especially windows (check out lib ncurses)
-
 /**
+ * TODO adjust phpdoc
  * Console View is the base class for console view components
  *
  * A console view provides functionality to create rich console application by allowing to format output
diff --git a/framework/helpers/base/Console.php b/framework/helpers/base/Console.php
index b608d8e..08f7d6a 100644
--- a/framework/helpers/base/Console.php
+++ b/framework/helpers/base/Console.php
@@ -7,9 +7,10 @@
 
 namespace yii\helpers\base;
 
-// todo test this on all kinds of terminals, especially windows (check out lib ncurses)
-
 /**
+ * TODO adjust phpdoc
+ * TODO test this on all kinds of terminals, especially windows (check out lib ncurses)
+ *
  * Console View is the base class for console view components
  *
  * A console view provides functionality to create rich console application by allowing to format output
@@ -20,862 +21,862 @@ namespace yii\helpers\base;
  */
 class Console
 {
-    const FG_BLACK  = 30;
-    const FG_RED    = 31;
-    const FG_GREEN  = 32;
-    const FG_YELLOW = 33;
-    const FG_BLUE   = 34;
-    const FG_PURPLE = 35;
-    const FG_CYAN   = 36;
-    const FG_GREY   = 37;
-
-    const BG_BLACK  = 40;
-    const BG_RED    = 41;
-    const BG_GREEN  = 42;
-    const BG_YELLOW = 43;
-    const BG_BLUE   = 44;
-    const BG_PURPLE = 45;
-    const BG_CYAN   = 46;
-    const BG_GREY   = 47;
-
-    const NORMAL      = 0;
-    const BOLD        = 1;
-    const ITALIC      = 3;
-    const UNDERLINE   = 4;
-    const BLINK       = 5;
-    const NEGATIVE    = 7;
-    const CONCEALED   = 8;
-    const CROSSED_OUT = 9;
-    const FRAMED      = 51;
-    const ENCIRCLED   = 52;
-    const OVERLINED   = 53;
-
-    /**
-     * Moves the terminal cursor up by sending ANSI control code CUU to the terminal.
-     * If the cursor is already at the edge of the screen, this has no effect.
-     * @param integer $rows number of rows the cursor should be moved up
-     */
-    public static function moveCursorUp($rows = 1)
-    {
-        echo "\033[" . (int)$rows . 'A';
-    }
-
-    /**
-     * Moves the terminal cursor down by sending ANSI control code CUD to the terminal.
-     * If the cursor is already at the edge of the screen, this has no effect.
-     * @param integer $rows number of rows the cursor should be moved down
-     */
-    public static function moveCursorDown($rows = 1)
-    {
-        echo "\033[" . (int)$rows . 'B';
-    }
-
-    /**
-     * Moves the terminal cursor forward by sending ANSI control code CUF to the terminal.
-     * If the cursor is already at the edge of the screen, this has no effect.
-     * @param integer $steps number of steps the cursor should be moved forward
-     */
-    public static function moveCursorForward($steps = 1)
-    {
-        echo "\033[" . (int)$steps . 'C';
-    }
-
-    /**
-     * Moves the terminal cursor backward by sending ANSI control code CUB to the terminal.
-     * If the cursor is already at the edge of the screen, this has no effect.
-     * @param integer $steps number of steps the cursor should be moved backward
-     */
-    public static function moveCursorBackward($steps = 1)
-    {
-        echo "\033[" . (int)$steps . 'D';
-    }
-
-    /**
-     * Moves the terminal cursor to the beginning of the next line by sending ANSI control code CNL to the terminal.
-     * @param integer $lines number of lines the cursor should be moved down
-     */
-    public static function moveCursorNextLine($lines = 1)
-    {
-        echo "\033[" . (int)$lines . 'E';
-    }
-
-    /**
-     * Moves the terminal cursor to the beginning of the previous line by sending ANSI control code CPL to the terminal.
-     * @param integer $lines number of lines the cursor should be moved up
-     */
-    public static function moveCursorPrevLine($lines = 1)
-    {
-        echo "\033[" . (int)$lines . 'F';
-    }
-
-    /**
-     * Moves the cursor to an absolute position given as column and row by sending ANSI control code CUP or CHA to the terminal.
-     * @param integer $column 1-based column number, 1 is the left edge of the screen.
-     * @param integer|null $row 1-based row number, 1 is the top edge of the screen. if not set, will move cursor only in current line.
-     */
-    public static function moveCursorTo($column, $row = null)
-    {
-        if ($row === null) {
-            echo "\033[" . (int)$column . 'G';
-        } else {
-            echo "\033[" . (int)$row . ';' . (int)$column . 'H';
-        }
-    }
-
-    /**
-     * Scrolls whole page up by sending ANSI control code SU to the terminal.
-     * New lines are added at the bottom. This is not supported by ANSI.SYS used in windows.
-     * @param int $lines number of lines to scroll up
-     */
-    public static function scrollUp($lines = 1)
-    {
-        echo "\033[" . (int)$lines . "S";
-    }
-
-    /**
-     * Scrolls whole page down by sending ANSI control code SD to the terminal.
-     * New lines are added at the top. This is not supported by ANSI.SYS used in windows.
-     * @param int $lines number of lines to scroll down
-     */
-    public static function scrollDown($lines = 1)
-    {
-        echo "\033[" . (int)$lines . "T";
-    }
-
-    /**
-     * Saves the current cursor position by sending ANSI control code SCP to the terminal.
-     * Position can then be restored with {@link restoreCursorPosition}.
-     */
-    public static function saveCursorPosition()
-    {
-        echo "\033[s";
-    }
-
-    /**
-     * Restores the cursor position saved with {@link saveCursorPosition} by sending ANSI control code RCP to the terminal.
-     */
-    public static function restoreCursorPosition()
-    {
-        echo "\033[u";
-    }
-
-    /**
-     * Hides the cursor by sending ANSI DECTCEM code ?25l to the terminal.
-     * Use {@link showCursor} to bring it back.
-     * Do not forget to show cursor when your application exits. Cursor might stay hidden in terminal after exit.
-     */
-    public static function hideCursor()
-    {
-        echo "\033[?25l";
-    }
-
-    /**
-     * Will show a cursor again when it has been hidden by {@link hideCursor}  by sending ANSI DECTCEM code ?25h to the terminal.
-     */
-    public static function showCursor()
-    {
-        echo "\033[?25h";
-    }
-
-    /**
-     * Clears entire screen content by sending ANSI control code ED with argument 2 to the terminal.
-     * Cursor position will not be changed.
-     * **Note:** ANSI.SYS implementation used in windows will reset cursor position to upper left corner of the screen.
-     */
-    public static function clearScreen()
-    {
-        echo "\033[2J";
-    }
-
-    /**
-     * Clears text from cursor to the beginning of the screen by sending ANSI control code ED with argument 1 to the terminal.
-     * Cursor position will not be changed.
-     */
-    public static function clearScreenBeforeCursor()
-    {
-        echo "\033[1J";
-    }
-
-    /**
-     * Clears text from cursor to the end of the screen by sending ANSI control code ED with argument 0 to the terminal.
-     * Cursor position will not be changed.
-     */
-    public static function clearScreenAfterCursor()
-    {
-        echo "\033[0J";
-    }
-
-    /**
-     * Clears the line, the cursor is currently on by sending ANSI control code EL with argument 2 to the terminal.
-     * Cursor position will not be changed.
-     */
-    public static function clearLine()
-    {
-        echo "\033[2K";
-    }
-
-    /**
-     * Clears text from cursor position to the beginning of the line by sending ANSI control code EL with argument 1 to the terminal.
-     * Cursor position will not be changed.
-     */
-    public static function clearLineBeforeCursor()
-    {
-        echo "\033[1K";
-    }
-
-    /**
-     * Clears text from cursor position to the end of the line by sending ANSI control code EL with argument 0 to the terminal.
-     * Cursor position will not be changed.
-     */
-    public static function clearLineAfterCursor()
-    {
-        echo "\033[0K";
-    }
-
-    /**
-     * Will send ANSI format for following output
-     *
-     * You can pass any of the FG_*, BG_* and TEXT_* constants and also xterm256ColorBg
-     * TODO: documentation
-     */
-    public static function ansiStyle()
-    {
-        echo "\033[" . implode(';', func_get_args()) . 'm';
-    }
-
-    /**
-     * Will return a string formatted with the given ANSI style
-     *
-     * See {@link ansiStyle} for possible arguments.
-     * @param string $string the string to be formatted
-     * @return string
-     */
-    public static function ansiStyleString($string)
-    {
-        $args = func_get_args();
-        array_shift($args);
-        $code = implode(';', $args);
-        return "\033[0m" . ($code !== '' ? "\033[" . $code . "m" : '') . $string . "\033[0m";
-    }
-
-    //const COLOR_XTERM256 = 38;// http://en.wikipedia.org/wiki/Talk:ANSI_escape_code#xterm-256colors
-    public static function xterm256ColorFg($i) // TODO naming!
-    {
-        return '38;5;' . $i;
-    }
-
-    public static function xterm256ColorBg($i) // TODO naming!
-    {
-        return '48;5;' . $i;
-    }
-
-    /**
-     * Usage: list($w, $h) = ConsoleHelper::getScreenSize();
-     *
-     * @return array
-     */
-    public static function getScreenSize()
-    {
-        // TODO implement
-        return array(150, 50);
-    }
-
-    /**
-     * resets any ansi style set by previous method {@link ansiStyle}
-     * Any output after this is will have default text style.
-     */
-    public static function reset()
-    {
-        echo "\033[0m";
-    }
-
-    /**
-     * Strips ANSI control codes from a string
-     *
-     * @param string $string String to strip
-     * @return string
-     */
-    public static function strip($string)
-    {
-        return preg_replace('/\033\[[\d;]+m/', '', $string); // TODO currently only strips color
-    }
-
-    // TODO refactor and review
-    public static function ansiToHtml($string)
-    {
-        $tags = 0;
-        return preg_replace_callback(
-            '/\033\[[\d;]+m/',
-            function ($ansi) use (&$tags) {
-                $styleA = array();
-                foreach (explode(';', $ansi) as $controlCode) {
-                    switch ($controlCode) {
-                        case static::FG_BLACK:
-                            $style = array('color' => '#000000');
-                            break;
-                        case static::FG_BLUE:
-                            $style = array('color' => '#000078');
-                            break;
-                        case static::FG_CYAN:
-                            $style = array('color' => '#007878');
-                            break;
-                        case static::FG_GREEN:
-                            $style = array('color' => '#007800');
-                            break;
-                        case static::FG_GREY:
-                            $style = array('color' => '#787878');
-                            break;
-                        case static::FG_PURPLE:
-                            $style = array('color' => '#780078');
-                            break;
-                        case static::FG_RED:
-                            $style = array('color' => '#780000');
-                            break;
-                        case static::FG_YELLOW:
-                            $style = array('color' => '#787800');
-                            break;
-                        case static::BG_BLACK:
-                            $style = array('background-color' => '#000000');
-                            break;
-                        case static::BG_BLUE:
-                            $style = array('background-color' => '#000078');
-                            break;
-                        case static::BG_CYAN:
-                            $style = array('background-color' => '#007878');
-                            break;
-                        case static::BG_GREEN:
-                            $style = array('background-color' => '#007800');
-                            break;
-                        case static::BG_GREY:
-                            $style = array('background-color' => '#787878');
-                            break;
-                        case static::BG_PURPLE:
-                            $style = array('background-color' => '#780078');
-                            break;
-                        case static::BG_RED:
-                            $style = array('background-color' => '#780000');
-                            break;
-                        case static::BG_YELLOW:
-                            $style = array('background-color' => '#787800');
-                            break;
-                        case static::BOLD:
-                            $style = array('font-weight' => 'bold');
-                            break;
-                        case static::ITALIC:
-                            $style = array('font-style' => 'italic');
-                            break;
-                        case static::UNDERLINE:
-                            $style = array('text-decoration' => array('underline'));
-                            break;
-                        case static::OVERLINED:
-                            $style = array('text-decoration' => array('overline'));
-                            break;
-                        case static::CROSSED_OUT:
-                            $style = array('text-decoration' => array('line-through'));
-                            break;
-                        case static::BLINK:
-                            $style = array('text-decoration' => array('blink'));
-                            break;
-                        case static::NEGATIVE: // ???
-                        case static::CONCEALED:
-                        case static::ENCIRCLED:
-                        case static::FRAMED:
-                            // TODO allow resetting codes
-                            break;
-                        case 0: // ansi reset
-                            $return = '';
-                            for ($n = $tags; $tags > 0; $tags--) {
-                                $return .= '</span>';
-                            }
-                            return $return;
-                    }
-
-                    $styleA = ArrayHelper::merge($styleA, $style);
-                }
-                $styleString[] = array();
-                foreach ($styleA as $name => $content) {
-                    if ($name === 'text-decoration') {
-                        $content = implode(' ', $content);
-                    }
-                    $styleString[] = $name . ':' . $content;
-                }
-                $tags++;
-                return '<span' . (!empty($styleString) ? 'style="' . implode(';', $styleString) : '') . '>';
-            },
-            $string
-        );
-    }
-
-    /**
-     *
-     * Returns an ANSI-Controlcode
-     *
-     * Takes 1 to 3 Arguments: either 1 to 3 strings containing the name of the
-     * FG Color, style and BG color, or one array with the indices color, style
-     * or background.
-     *
-     * @param mixed  $color      Optional.
-     *                           Either a string with the name of the foreground
-     *                           color, or an array with the indices 'color',
-     *                           'style', 'background' and corresponding names as
-     *                           values.
-     * @param string $style      Optional name of the style
-     * @param string $background Optional name of the background color
-     *
-     * @return string
-     */
-    public function color($color = null, $style = null, $background = null) // {{{
-    {
-        $colors = static::getColorCodes();
-
-        if (is_array($color)) {
-            $style      = isset($color['style']) ? $color['style'] : null;
-            $background = isset($color['background']) ? $color['background'] : null;
-            $color      = isset($color['color']) ? $color['color'] : null;
-        }
-
-        if ($color == 'reset') {
-            return "\033[0m";
-        }
-
-        $code = array();
-        if (isset($style)) {
-            $code[] = $colors['style'][$style];
-        }
-
-        if (isset($color)) {
-            $code[] = $colors['color'][$color];
-        }
-
-        if (isset($background)) {
-            $code[] = $colors['background'][$background];
-        }
-
-        if (empty($code)) {
-            $code[] = 0;
-        }
-        $code = implode(';', $code);
-        return "\033[{$code}m";
-    }
-
-    /**
-     * TODO syntax copied from https://github.com/pear/Console_Color2/blob/master/Console/Color2.php
-     *
-     * Converts colorcodes in the format %y (for yellow) into ansi-control
-     * codes. The conversion table is: ('bold' meaning 'light' on some
-     * terminals). It's almost the same conversion table irssi uses.
-     * <pre>
-     *                  text      text            background
-     *      ------------------------------------------------
-     *      %k %K %0    black     dark grey       black
-     *      %r %R %1    red       bold red        red
-     *      %g %G %2    green     bold green      green
-     *      %y %Y %3    yellow    bold yellow     yellow
-     *      %b %B %4    blue      bold blue       blue
-     *      %m %M %5    magenta   bold magenta    magenta
-     *      %p %P       magenta (think: purple)
-     *      %c %C %6    cyan      bold cyan       cyan
-     *      %w %W %7    white     bold white      white
-     *
-     *      %F     Blinking, Flashing
-     *      %U     Underline
-     *      %8     Reverse
-     *      %_,%9  Bold
-     *
-     *      %n     Resets the color
-     *      %%     A single %
-     * </pre>
-     * First param is the string to convert, second is an optional flag if
-     * colors should be used. It defaults to true, if set to false, the
-     * colorcodes will just be removed (And %% will be transformed into %)
-     *
-     * @param string $string  String to convert
-     * @param bool   $colored Should the string be colored?
-     *
-     * @return string
-     */
-    public static function renderColoredString($string, $colored = true)
-    {
-        static $conversions = array( // static so the array doesn't get built
-            // everytime
-            // %y - yellow, and so on... {{{
-            '%y' => array('color' => 'yellow'),
-            '%g' => array('color' => 'green'),
-            '%b' => array('color' => 'blue'),
-            '%r' => array('color' => 'red'),
-            '%p' => array('color' => 'purple'),
-            '%m' => array('color' => 'purple'),
-            '%c' => array('color' => 'cyan'),
-            '%w' => array('color' => 'grey'),
-            '%k' => array('color' => 'black'),
-            '%n' => array('color' => 'reset'),
-            '%Y' => array('color' => 'yellow', 'style' => 'light'),
-            '%G' => array('color' => 'green', 'style' => 'light'),
-            '%B' => array('color' => 'blue', 'style' => 'light'),
-            '%R' => array('color' => 'red', 'style' => 'light'),
-            '%P' => array('color' => 'purple', 'style' => 'light'),
-            '%M' => array('color' => 'purple', 'style' => 'light'),
-            '%C' => array('color' => 'cyan', 'style' => 'light'),
-            '%W' => array('color' => 'grey', 'style' => 'light'),
-            '%K' => array('color' => 'black', 'style' => 'light'),
-            '%N' => array('color' => 'reset', 'style' => 'light'),
-            '%3' => array('background' => 'yellow'),
-            '%2' => array('background' => 'green'),
-            '%4' => array('background' => 'blue'),
-            '%1' => array('background' => 'red'),
-            '%5' => array('background' => 'purple'),
-            '%6' => array('background' => 'cyan'),
-            '%7' => array('background' => 'grey'),
-            '%0' => array('background' => 'black'),
-            // Don't use this, I can't stand flashing text
-            '%F' => array('style' => 'blink'),
-            '%U' => array('style' => 'underline'),
-            '%8' => array('style' => 'inverse'),
-            '%9' => array('style' => 'bold'),
-            '%_' => array('style' => 'bold')
-            // }}}
-        );
-
-        if ($colored) {
-            $string = str_replace('%%', '% ', $string);
-            foreach ($conversions as $key => $value) {
-                $string = str_replace(
-                    $key,
-                    static::color($value),
-                    $string
-                );
-            }
-            $string = str_replace('% ', '%', $string);
-
-        } else {
-            $string = preg_replace('/%((%)|.)/', '$2', $string);
-        }
-
-        return $string;
-    }
-
-    /**
-     * Returns the different foreground and background color codes and styles available.
-     * @return array the color codes
-     */
-    public static function getColorCodes()
-    {
-        return array(
-            'color'      => array(
-                'black'  => static::FG_BLACK,
-                'red'    => static::FG_RED,
-                'green'  => static::FG_GREEN,
-                'yellow' => static::FG_YELLOW,
-                'blue'   => static::FG_BLUE,
-                'purple' => static::FG_PURPLE,
-                'cyan'   => static::FG_CYAN,
-                'grey'   => static::FG_GREY,
-            ),
-            'style'      => array(
-                'normal'      => static::NORMAL,
-                'bold'        => static::BOLD,
-                'italic'      => static::ITALIC,
-                'underline'   => static::UNDERLINE,
-                'blink'       => static::BLINK,
-                'negative'    => static::NEGATIVE,
-                'concealed'   => static::CONCEALED,
-                'crossed_out' => static::CROSSED_OUT,
-                'framed'      => static::FRAMED,
-                'encircled'   => static::ENCIRCLED,
-                'overlined'   => static::OVERLINED
-            ),
-            'background' => array(
-                'black'  => static::BG_BLACK,
-                'red'    => static::BG_RED,
-                'green'  => static::BG_RED,
-                'yellow' => static::BG_YELLOW,
-                'blue'   => static::BG_BLUE,
-                'purple' => static::BG_PURPLE,
-                'cyan'   => static::BG_CYAN,
-                'grey'   => static::BG_GREY
-            )
-        );
-    }
-
-    /**
-     * Escapes % so they don't get interpreted as color codes
-     *
-     * @param string $string String to escape
-     *
-     * @access public
-     * @return string
-     */
-    public static function escape($string)
-    {
-        return str_replace('%', '%%', $string);
-    }
-
-    /**
-     * Returns true if the stream supports colorization. ANSI colors is disabled if not supported by the stream.
-     *
-     * - windows without asicon
-     * - not tty consoles
-     *
-     * @param mixed $stream
-     * @return bool true if the stream supports ANSI colors, otherwise false.
-     */
-    public static function streamSupportsAnsiColors($stream)
-    {
-        return DIRECTORY_SEPARATOR == '\\'
-            ? null !== getenv('ANSICON')
-            : function_exists('posix_isatty') && @posix_isatty($stream);
-    }
-
-    /**
-     * Returns true if the console is running on windows
-     * @return bool
-     */
-    public static function isRunningOnWindows()
-    {
-        return strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
-    }
-
-    /**
-     * Gets input from STDIN and returns a string right-trimmed for EOLs.
-     *
-     * @param bool $raw If set to true, returns the raw string without trimming
-     *
-     * @return string
-     */
-    public static function stdin($raw = false)
-    {
-        return $raw ? fgets(STDIN) : rtrim(fgets(STDIN), PHP_EOL);
-    }
-
-    /**
-     * Prints text to STDOUT.
-     *
-     * @param string $text
-     * @param bool   $raw
-     *
-     * @return int|false Number of bytes printed or false on error
-     */
-    public static function stdout($text, $raw = false)
-    {
-        if ($raw) {
-            return fwrite(STDOUT, $text);
-        } elseif (static::streamSupportsAnsiColors(STDOUT)) {
-            return fwrite(STDOUT, static::renderColoredString($text));
-        } else {
-            return fwrite(STDOUT, static::renderColoredString($text, false));
-        }
-    }
-
-    /**
-     * Prints text to STDERR.
-     *
-     * @param string $text
-     * @param bool   $raw
-     *
-     * @return mixed Number of bytes printed or bool false on error.
-     */
-    public static function stderr($text, $raw = false)
-    {
-        if ($raw) {
-            return fwrite(STDERR, $text);
-        } elseif (static::streamSupportsAnsiColors(STDERR)) {
-            return fwrite(STDERR, static::renderColoredString($text));
-        } else {
-            return fwrite(STDERR, static::renderColoredString($text, false));
-        }
-    }
-
-    /**
-     * Prints text to STDERR appended with a carriage return (PHP_EOL).
-     *
-     * @param string $text
-     * @param bool   $raw
-     *
-     * @return mixed Number of bytes printed or false on error
-     */
-    public static function error($text = null, $raw = false)
-    {
-        return static::stderr($text . PHP_EOL, $raw);
-    }
-
-    /**
-     * Asks the user for input. Ends when the user types a carriage return (PHP_EOL). Optionally, It also provides a
-     * prompt.
-     *
-     * @param string $prompt the prompt (optional)
-     * @return string the user's input
-     */
-    public static function input($prompt = null)
-    {
-        if (isset($prompt)) {
-            static::stdout($prompt);
-        }
-        return static::stdin();
-    }
-
-    /**
-     * Prints text to STDOUT appended with a carriage return (PHP_EOL).
-     *
-     * @param string $text
-     * @param bool $raw
-     *
-     * @return mixed Number of bytes printed or bool false on error
-     */
-    public static function output($text = null, $raw = false)
-    {
-        return static::stdout($text . PHP_EOL, $raw);
-    }
-
-    /**
-     * Prompts the user for input and validates it
-     *
-     * @param string $text prompt string
-     * @param array $options the options to validate the input:
-     *  - required: whether it is required or not
-     *  - default: default value if no input is inserted by the user
-     *  - pattern: regular expression pattern to validate user input
-     *  - validator: a callable function to validate input. The function must accept two parameters:
-     *      - $input: the user input to validate
-     *      - $error: the error value passed by reference if validation failed.
-     * @return string the user input
-     */
-    public static function prompt($text, $options = array())
-    {
-        $options = ArrayHelper::merge(
-            $options,
-            array(
-                'required'  => false,
-                'default'   => null,
-                'pattern'   => null,
-                'validator' => null,
-                'error'     => 'Invalid input.',
-            )
-        );
-        $error   = null;
-
-        top:
-        $input = $options['default']
-            ? static::input("$text [" . $options['default'] . ']: ')
-            : static::input("$text: ");
-
-        if (!strlen($input)) {
-            if (isset($options['default'])) {
-                $input = $options['default'];
-            } elseif ($options['required']) {
-                static::output($options['error']);
-                goto top;
-            }
-        } elseif ($options['pattern'] && !preg_match($options['pattern'], $input)) {
-            static::output($options['error']);
-            goto top;
-        } elseif ($options['validator'] &&
-            !call_user_func_array($options['validator'], array($input, &$error))
-        ) {
-            static::output(isset($error) ? $error : $options['error']);
-            goto top;
-        }
-
-        return $input;
-    }
-
-    /**
-     * Asks the user for a simple yes/no confirmation.
-     *
-     * @param string $prompt the prompt string
-     *
-     * @return bool true or false according to user input.
-     */
-    public static function confirm($prompt)
-    {
-        top:
-        $input = strtolower(static::input("$prompt [y/n]: "));
-        if (!in_array(substr($input, 0, 1), array('y', 'n'))) {
-            static::output("Please, type 'y' or 'n'");
-            goto top;
-        }
-        return $input === 'y' ? true : false;
-    }
-
-    /**
-     * Gives the user an option to choose from. Giving '?' as an input will show
-     * a list of options to choose from and their explanations.
-     *
-     * @param string $prompt the prompt message
-     * @param array  $options Key-value array of options to choose from
-     *
-     * @return string An option character the user chose
-     */
-    public static function select($prompt, $options = array())
-    {
-        top:
-        static::stdout("$prompt [" . implode(',', array_keys($options)) . ",?]: ");
-        $input = static::stdin();
-        if ($input === '?') {
-            foreach ($options as $key => $value) {
-                echo " $key - $value\n";
-            }
-            echo " ? - Show help\n";
-            goto top;
-        } elseif (!in_array($input, array_keys($options))) {
-            goto top;
-        }
-        return $input;
-    }
-
-    /**
-     * Displays and updates a simple progress bar on screen.
-     *
-     * @param $done the number of items that are completed
-     * @param $total the total value of items that are to be done
-     * @param int $size the size of the status bar (optional)
-     * @see http://snipplr.com/view/29548/
-     */
-    public static function showProgress($done, $total, $size = 30)
-    {
-        static $start;
-
-        // if we go over our bound, just ignore it
-        if ($done > $total) {
-            return;
-        }
-
-        if (empty($start)) {
-            $start = time();
-        }
-
-        $now = time();
-
-        $percent = (double)($done / $total);
-        $bar     = floor($percent * $size);
-
-        $status = "\r[";
-        $status .= str_repeat("=", $bar);
-        if ($bar < $size) {
-            $status .= ">";
-            $status .= str_repeat(" ", $size - $bar);
-        } else {
-            $status .= "=";
-        }
-
-        $display = number_format($percent * 100, 0);
-
-        $status .= "] $display%  $done/$total";
-
-        $rate = ($now - $start) / $done;
-        $left = $total - $done;
-        $eta  = round($rate * $left, 2);
-
-        $elapsed = $now - $start;
-
-        $status .= " remaining: " . number_format($eta) . " sec.  elapsed: " . number_format($elapsed) . " sec.";
-
-        static::stdout("$status  ");
-
-        flush();
-
-        // when done, send a newline
-        if ($done == $total) {
-            echo "\n";
-        }
-    }
+	const FG_BLACK  = 30;
+	const FG_RED    = 31;
+	const FG_GREEN  = 32;
+	const FG_YELLOW = 33;
+	const FG_BLUE   = 34;
+	const FG_PURPLE = 35;
+	const FG_CYAN   = 36;
+	const FG_GREY   = 37;
+
+	const BG_BLACK  = 40;
+	const BG_RED    = 41;
+	const BG_GREEN  = 42;
+	const BG_YELLOW = 43;
+	const BG_BLUE   = 44;
+	const BG_PURPLE = 45;
+	const BG_CYAN   = 46;
+	const BG_GREY   = 47;
+
+	const NORMAL      = 0;
+	const BOLD        = 1;
+	const ITALIC      = 3;
+	const UNDERLINE   = 4;
+	const BLINK       = 5;
+	const NEGATIVE    = 7;
+	const CONCEALED   = 8;
+	const CROSSED_OUT = 9;
+	const FRAMED      = 51;
+	const ENCIRCLED   = 52;
+	const OVERLINED   = 53;
+
+	/**
+	 * Moves the terminal cursor up by sending ANSI control code CUU to the terminal.
+	 * If the cursor is already at the edge of the screen, this has no effect.
+	 * @param integer $rows number of rows the cursor should be moved up
+	 */
+	public static function moveCursorUp($rows = 1)
+	{
+		echo "\033[" . (int)$rows . 'A';
+	}
+
+	/**
+	 * Moves the terminal cursor down by sending ANSI control code CUD to the terminal.
+	 * If the cursor is already at the edge of the screen, this has no effect.
+	 * @param integer $rows number of rows the cursor should be moved down
+	 */
+	public static function moveCursorDown($rows = 1)
+	{
+		echo "\033[" . (int)$rows . 'B';
+	}
+
+	/**
+	 * Moves the terminal cursor forward by sending ANSI control code CUF to the terminal.
+	 * If the cursor is already at the edge of the screen, this has no effect.
+	 * @param integer $steps number of steps the cursor should be moved forward
+	 */
+	public static function moveCursorForward($steps = 1)
+	{
+		echo "\033[" . (int)$steps . 'C';
+	}
+
+	/**
+	 * Moves the terminal cursor backward by sending ANSI control code CUB to the terminal.
+	 * If the cursor is already at the edge of the screen, this has no effect.
+	 * @param integer $steps number of steps the cursor should be moved backward
+	 */
+	public static function moveCursorBackward($steps = 1)
+	{
+		echo "\033[" . (int)$steps . 'D';
+	}
+
+	/**
+	 * Moves the terminal cursor to the beginning of the next line by sending ANSI control code CNL to the terminal.
+	 * @param integer $lines number of lines the cursor should be moved down
+	 */
+	public static function moveCursorNextLine($lines = 1)
+	{
+		echo "\033[" . (int)$lines . 'E';
+	}
+
+	/**
+	 * Moves the terminal cursor to the beginning of the previous line by sending ANSI control code CPL to the terminal.
+	 * @param integer $lines number of lines the cursor should be moved up
+	 */
+	public static function moveCursorPrevLine($lines = 1)
+	{
+		echo "\033[" . (int)$lines . 'F';
+	}
+
+	/**
+	 * Moves the cursor to an absolute position given as column and row by sending ANSI control code CUP or CHA to the terminal.
+	 * @param integer $column 1-based column number, 1 is the left edge of the screen.
+	 * @param integer|null $row 1-based row number, 1 is the top edge of the screen. if not set, will move cursor only in current line.
+	 */
+	public static function moveCursorTo($column, $row = null)
+	{
+		if ($row === null) {
+			echo "\033[" . (int)$column . 'G';
+		} else {
+			echo "\033[" . (int)$row . ';' . (int)$column . 'H';
+		}
+	}
+
+	/**
+	 * Scrolls whole page up by sending ANSI control code SU to the terminal.
+	 * New lines are added at the bottom. This is not supported by ANSI.SYS used in windows.
+	 * @param int $lines number of lines to scroll up
+	 */
+	public static function scrollUp($lines = 1)
+	{
+		echo "\033[" . (int)$lines . "S";
+	}
+
+	/**
+	 * Scrolls whole page down by sending ANSI control code SD to the terminal.
+	 * New lines are added at the top. This is not supported by ANSI.SYS used in windows.
+	 * @param int $lines number of lines to scroll down
+	 */
+	public static function scrollDown($lines = 1)
+	{
+		echo "\033[" . (int)$lines . "T";
+	}
+
+	/**
+	 * Saves the current cursor position by sending ANSI control code SCP to the terminal.
+	 * Position can then be restored with {@link restoreCursorPosition}.
+	 */
+	public static function saveCursorPosition()
+	{
+		echo "\033[s";
+	}
+
+	/**
+	 * Restores the cursor position saved with {@link saveCursorPosition} by sending ANSI control code RCP to the terminal.
+	 */
+	public static function restoreCursorPosition()
+	{
+		echo "\033[u";
+	}
+
+	/**
+	 * Hides the cursor by sending ANSI DECTCEM code ?25l to the terminal.
+	 * Use {@link showCursor} to bring it back.
+	 * Do not forget to show cursor when your application exits. Cursor might stay hidden in terminal after exit.
+	 */
+	public static function hideCursor()
+	{
+		echo "\033[?25l";
+	}
+
+	/**
+	 * Will show a cursor again when it has been hidden by {@link hideCursor}  by sending ANSI DECTCEM code ?25h to the terminal.
+	 */
+	public static function showCursor()
+	{
+		echo "\033[?25h";
+	}
+
+	/**
+	 * Clears entire screen content by sending ANSI control code ED with argument 2 to the terminal.
+	 * Cursor position will not be changed.
+	 * **Note:** ANSI.SYS implementation used in windows will reset cursor position to upper left corner of the screen.
+	 */
+	public static function clearScreen()
+	{
+		echo "\033[2J";
+	}
+
+	/**
+	 * Clears text from cursor to the beginning of the screen by sending ANSI control code ED with argument 1 to the terminal.
+	 * Cursor position will not be changed.
+	 */
+	public static function clearScreenBeforeCursor()
+	{
+		echo "\033[1J";
+	}
+
+	/**
+	 * Clears text from cursor to the end of the screen by sending ANSI control code ED with argument 0 to the terminal.
+	 * Cursor position will not be changed.
+	 */
+	public static function clearScreenAfterCursor()
+	{
+		echo "\033[0J";
+	}
+
+	/**
+	 * Clears the line, the cursor is currently on by sending ANSI control code EL with argument 2 to the terminal.
+	 * Cursor position will not be changed.
+	 */
+	public static function clearLine()
+	{
+		echo "\033[2K";
+	}
+
+	/**
+	 * Clears text from cursor position to the beginning of the line by sending ANSI control code EL with argument 1 to the terminal.
+	 * Cursor position will not be changed.
+	 */
+	public static function clearLineBeforeCursor()
+	{
+		echo "\033[1K";
+	}
+
+	/**
+	 * Clears text from cursor position to the end of the line by sending ANSI control code EL with argument 0 to the terminal.
+	 * Cursor position will not be changed.
+	 */
+	public static function clearLineAfterCursor()
+	{
+		echo "\033[0K";
+	}
+
+	/**
+	 * Will send ANSI format for following output
+	 *
+	 * You can pass any of the FG_*, BG_* and TEXT_* constants and also xterm256ColorBg
+	 * TODO: documentation
+	 */
+	public static function ansiStyle()
+	{
+		echo "\033[" . implode(';', func_get_args()) . 'm';
+	}
+
+	/**
+	 * Will return a string formatted with the given ANSI style
+	 *
+	 * See {@link ansiStyle} for possible arguments.
+	 * @param string $string the string to be formatted
+	 * @return string
+	 */
+	public static function ansiStyleString($string)
+	{
+		$args = func_get_args();
+		array_shift($args);
+		$code = implode(';', $args);
+		return "\033[0m" . ($code !== '' ? "\033[" . $code . "m" : '') . $string . "\033[0m";
+	}
+
+	//const COLOR_XTERM256 = 38;// http://en.wikipedia.org/wiki/Talk:ANSI_escape_code#xterm-256colors
+	public static function xterm256ColorFg($i) // TODO naming!
+	{
+		return '38;5;' . $i;
+	}
+
+	public static function xterm256ColorBg($i) // TODO naming!
+	{
+		return '48;5;' . $i;
+	}
+
+	/**
+	 * Usage: list($w, $h) = ConsoleHelper::getScreenSize();
+	 *
+	 * @return array
+	 */
+	public static function getScreenSize()
+	{
+		// TODO implement
+		return array(150, 50);
+	}
+
+	/**
+	 * resets any ansi style set by previous method {@link ansiStyle}
+	 * Any output after this is will have default text style.
+	 */
+	public static function reset()
+	{
+		echo "\033[0m";
+	}
+
+	/**
+	 * Strips ANSI control codes from a string
+	 *
+	 * @param string $string String to strip
+	 * @return string
+	 */
+	public static function strip($string)
+	{
+		return preg_replace('/\033\[[\d;]+m/', '', $string); // TODO currently only strips color
+	}
+
+	// TODO refactor and review
+	public static function ansiToHtml($string)
+	{
+		$tags = 0;
+		return preg_replace_callback(
+			'/\033\[[\d;]+m/',
+			function ($ansi) use (&$tags) {
+				$styleA = array();
+				foreach (explode(';', $ansi) as $controlCode) {
+					switch ($controlCode) {
+						case static::FG_BLACK:
+							$style = array('color' => '#000000');
+							break;
+						case static::FG_BLUE:
+							$style = array('color' => '#000078');
+							break;
+						case static::FG_CYAN:
+							$style = array('color' => '#007878');
+							break;
+						case static::FG_GREEN:
+							$style = array('color' => '#007800');
+							break;
+						case static::FG_GREY:
+							$style = array('color' => '#787878');
+							break;
+						case static::FG_PURPLE:
+							$style = array('color' => '#780078');
+							break;
+						case static::FG_RED:
+							$style = array('color' => '#780000');
+							break;
+						case static::FG_YELLOW:
+							$style = array('color' => '#787800');
+							break;
+						case static::BG_BLACK:
+							$style = array('background-color' => '#000000');
+							break;
+						case static::BG_BLUE:
+							$style = array('background-color' => '#000078');
+							break;
+						case static::BG_CYAN:
+							$style = array('background-color' => '#007878');
+							break;
+						case static::BG_GREEN:
+							$style = array('background-color' => '#007800');
+							break;
+						case static::BG_GREY:
+							$style = array('background-color' => '#787878');
+							break;
+						case static::BG_PURPLE:
+							$style = array('background-color' => '#780078');
+							break;
+						case static::BG_RED:
+							$style = array('background-color' => '#780000');
+							break;
+						case static::BG_YELLOW:
+							$style = array('background-color' => '#787800');
+							break;
+						case static::BOLD:
+							$style = array('font-weight' => 'bold');
+							break;
+						case static::ITALIC:
+							$style = array('font-style' => 'italic');
+							break;
+						case static::UNDERLINE:
+							$style = array('text-decoration' => array('underline'));
+							break;
+						case static::OVERLINED:
+							$style = array('text-decoration' => array('overline'));
+							break;
+						case static::CROSSED_OUT:
+							$style = array('text-decoration' => array('line-through'));
+							break;
+						case static::BLINK:
+							$style = array('text-decoration' => array('blink'));
+							break;
+						case static::NEGATIVE: // ???
+						case static::CONCEALED:
+						case static::ENCIRCLED:
+						case static::FRAMED:
+							// TODO allow resetting codes
+							break;
+						case 0: // ansi reset
+							$return = '';
+							for ($n = $tags; $tags > 0; $tags--) {
+								$return .= '</span>';
+							}
+							return $return;
+					}
+
+					$styleA = ArrayHelper::merge($styleA, $style);
+				}
+				$styleString[] = array();
+				foreach ($styleA as $name => $content) {
+					if ($name === 'text-decoration') {
+						$content = implode(' ', $content);
+					}
+					$styleString[] = $name . ':' . $content;
+				}
+				$tags++;
+				return '<span' . (!empty($styleString) ? 'style="' . implode(';', $styleString) : '') . '>';
+			},
+			$string
+		);
+	}
+
+	/**
+	 *
+	 * Returns an ANSI-Controlcode
+	 *
+	 * Takes 1 to 3 Arguments: either 1 to 3 strings containing the name of the
+	 * FG Color, style and BG color, or one array with the indices color, style
+	 * or background.
+	 *
+	 * @param mixed  $color      Optional.
+	 *                           Either a string with the name of the foreground
+	 *                           color, or an array with the indices 'color',
+	 *                           'style', 'background' and corresponding names as
+	 *                           values.
+	 * @param string $style      Optional name of the style
+	 * @param string $background Optional name of the background color
+	 *
+	 * @return string
+	 */
+	public function color($color = null, $style = null, $background = null) // {{{
+	{
+		$colors = static::getColorCodes();
+
+		if (is_array($color)) {
+			$style      = isset($color['style']) ? $color['style'] : null;
+			$background = isset($color['background']) ? $color['background'] : null;
+			$color      = isset($color['color']) ? $color['color'] : null;
+		}
+
+		if ($color == 'reset') {
+			return "\033[0m";
+		}
+
+		$code = array();
+		if (isset($style)) {
+			$code[] = $colors['style'][$style];
+		}
+
+		if (isset($color)) {
+			$code[] = $colors['color'][$color];
+		}
+
+		if (isset($background)) {
+			$code[] = $colors['background'][$background];
+		}
+
+		if (empty($code)) {
+			$code[] = 0;
+		}
+		$code = implode(';', $code);
+		return "\033[{$code}m";
+	}
+
+	/**
+	 * TODO syntax copied from https://github.com/pear/Console_Color2/blob/master/Console/Color2.php
+	 *
+	 * Converts colorcodes in the format %y (for yellow) into ansi-control
+	 * codes. The conversion table is: ('bold' meaning 'light' on some
+	 * terminals). It's almost the same conversion table irssi uses.
+	 * <pre>
+	 *                  text      text            background
+	 *      ------------------------------------------------
+	 *      %k %K %0    black     dark grey       black
+	 *      %r %R %1    red       bold red        red
+	 *      %g %G %2    green     bold green      green
+	 *      %y %Y %3    yellow    bold yellow     yellow
+	 *      %b %B %4    blue      bold blue       blue
+	 *      %m %M %5    magenta   bold magenta    magenta
+	 *      %p %P       magenta (think: purple)
+	 *      %c %C %6    cyan      bold cyan       cyan
+	 *      %w %W %7    white     bold white      white
+	 *
+	 *      %F     Blinking, Flashing
+	 *      %U     Underline
+	 *      %8     Reverse
+	 *      %_,%9  Bold
+	 *
+	 *      %n     Resets the color
+	 *      %%     A single %
+	 * </pre>
+	 * First param is the string to convert, second is an optional flag if
+	 * colors should be used. It defaults to true, if set to false, the
+	 * colorcodes will just be removed (And %% will be transformed into %)
+	 *
+	 * @param string $string  String to convert
+	 * @param bool   $colored Should the string be colored?
+	 *
+	 * @return string
+	 */
+	public static function renderColoredString($string, $colored = true)
+	{
+		static $conversions = array( // static so the array doesn't get built
+			// everytime
+			// %y - yellow, and so on... {{{
+			'%y' => array('color' => 'yellow'),
+			'%g' => array('color' => 'green'),
+			'%b' => array('color' => 'blue'),
+			'%r' => array('color' => 'red'),
+			'%p' => array('color' => 'purple'),
+			'%m' => array('color' => 'purple'),
+			'%c' => array('color' => 'cyan'),
+			'%w' => array('color' => 'grey'),
+			'%k' => array('color' => 'black'),
+			'%n' => array('color' => 'reset'),
+			'%Y' => array('color' => 'yellow', 'style' => 'light'),
+			'%G' => array('color' => 'green', 'style' => 'light'),
+			'%B' => array('color' => 'blue', 'style' => 'light'),
+			'%R' => array('color' => 'red', 'style' => 'light'),
+			'%P' => array('color' => 'purple', 'style' => 'light'),
+			'%M' => array('color' => 'purple', 'style' => 'light'),
+			'%C' => array('color' => 'cyan', 'style' => 'light'),
+			'%W' => array('color' => 'grey', 'style' => 'light'),
+			'%K' => array('color' => 'black', 'style' => 'light'),
+			'%N' => array('color' => 'reset', 'style' => 'light'),
+			'%3' => array('background' => 'yellow'),
+			'%2' => array('background' => 'green'),
+			'%4' => array('background' => 'blue'),
+			'%1' => array('background' => 'red'),
+			'%5' => array('background' => 'purple'),
+			'%6' => array('background' => 'cyan'),
+			'%7' => array('background' => 'grey'),
+			'%0' => array('background' => 'black'),
+			// Don't use this, I can't stand flashing text
+			'%F' => array('style' => 'blink'),
+			'%U' => array('style' => 'underline'),
+			'%8' => array('style' => 'inverse'),
+			'%9' => array('style' => 'bold'),
+			'%_' => array('style' => 'bold')
+			// }}}
+		);
+
+		if ($colored) {
+			$string = str_replace('%%', '% ', $string);
+			foreach ($conversions as $key => $value) {
+				$string = str_replace(
+					$key,
+					static::color($value),
+					$string
+				);
+			}
+			$string = str_replace('% ', '%', $string);
+
+		} else {
+			$string = preg_replace('/%((%)|.)/', '$2', $string);
+		}
+
+		return $string;
+	}
+
+	/**
+	 * Returns the different foreground and background color codes and styles available.
+	 * @return array the color codes
+	 */
+	public static function getColorCodes()
+	{
+		return array(
+			'color'      => array(
+				'black'  => static::FG_BLACK,
+				'red'    => static::FG_RED,
+				'green'  => static::FG_GREEN,
+				'yellow' => static::FG_YELLOW,
+				'blue'   => static::FG_BLUE,
+				'purple' => static::FG_PURPLE,
+				'cyan'   => static::FG_CYAN,
+				'grey'   => static::FG_GREY,
+			),
+			'style'      => array(
+				'normal'      => static::NORMAL,
+				'bold'        => static::BOLD,
+				'italic'      => static::ITALIC,
+				'underline'   => static::UNDERLINE,
+				'blink'       => static::BLINK,
+				'negative'    => static::NEGATIVE,
+				'concealed'   => static::CONCEALED,
+				'crossed_out' => static::CROSSED_OUT,
+				'framed'      => static::FRAMED,
+				'encircled'   => static::ENCIRCLED,
+				'overlined'   => static::OVERLINED
+			),
+			'background' => array(
+				'black'  => static::BG_BLACK,
+				'red'    => static::BG_RED,
+				'green'  => static::BG_RED,
+				'yellow' => static::BG_YELLOW,
+				'blue'   => static::BG_BLUE,
+				'purple' => static::BG_PURPLE,
+				'cyan'   => static::BG_CYAN,
+				'grey'   => static::BG_GREY
+			)
+		);
+	}
+
+	/**
+	 * Escapes % so they don't get interpreted as color codes
+	 *
+	 * @param string $string String to escape
+	 *
+	 * @access public
+	 * @return string
+	 */
+	public static function escape($string)
+	{
+		return str_replace('%', '%%', $string);
+	}
+
+	/**
+	 * Returns true if the stream supports colorization. ANSI colors is disabled if not supported by the stream.
+	 *
+	 * - windows without asicon
+	 * - not tty consoles
+	 *
+	 * @param mixed $stream
+	 * @return bool true if the stream supports ANSI colors, otherwise false.
+	 */
+	public static function streamSupportsAnsiColors($stream)
+	{
+		return DIRECTORY_SEPARATOR == '\\'
+			? null !== getenv('ANSICON')
+			: function_exists('posix_isatty') && @posix_isatty($stream);
+	}
+
+	/**
+	 * Returns true if the console is running on windows
+	 * @return bool
+	 */
+	public static function isRunningOnWindows()
+	{
+		return strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
+	}
+
+	/**
+	 * Gets input from STDIN and returns a string right-trimmed for EOLs.
+	 *
+	 * @param bool $raw If set to true, returns the raw string without trimming
+	 *
+	 * @return string
+	 */
+	public static function stdin($raw = false)
+	{
+		return $raw ? fgets(STDIN) : rtrim(fgets(STDIN), PHP_EOL);
+	}
+
+	/**
+	 * Prints text to STDOUT.
+	 *
+	 * @param string $text
+	 * @param bool   $raw
+	 *
+	 * @return int|false Number of bytes printed or false on error
+	 */
+	public static function stdout($text, $raw = false)
+	{
+		if ($raw) {
+			return fwrite(STDOUT, $text);
+		} elseif (static::streamSupportsAnsiColors(STDOUT)) {
+			return fwrite(STDOUT, static::renderColoredString($text));
+		} else {
+			return fwrite(STDOUT, static::renderColoredString($text, false));
+		}
+	}
+
+	/**
+	 * Prints text to STDERR.
+	 *
+	 * @param string $text
+	 * @param bool   $raw
+	 *
+	 * @return mixed Number of bytes printed or bool false on error.
+	 */
+	public static function stderr($text, $raw = false)
+	{
+		if ($raw) {
+			return fwrite(STDERR, $text);
+		} elseif (static::streamSupportsAnsiColors(STDERR)) {
+			return fwrite(STDERR, static::renderColoredString($text));
+		} else {
+			return fwrite(STDERR, static::renderColoredString($text, false));
+		}
+	}
+
+	/**
+	 * Prints text to STDERR appended with a carriage return (PHP_EOL).
+	 *
+	 * @param string $text
+	 * @param bool   $raw
+	 *
+	 * @return mixed Number of bytes printed or false on error
+	 */
+	public static function error($text = null, $raw = false)
+	{
+		return static::stderr($text . PHP_EOL, $raw);
+	}
+
+	/**
+	 * Asks the user for input. Ends when the user types a carriage return (PHP_EOL). Optionally, It also provides a
+	 * prompt.
+	 *
+	 * @param string $prompt the prompt (optional)
+	 * @return string the user's input
+	 */
+	public static function input($prompt = null)
+	{
+		if (isset($prompt)) {
+			static::stdout($prompt);
+		}
+		return static::stdin();
+	}
+
+	/**
+	 * Prints text to STDOUT appended with a carriage return (PHP_EOL).
+	 *
+	 * @param string $text
+	 * @param bool $raw
+	 *
+	 * @return mixed Number of bytes printed or bool false on error
+	 */
+	public static function output($text = null, $raw = false)
+	{
+		return static::stdout($text . PHP_EOL, $raw);
+	}
+
+	/**
+	 * Prompts the user for input and validates it
+	 *
+	 * @param string $text prompt string
+	 * @param array $options the options to validate the input:
+	 *  - required: whether it is required or not
+	 *  - default: default value if no input is inserted by the user
+	 *  - pattern: regular expression pattern to validate user input
+	 *  - validator: a callable function to validate input. The function must accept two parameters:
+	 *      - $input: the user input to validate
+	 *      - $error: the error value passed by reference if validation failed.
+	 * @return string the user input
+	 */
+	public static function prompt($text, $options = array())
+	{
+		$options = ArrayHelper::merge(
+			$options,
+			array(
+				'required'  => false,
+				'default'   => null,
+				'pattern'   => null,
+				'validator' => null,
+				'error'     => 'Invalid input.',
+			)
+		);
+		$error   = null;
+
+		top:
+		$input = $options['default']
+			? static::input("$text [" . $options['default'] . ']: ')
+			: static::input("$text: ");
+
+		if (!strlen($input)) {
+			if (isset($options['default'])) {
+				$input = $options['default'];
+			} elseif ($options['required']) {
+				static::output($options['error']);
+				goto top;
+			}
+		} elseif ($options['pattern'] && !preg_match($options['pattern'], $input)) {
+			static::output($options['error']);
+			goto top;
+		} elseif ($options['validator'] &&
+			!call_user_func_array($options['validator'], array($input, &$error))
+		) {
+			static::output(isset($error) ? $error : $options['error']);
+			goto top;
+		}
+
+		return $input;
+	}
+
+	/**
+	 * Asks the user for a simple yes/no confirmation.
+	 *
+	 * @param string $prompt the prompt string
+	 *
+	 * @return bool true or false according to user input.
+	 */
+	public static function confirm($prompt)
+	{
+		top:
+		$input = strtolower(static::input("$prompt [y/n]: "));
+		if (!in_array(substr($input, 0, 1), array('y', 'n'))) {
+			static::output("Please, type 'y' or 'n'");
+			goto top;
+		}
+		return $input === 'y' ? true : false;
+	}
+
+	/**
+	 * Gives the user an option to choose from. Giving '?' as an input will show
+	 * a list of options to choose from and their explanations.
+	 *
+	 * @param string $prompt the prompt message
+	 * @param array  $options Key-value array of options to choose from
+	 *
+	 * @return string An option character the user chose
+	 */
+	public static function select($prompt, $options = array())
+	{
+		top:
+		static::stdout("$prompt [" . implode(',', array_keys($options)) . ",?]: ");
+		$input = static::stdin();
+		if ($input === '?') {
+			foreach ($options as $key => $value) {
+				echo " $key - $value\n";
+			}
+			echo " ? - Show help\n";
+			goto top;
+		} elseif (!in_array($input, array_keys($options))) {
+			goto top;
+		}
+		return $input;
+	}
+
+	/**
+	 * Displays and updates a simple progress bar on screen.
+	 *
+	 * @param $done the number of items that are completed
+	 * @param $total the total value of items that are to be done
+	 * @param int $size the size of the status bar (optional)
+	 * @see http://snipplr.com/view/29548/
+	 */
+	public static function showProgress($done, $total, $size = 30)
+	{
+		static $start;
+
+		// if we go over our bound, just ignore it
+		if ($done > $total) {
+			return;
+		}
+
+		if (empty($start)) {
+			$start = time();
+		}
+
+		$now = time();
+
+		$percent = (double)($done / $total);
+		$bar     = floor($percent * $size);
+
+		$status = "\r[";
+		$status .= str_repeat("=", $bar);
+		if ($bar < $size) {
+			$status .= ">";
+			$status .= str_repeat(" ", $size - $bar);
+		} else {
+			$status .= "=";
+		}
+
+		$display = number_format($percent * 100, 0);
+
+		$status .= "] $display%  $done/$total";
+
+		$rate = ($now - $start) / $done;
+		$left = $total - $done;
+		$eta  = round($rate * $left, 2);
+
+		$elapsed = $now - $start;
+
+		$status .= " remaining: " . number_format($eta) . " sec.  elapsed: " . number_format($elapsed) . " sec.";
+
+		static::stdout("$status  ");
+
+		flush();
+
+		// when done, send a newline
+		if ($done == $total) {
+			echo "\n";
+		}
+	}
 }

From 74185cb7fcc5c65443c3376d4c579c654ef9d6c5 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Wed, 8 May 2013 01:39:20 +0400
Subject: [PATCH 086/152] Corrected default paths for Twig and Smarty

---
 framework/renderers/SmartyViewRenderer.php | 2 +-
 framework/renderers/TwigViewRenderer.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/renderers/SmartyViewRenderer.php b/framework/renderers/SmartyViewRenderer.php
index 29d7b97..cb82438 100644
--- a/framework/renderers/SmartyViewRenderer.php
+++ b/framework/renderers/SmartyViewRenderer.php
@@ -26,7 +26,7 @@ class SmartyViewRenderer extends ViewRenderer
 	/**
 	 * @var string the directory or path alias pointing to where Smarty code is located.
 	 */
-	public $smartyPath = '@app/vendors/Smarty';
+	public $smartyPath = '@yii/vendor/smarty/smarty/distribution/libs';
 
 	/**
 	 * @var string the directory or path alias pointing to where Smarty cache will be stored.
diff --git a/framework/renderers/TwigViewRenderer.php b/framework/renderers/TwigViewRenderer.php
index 79faa9f..d48dc5b 100644
--- a/framework/renderers/TwigViewRenderer.php
+++ b/framework/renderers/TwigViewRenderer.php
@@ -25,7 +25,7 @@ class TwigViewRenderer extends ViewRenderer
 	/**
 	 * @var string the directory or path alias pointing to where Twig code is located.
 	 */
-	public $twigPath = '@Twig';
+	public $twigPath = '@yii/vendor/twig/twig/lib/Twig';
 
 	/**
 	 * @var string the directory or path alias pointing to where Twig cache will be stored.

From 55cc8813c7da6c7bc56537e277e824ac6e216a5e Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Tue, 7 May 2013 19:31:35 -0400
Subject: [PATCH 087/152] Fixes issue #171

---
 framework/db/QueryBuilder.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/db/QueryBuilder.php b/framework/db/QueryBuilder.php
index 5c5584e..a4e30ea 100644
--- a/framework/db/QueryBuilder.php
+++ b/framework/db/QueryBuilder.php
@@ -472,8 +472,8 @@ class QueryBuilder extends \yii\base\Object
 		if (isset($this->typeMap[$type])) {
 			return $this->typeMap[$type];
 		} elseif (preg_match('/^(\w+)\s+/', $type, $matches)) {
-			if (isset($this->typeMap[$matches[0]])) {
-				return preg_replace('/^\w+/', $this->typeMap[$matches[0]], $type);
+			if (isset($this->typeMap[$matches[1]])) {
+				return preg_replace('/^\w+/', $this->typeMap[$matches[1]], $type);
 			}
 		}
 		return $type;

From 69cad905dd049be9d9b35d8103cd60591e13c6ae Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Wed, 8 May 2013 02:41:29 +0200
Subject: [PATCH 088/152] Refactoring Console commands

added method wrappers in console/Controller

issue #33
---
 framework/console/Controller.php   | 155 +++++++++++++++-
 framework/helpers/base/Console.php | 349 +++++++++++++------------------------
 2 files changed, 276 insertions(+), 228 deletions(-)

diff --git a/framework/console/Controller.php b/framework/console/Controller.php
index b168ff1..539bca4 100644
--- a/framework/console/Controller.php
+++ b/framework/console/Controller.php
@@ -11,6 +11,7 @@ use Yii;
 use yii\base\Action;
 use yii\base\InlineAction;
 use yii\base\InvalidRouteException;
+use yii\helpers\Console;
 
 /**
  * Controller is the base class of console command classes.
@@ -35,6 +36,12 @@ class Controller extends \yii\base\Controller
 	public $interactive = true;
 
 	/**
+	 * @var bool whether to enable ANSI style in output. If not set it will be auto detected.
+	 * Default is disabled on Windows systems and enabled on linux.
+	 */
+	public $ansi;
+
+	/**
 	 * Runs an action with the specified action ID and parameters.
 	 * If the action ID is empty, the method will use [[defaultAction]].
 	 * @param string $id the ID of the action to be executed.
@@ -115,6 +122,136 @@ class Controller extends \yii\base\Controller
 	}
 
 	/**
+	 * Formats a string with ANSI codes
+	 *
+	 * You may pass additional parameters using the constants defined in [[yii\helpers\base\Console]].
+	 *
+	 * Example:
+	 * ~~~
+	 * $this->formatString('This will be red and underlined.', Console::FG_RED, Console::UNDERLINE);
+	 * ~~~
+	 *
+	 * @param string $string the string to be formatted
+	 * @return string
+	 */
+	public function formatString($string)
+	{
+		if ($this->ansi === true || $this->ansi === null && Console::streamSupportsAnsiColors(STDOUT)) {
+			$args = func_get_args();
+			array_shift($args);
+			$string = Console::ansiFormat($string, $args);
+		}
+		return $string;
+	}
+
+	/**
+	 * Prints a string to STDOUT
+	 *
+	 * You may optionally format the string with ANSI codes by
+	 * passing additional parameters using the constants defined in [[yii\helpers\base\Console]].
+	 *
+	 * Example:
+	 * ~~~
+	 * $this->stdout('This will be red and underlined.', Console::FG_RED, Console::UNDERLINE);
+	 * ~~~
+	 *
+	 * @param string $string the string to print
+	 * @return int|boolean Number of bytes printed or false on error
+	 */
+	public function stdout($string)
+	{
+		if ($this->ansi === true || $this->ansi === null && Console::streamSupportsAnsiColors(STDOUT)) {
+			$args = func_get_args();
+			array_shift($args);
+			$string = Console::ansiFormat($string, $args);
+		}
+		return Console::stdout($string);
+	}
+
+	/**
+	 * Prints a string to STDERR
+	 *
+	 * You may optionally format the string with ANSI codes by
+	 * passing additional parameters using the constants defined in [[yii\helpers\base\Console]].
+	 *
+	 * Example:
+	 * ~~~
+	 * $this->stderr('This will be red and underlined.', Console::FG_RED, Console::UNDERLINE);
+	 * ~~~
+	 *
+	 * @param string $string the string to print
+	 * @return int|boolean Number of bytes printed or false on error
+	 */
+	public function stderr($string)
+	{
+		if ($this->ansi === true || $this->ansi === null && Console::streamSupportsAnsiColors(STDERR)) {
+			$args = func_get_args();
+			array_shift($args);
+			$string = Console::ansiFormat($string, $args);
+		}
+		return fwrite(STDERR, $string);
+	}
+
+	/**
+	 * Asks the user for input. Ends when the user types a carriage return (PHP_EOL). Optionally, It also provides a
+	 * prompt.
+	 *
+	 * @param string $prompt the prompt (optional)
+	 * @return string the user's input
+	 */
+	public function input($prompt = null)
+	{
+		if (isset($prompt)) {
+			static::stdout($prompt);
+		}
+		return static::stdin();
+	}
+
+	/**
+	 * Prints text to STDOUT appended with a carriage return (PHP_EOL).
+	 *
+	 * @param string $text
+	 * @param bool $raw
+	 *
+	 * @return mixed Number of bytes printed or bool false on error
+	 */
+	public function output($text = null)
+	{
+		return static::stdout($text . PHP_EOL);
+	}
+
+	/**
+	 * Prints text to STDERR appended with a carriage return (PHP_EOL).
+	 *
+	 * @param string $text
+	 * @param bool   $raw
+	 *
+	 * @return mixed Number of bytes printed or false on error
+	 */
+	public function error($text = null)
+	{
+		return static::stderr($text . PHP_EOL);
+	}
+
+	/**
+	 * Prompts the user for input and validates it
+	 *
+	 * @param string $text prompt string
+	 * @param array $options the options to validate the input:
+	 *  - required: whether it is required or not
+	 *  - default: default value if no input is inserted by the user
+	 *  - pattern: regular expression pattern to validate user input
+	 *  - validator: a callable function to validate input. The function must accept two parameters:
+	 *      - $input: the user input to validate
+	 *      - $error: the error value passed by reference if validation failed.
+	 * @return string the user input
+	 */
+	public function prompt($text, $options = array())
+	{
+		return Console::prompt($text, $options);
+	}
+
+	/**
 	 * Asks user to confirm by typing y or n.
 	 *
 	 * @param string $message to echo out before waiting for user input
@@ -124,15 +261,27 @@ class Controller extends \yii\base\Controller
 	public function confirm($message, $default = false)
 	{
 		if ($this->interactive) {
-			echo $message . ' (yes|no) [' . ($default ? 'yes' : 'no') . ']:';
-			$input = trim(fgets(STDIN));
-			return empty($input) ? $default : !strncasecmp($input, 'y', 1);
+			return Console::confirm($message, $default);
 		} else {
 			return true;
 		}
 	}
 
 	/**
+	 * Gives the user an option to choose from. Giving '?' as an input will show
+	 * a list of options to choose from and their explanations.
+	 *
+	 * @param string $prompt the prompt message
+	 * @param array  $options Key-value array of options to choose from
+	 *
+	 * @return string An option character the user chose
+	 */
+	public static function select($prompt, $options = array())
+	{
+		return Console::select($prompt, $options);
+	}
+
+	/**
 	 * Returns the names of the global options for this command.
 	 * A global option requires the existence of a public member variable whose
 	 * name is the option name.
diff --git a/framework/helpers/base/Console.php b/framework/helpers/base/Console.php
index 08f7d6a..3c7dc0b 100644
--- a/framework/helpers/base/Console.php
+++ b/framework/helpers/base/Console.php
@@ -16,6 +16,12 @@ namespace yii\helpers\base;
  * A console view provides functionality to create rich console application by allowing to format output
  * by adding color and font style to it.
  *
+ * The following constants are available for formatting:
+ *
+ * TODO document constants
+ *
+ *
+ *
  * @author Carsten Brandt <mail@cebe.cc>
  * @since 2.0
  */
@@ -234,28 +240,47 @@ class Console
 	}
 
 	/**
-	 * Will send ANSI format for following output
+	 * Sets the ANSI format for any text that is printed afterwards.
 	 *
-	 * You can pass any of the FG_*, BG_* and TEXT_* constants and also xterm256ColorBg
+	 * You can pass any of the FG_*, BG_* and TEXT_* constants and also [[xterm256ColorFg]] and [[xterm256ColorBg]].
 	 * TODO: documentation
 	 */
-	public static function ansiStyle()
+	public static function ansiFormatBegin()
 	{
 		echo "\033[" . implode(';', func_get_args()) . 'm';
 	}
 
 	/**
+	 * Resets any ANSI format set by previous method [[ansiFormatBegin()]]
+	 * Any output after this is will have default text style.
+	 */
+	public static function ansiFormatReset()
+	{
+		echo "\033[0m";
+	}
+
+	/**
+	 * Returns the ANSI format code.
+	 *
+	 * You can pass any of the FG_*, BG_* and TEXT_* constants and also [[xterm256ColorFg]] and [[xterm256ColorBg]].
+	 * TODO: documentation
+	 */
+	public static function ansiFormatCode($format)
+	{
+		return "\033[" . implode(';', $format) . 'm';
+	}
+
+	/**
 	 * Will return a string formatted with the given ANSI style
 	 *
-	 * See {@link ansiStyle} for possible arguments.
 	 * @param string $string the string to be formatted
+	 * @param array $format array containing formatting values.
+	 * You can pass any of the FG_*, BG_* and TEXT_* constants and also [[xterm256ColorFg]] and [[xterm256ColorBg]].
 	 * @return string
 	 */
-	public static function ansiStyleString($string)
+	public static function ansiFormat($string, $format=array())
 	{
-		$args = func_get_args();
-		array_shift($args);
-		$code = implode(';', $args);
+		$code = implode(';', $format);
 		return "\033[0m" . ($code !== '' ? "\033[" . $code . "m" : '') . $string . "\033[0m";
 	}
 
@@ -271,32 +296,12 @@ class Console
 	}
 
 	/**
-	 * Usage: list($w, $h) = ConsoleHelper::getScreenSize();
-	 *
-	 * @return array
-	 */
-	public static function getScreenSize()
-	{
-		// TODO implement
-		return array(150, 50);
-	}
-
-	/**
-	 * resets any ansi style set by previous method {@link ansiStyle}
-	 * Any output after this is will have default text style.
-	 */
-	public static function reset()
-	{
-		echo "\033[0m";
-	}
-
-	/**
 	 * Strips ANSI control codes from a string
 	 *
 	 * @param string $string String to strip
 	 * @return string
 	 */
-	public static function strip($string)
+	public static function stripAnsiFormat($string)
 	{
 		return preg_replace('/\033\[[\d;]+m/', '', $string); // TODO currently only strips color
 	}
@@ -407,56 +412,9 @@ class Console
 		);
 	}
 
-	/**
-	 *
-	 * Returns an ANSI-Controlcode
-	 *
-	 * Takes 1 to 3 Arguments: either 1 to 3 strings containing the name of the
-	 * FG Color, style and BG color, or one array with the indices color, style
-	 * or background.
-	 *
-	 * @param mixed  $color      Optional.
-	 *                           Either a string with the name of the foreground
-	 *                           color, or an array with the indices 'color',
-	 *                           'style', 'background' and corresponding names as
-	 *                           values.
-	 * @param string $style      Optional name of the style
-	 * @param string $background Optional name of the background color
-	 *
-	 * @return string
-	 */
-	public function color($color = null, $style = null, $background = null) // {{{
+	public function markdownToAnsi()
 	{
-		$colors = static::getColorCodes();
-
-		if (is_array($color)) {
-			$style      = isset($color['style']) ? $color['style'] : null;
-			$background = isset($color['background']) ? $color['background'] : null;
-			$color      = isset($color['color']) ? $color['color'] : null;
-		}
-
-		if ($color == 'reset') {
-			return "\033[0m";
-		}
-
-		$code = array();
-		if (isset($style)) {
-			$code[] = $colors['style'][$style];
-		}
-
-		if (isset($color)) {
-			$code[] = $colors['color'][$color];
-		}
-
-		if (isset($background)) {
-			$code[] = $colors['background'][$background];
-		}
-
-		if (empty($code)) {
-			$code[] = 0;
-		}
-		$code = implode(';', $code);
-		return "\033[{$code}m";
+		// TODO implement
 	}
 
 	/**
@@ -497,44 +455,40 @@ class Console
 	 */
 	public static function renderColoredString($string, $colored = true)
 	{
-		static $conversions = array( // static so the array doesn't get built
-			// everytime
-			// %y - yellow, and so on... {{{
-			'%y' => array('color' => 'yellow'),
-			'%g' => array('color' => 'green'),
-			'%b' => array('color' => 'blue'),
-			'%r' => array('color' => 'red'),
-			'%p' => array('color' => 'purple'),
-			'%m' => array('color' => 'purple'),
-			'%c' => array('color' => 'cyan'),
-			'%w' => array('color' => 'grey'),
-			'%k' => array('color' => 'black'),
-			'%n' => array('color' => 'reset'),
-			'%Y' => array('color' => 'yellow', 'style' => 'light'),
-			'%G' => array('color' => 'green', 'style' => 'light'),
-			'%B' => array('color' => 'blue', 'style' => 'light'),
-			'%R' => array('color' => 'red', 'style' => 'light'),
-			'%P' => array('color' => 'purple', 'style' => 'light'),
-			'%M' => array('color' => 'purple', 'style' => 'light'),
-			'%C' => array('color' => 'cyan', 'style' => 'light'),
-			'%W' => array('color' => 'grey', 'style' => 'light'),
-			'%K' => array('color' => 'black', 'style' => 'light'),
-			'%N' => array('color' => 'reset', 'style' => 'light'),
-			'%3' => array('background' => 'yellow'),
-			'%2' => array('background' => 'green'),
-			'%4' => array('background' => 'blue'),
-			'%1' => array('background' => 'red'),
-			'%5' => array('background' => 'purple'),
-			'%6' => array('background' => 'cyan'),
-			'%7' => array('background' => 'grey'),
-			'%0' => array('background' => 'black'),
-			// Don't use this, I can't stand flashing text
-			'%F' => array('style' => 'blink'),
-			'%U' => array('style' => 'underline'),
-			'%8' => array('style' => 'inverse'),
-			'%9' => array('style' => 'bold'),
-			'%_' => array('style' => 'bold')
-			// }}}
+		static $conversions = array(
+			'%y' => array(static::FG_YELLOW),
+			'%g' => array(static::FG_GREEN),
+			'%b' => array(static::FG_BLUE),
+			'%r' => array(static::FG_RED),
+			'%p' => array(static::FG_PURPLE),
+			'%m' => array(static::FG_PURPLE),
+			'%c' => array(static::FG_CYAN),
+			'%w' => array(static::FG_GREY),
+			'%k' => array(static::FG_BLACK),
+			'%n' => array(0), // reset
+			'%Y' => array(static::FG_YELLOW, static::BOLD),
+			'%G' => array(static::FG_GREEN, static::BOLD),
+			'%B' => array(static::FG_BLUE, static::BOLD),
+			'%R' => array(static::FG_RED, static::BOLD),
+			'%P' => array(static::FG_PURPLE, static::BOLD),
+			'%M' => array(static::FG_PURPLE, static::BOLD),
+			'%C' => array(static::FG_CYAN, static::BOLD),
+			'%W' => array(static::FG_GREY, static::BOLD),
+			'%K' => array(static::FG_BLACK, static::BOLD),
+			'%N' => array(0, static::BOLD),
+			'%3' => array(static::BG_YELLOW),
+			'%2' => array(static::BG_GREEN),
+			'%4' => array(static::BG_BLUE),
+			'%1' => array(static::BG_RED),
+			'%5' => array(static::BG_PURPLE),
+			'%6' => array(static::BG_PURPLE),
+			'%7' => array(static::BG_CYAN),
+			'%0' => array(static::BG_GREY),
+			'%F' => array(static::BLINK),
+			'%U' => array(static::UNDERLINE),
+			'%8' => array(static::NEGATIVE),
+			'%9' => array(static::BOLD),
+			'%_' => array(static::BOLD)
 		);
 
 		if ($colored) {
@@ -542,70 +496,25 @@ class Console
 			foreach ($conversions as $key => $value) {
 				$string = str_replace(
 					$key,
-					static::color($value),
+					static::ansiFormatCode($value),
 					$string
 				);
 			}
 			$string = str_replace('% ', '%', $string);
-
 		} else {
 			$string = preg_replace('/%((%)|.)/', '$2', $string);
 		}
-
 		return $string;
 	}
 
 	/**
-	 * Returns the different foreground and background color codes and styles available.
-	 * @return array the color codes
-	 */
-	public static function getColorCodes()
-	{
-		return array(
-			'color'      => array(
-				'black'  => static::FG_BLACK,
-				'red'    => static::FG_RED,
-				'green'  => static::FG_GREEN,
-				'yellow' => static::FG_YELLOW,
-				'blue'   => static::FG_BLUE,
-				'purple' => static::FG_PURPLE,
-				'cyan'   => static::FG_CYAN,
-				'grey'   => static::FG_GREY,
-			),
-			'style'      => array(
-				'normal'      => static::NORMAL,
-				'bold'        => static::BOLD,
-				'italic'      => static::ITALIC,
-				'underline'   => static::UNDERLINE,
-				'blink'       => static::BLINK,
-				'negative'    => static::NEGATIVE,
-				'concealed'   => static::CONCEALED,
-				'crossed_out' => static::CROSSED_OUT,
-				'framed'      => static::FRAMED,
-				'encircled'   => static::ENCIRCLED,
-				'overlined'   => static::OVERLINED
-			),
-			'background' => array(
-				'black'  => static::BG_BLACK,
-				'red'    => static::BG_RED,
-				'green'  => static::BG_RED,
-				'yellow' => static::BG_YELLOW,
-				'blue'   => static::BG_BLUE,
-				'purple' => static::BG_PURPLE,
-				'cyan'   => static::BG_CYAN,
-				'grey'   => static::BG_GREY
-			)
-		);
-	}
-
-	/**
-	 * Escapes % so they don't get interpreted as color codes
-	 *
-	 * @param string $string String to escape
-	 *
-	 * @access public
-	 * @return string
-	 */
+	* Escapes % so they don't get interpreted as color codes
+	*
+	* @param string $string String to escape
+	*
+	* @access public
+	* @return string
+	*/
 	public static function escape($string)
 	{
 		return str_replace('%', '%%', $string);
@@ -637,66 +546,47 @@ class Console
 	}
 
 	/**
-	 * Gets input from STDIN and returns a string right-trimmed for EOLs.
-	 *
-	 * @param bool $raw If set to true, returns the raw string without trimming
+	 * Usage: list($w, $h) = ConsoleHelper::getScreenSize();
 	 *
-	 * @return string
+	 * @return array
 	 */
-	public static function stdin($raw = false)
+	public static function getScreenSize()
 	{
-		return $raw ? fgets(STDIN) : rtrim(fgets(STDIN), PHP_EOL);
+		// TODO implement
+		return array(150, 50);
 	}
 
 	/**
-	 * Prints text to STDOUT.
-	 *
-	 * @param string $text
-	 * @param bool   $raw
+	 * Gets input from STDIN and returns a string right-trimmed for EOLs.
 	 *
-	 * @return int|false Number of bytes printed or false on error
+	 * @param bool $raw If set to true, returns the raw string without trimming
+	 * @return string
 	 */
-	public static function stdout($text, $raw = false)
+	public static function stdin($raw = false)
 	{
-		if ($raw) {
-			return fwrite(STDOUT, $text);
-		} elseif (static::streamSupportsAnsiColors(STDOUT)) {
-			return fwrite(STDOUT, static::renderColoredString($text));
-		} else {
-			return fwrite(STDOUT, static::renderColoredString($text, false));
-		}
+		return $raw ? fgets(STDIN) : rtrim(fgets(STDIN), PHP_EOL);
 	}
 
 	/**
-	 * Prints text to STDERR.
+	 * Prints a string to STDOUT.
 	 *
-	 * @param string $text
-	 * @param bool   $raw
-	 *
-	 * @return mixed Number of bytes printed or bool false on error.
+	 * @param string $string the string to print
+	 * @return int|boolean Number of bytes printed or false on error
 	 */
-	public static function stderr($text, $raw = false)
+	public static function stdout($string)
 	{
-		if ($raw) {
-			return fwrite(STDERR, $text);
-		} elseif (static::streamSupportsAnsiColors(STDERR)) {
-			return fwrite(STDERR, static::renderColoredString($text));
-		} else {
-			return fwrite(STDERR, static::renderColoredString($text, false));
-		}
+		return fwrite(STDOUT, $string);
 	}
 
 	/**
-	 * Prints text to STDERR appended with a carriage return (PHP_EOL).
+	 * Prints a string to STDERR.
 	 *
-	 * @param string $text
-	 * @param bool   $raw
-	 *
-	 * @return mixed Number of bytes printed or false on error
+	 * @param string $string the string to print
+	 * @return int|boolean Number of bytes printed or false on error
 	 */
-	public static function error($text = null, $raw = false)
+	public static function stderr($string)
 	{
-		return static::stderr($text . PHP_EOL, $raw);
+		return fwrite(STDERR, $string);
 	}
 
 	/**
@@ -722,9 +612,22 @@ class Console
 	 *
 	 * @return mixed Number of bytes printed or bool false on error
 	 */
-	public static function output($text = null, $raw = false)
+	public static function output($text = null)
+	{
+		return static::stdout($text . PHP_EOL);
+	}
+
+	/**
+	 * Prints text to STDERR appended with a carriage return (PHP_EOL).
+	 *
+	 * @param string $text
+	 * @param bool   $raw
+	 *
+	 * @return mixed Number of bytes printed or false on error
+	 */
+	public static function error($text = null)
 	{
-		return static::stdout($text . PHP_EOL, $raw);
+		return static::stderr($text . PHP_EOL);
 	}
 
 	/**
@@ -780,21 +683,17 @@ class Console
 	}
 
 	/**
-	 * Asks the user for a simple yes/no confirmation.
-	 *
-	 * @param string $prompt the prompt string
+	 * Asks user to confirm by typing y or n.
 	 *
-	 * @return bool true or false according to user input.
+	 * @param string $message to echo out before waiting for user input
+	 * @param boolean $default this value is returned if no selection is made.
+	 * @return boolean whether user confirmed
 	 */
-	public static function confirm($prompt)
+	public static function confirm($message, $default = true)
 	{
-		top:
-		$input = strtolower(static::input("$prompt [y/n]: "));
-		if (!in_array(substr($input, 0, 1), array('y', 'n'))) {
-			static::output("Please, type 'y' or 'n'");
-			goto top;
-		}
-		return $input === 'y' ? true : false;
+		echo $message . ' (yes|no) [' . ($default ? 'yes' : 'no') . ']:';
+		$input = trim(static::stdin());
+		return empty($input) ? $default : !strncasecmp($input, 'y', 1);
 	}
 
 	/**
@@ -826,9 +725,9 @@ class Console
 	/**
 	 * Displays and updates a simple progress bar on screen.
 	 *
-	 * @param $done the number of items that are completed
-	 * @param $total the total value of items that are to be done
-	 * @param int $size the size of the status bar (optional)
+	 * @param integer $done the number of items that are completed
+	 * @param integer $total the total value of items that are to be done
+	 * @param integer $size the size of the status bar (optional)
 	 * @see http://snipplr.com/view/29548/
 	 */
 	public static function showProgress($done, $total, $size = 30)

From 88c74e99c3468c566defa66e5785b4e17dd5f2f5 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Wed, 8 May 2013 02:45:43 +0200
Subject: [PATCH 089/152] variable name fix in docs of Markdown helper

https://github.com/yiisoft/yii2/commit/f2258e760f03d636056c2c7cb48a8bd45c10d913#commitcomment-3165819
---
 framework/helpers/base/Markdown.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/helpers/base/Markdown.php b/framework/helpers/base/Markdown.php
index 58987d3..342c56b 100644
--- a/framework/helpers/base/Markdown.php
+++ b/framework/helpers/base/Markdown.php
@@ -16,13 +16,13 @@ use Michelf\MarkdownExtra;
  * Basic usage is the following:
  *
  * ```php
- * $my_html = Markdown::process($my_text);
+ * $myHtml = Markdown::process($myText);
  * ```
  *
  * If you want to configure the parser:
  *
  * ```php
- * $my_html = Markdown::process($my_text, array(
+ * $myHtml = Markdown::process($myText, array(
  *     'fn_id_prefix' => 'footnote_',
  * ));
  * ```

From ed74636af8c61828172f8d695c202368669b3e88 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Wed, 8 May 2013 02:47:26 +0200
Subject: [PATCH 090/152] more doc variable name fixes

---
 framework/helpers/Markdown.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/helpers/Markdown.php b/framework/helpers/Markdown.php
index a8fd0c8..3f6c98e 100644
--- a/framework/helpers/Markdown.php
+++ b/framework/helpers/Markdown.php
@@ -13,13 +13,13 @@ namespace yii\helpers;
  * Basic usage is the following:
  *
  * ```php
- * $my_html = Markdown::process($my_text);
+ * $myHtml = Markdown::process($myText);
  * ```
  *
  * If you want to configure the parser:
  *
  * ```php
- * $my_html = Markdown::process($my_text, array(
+ * $myHtml = Markdown::process($myText, array(
  *     'fn_id_prefix' => 'footnote_',
  * ));
  * ```

From fc5045fd0c7eef429abc3f3495adee5fd720026d Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Wed, 8 May 2013 12:16:30 +0200
Subject: [PATCH 091/152] Fixed Copy paste error console/Controller

also naming of formatString -> ansiFormat
---
 framework/console/Controller.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/framework/console/Controller.php b/framework/console/Controller.php
index 539bca4..9f34046 100644
--- a/framework/console/Controller.php
+++ b/framework/console/Controller.php
@@ -128,13 +128,13 @@ class Controller extends \yii\base\Controller
 	 *
 	 * Example:
 	 * ~~~
-	 * $this->formatString('This will be red and underlined.', Console::FG_RED, Console::UNDERLINE);
+	 * $this->ansiFormat('This will be red and underlined.', Console::FG_RED, Console::UNDERLINE);
 	 * ~~~
 	 *
 	 * @param string $string the string to be formatted
 	 * @return string
 	 */
-	public function formatString($string)
+	public function ansiFormat($string)
 	{
 		if ($this->ansi === true || $this->ansi === null && Console::streamSupportsAnsiColors(STDOUT)) {
 			$args = func_get_args();
@@ -202,9 +202,9 @@ class Controller extends \yii\base\Controller
 	public function input($prompt = null)
 	{
 		if (isset($prompt)) {
-			static::stdout($prompt);
+			$this->stdout($prompt);
 		}
-		return static::stdin();
+		return Console::stdin();
 	}
 
 	/**
@@ -217,7 +217,7 @@ class Controller extends \yii\base\Controller
 	 */
 	public function output($text = null)
 	{
-		return static::stdout($text . PHP_EOL);
+		return $this->stdout($text . PHP_EOL);
 	}
 
 	/**
@@ -230,7 +230,7 @@ class Controller extends \yii\base\Controller
 	 */
 	public function error($text = null)
 	{
-		return static::stderr($text . PHP_EOL);
+		return $this->stderr($text . PHP_EOL);
 	}
 
 	/**
@@ -276,7 +276,7 @@ class Controller extends \yii\base\Controller
 	 *
 	 * @return string An option character the user chose
 	 */
-	public static function select($prompt, $options = array())
+	public function select($prompt, $options = array())
 	{
 		return Console::select($prompt, $options);
 	}

From 51357e58f091a68f2950513604cc7633d7416747 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Wed, 8 May 2013 12:46:54 +0200
Subject: [PATCH 092/152] more console helper and controller refactoring

changed name of ansi switch to --colors
https://github.com/yiisoft/yii2/commit/69cad905dd049be9d9b35d8103cd60591e13c6ae#commitcomment-3168489
issue #33
---
 framework/console/Controller.php | 55 ++++++++--------------------------------
 1 file changed, 10 insertions(+), 45 deletions(-)

diff --git a/framework/console/Controller.php b/framework/console/Controller.php
index 9f34046..c07d92d 100644
--- a/framework/console/Controller.php
+++ b/framework/console/Controller.php
@@ -36,10 +36,12 @@ class Controller extends \yii\base\Controller
 	public $interactive = true;
 
 	/**
-	 * @var bool whether to enable ANSI style in output. If not set it will be auto detected.
-	 * Default is disabled on Windows systems and enabled on linux.
+	 * @var bool whether to enable ANSI style in output.
+	 * Setting this will affect [[ansiFormat()]], [[stdout()]] and [[stderr()]].
+	 * If not set it will be auto detected using [[yii\helpers\Console::streamSupportsAnsiColors()]] with STDOUT
+	 * for [[ansiFormat()]] and [[stdout()]] and STDERR for [[stderr()]].
 	 */
-	public $ansi;
+	public $colors;
 
 	/**
 	 * Runs an action with the specified action ID and parameters.
@@ -193,47 +195,6 @@ class Controller extends \yii\base\Controller
 	}
 
 	/**
-	 * Asks the user for input. Ends when the user types a carriage return (PHP_EOL). Optionally, It also provides a
-	 * prompt.
-	 *
-	 * @param string $prompt the prompt (optional)
-	 * @return string the user's input
-	 */
-	public function input($prompt = null)
-	{
-		if (isset($prompt)) {
-			$this->stdout($prompt);
-		}
-		return Console::stdin();
-	}
-
-	/**
-	 * Prints text to STDOUT appended with a carriage return (PHP_EOL).
-	 *
-	 * @param string $text
-	 * @param bool $raw
-	 *
-	 * @return mixed Number of bytes printed or bool false on error
-	 */
-	public function output($text = null)
-	{
-		return $this->stdout($text . PHP_EOL);
-	}
-
-	/**
-	 * Prints text to STDERR appended with a carriage return (PHP_EOL).
-	 *
-	 * @param string $text
-	 * @param bool   $raw
-	 *
-	 * @return mixed Number of bytes printed or false on error
-	 */
-	public function error($text = null)
-	{
-		return $this->stderr($text . PHP_EOL);
-	}
-
-	/**
 	 * Prompts the user for input and validates it
 	 *
 	 * @param string $text prompt string
@@ -248,7 +209,11 @@ class Controller extends \yii\base\Controller
 	 */
 	public function prompt($text, $options = array())
 	{
-		return Console::prompt($text, $options);
+		if ($this->interactive) {
+			return Console::prompt($text, $options);
+		} else {
+			return isset($options['default']) ? $options['default'] : '';
+		}
 	}
 
 	/**

From 01ae01508838864d3a450f1163924beb6b4f78b1 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Wed, 8 May 2013 06:58:34 -0400
Subject: [PATCH 093/152] Fixes issue #180: DbSession crashes with autoStart

---
 framework/web/DbSession.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/web/DbSession.php b/framework/web/DbSession.php
index 2910b40..e81aa7f 100644
--- a/framework/web/DbSession.php
+++ b/framework/web/DbSession.php
@@ -71,13 +71,13 @@ class DbSession extends Session
 	 */
 	public function init()
 	{
-		parent::init();
 		if (is_string($this->db)) {
 			$this->db = Yii::$app->getComponent($this->db);
 		}
 		if (!$this->db instanceof Connection) {
 			throw new InvalidConfigException("DbSession::db must be either a DB connection instance or the application component ID of a DB connection.");
-		}		
+		}
+		parent::init();
 	}
 
 	/**

From 2dd51d5b46b75d179dbc7cf0c239b303370fafd9 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Wed, 8 May 2013 07:16:48 -0400
Subject: [PATCH 094/152] Fixes issue #177.

---
 apps/bootstrap/protected/config/main.php | 10 ++++++++++
 framework/base/Application.php           |  1 -
 framework/logging/Logger.php             |  6 ++++--
 framework/logging/Router.php             | 13 ++++++-------
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/apps/bootstrap/protected/config/main.php b/apps/bootstrap/protected/config/main.php
index 96e0986..20b5e7e 100644
--- a/apps/bootstrap/protected/config/main.php
+++ b/apps/bootstrap/protected/config/main.php
@@ -3,6 +3,7 @@
 return array(
 	'id' => 'hello',
 	'basePath' => dirname(__DIR__),
+	'preload' => array('log'),
 	'components' => array(
 		'cache' => array(
 			'class' => 'yii\caching\FileCache',
@@ -14,6 +15,15 @@ return array(
 		'assetManager' => array(
 			'bundles' => require(__DIR__ . '/assets.php'),
 		),
+		'log' => array(
+			'class' => 'yii\logging\Router',
+			'targets' => array(
+				'file' => array(
+					'class' => 'yii\logging\FileTarget',
+					'levels' => array('error', 'warning'),
+				),
+			),
+		),
 	),
 	'params' => array(
 		'adminEmail' => 'admin@example.com',
diff --git a/framework/base/Application.php b/framework/base/Application.php
index 5b92f76..ac7cc6a 100644
--- a/framework/base/Application.php
+++ b/framework/base/Application.php
@@ -8,7 +8,6 @@
 namespace yii\base;
 
 use Yii;
-use yii\helpers\FileHelper;
 
 /**
  * Application is the base class for all application classes.
diff --git a/framework/logging/Logger.php b/framework/logging/Logger.php
index 607c388..5c9a89d 100644
--- a/framework/logging/Logger.php
+++ b/framework/logging/Logger.php
@@ -6,7 +6,9 @@
  */
 
 namespace yii\logging;
-use yii\base\InvalidConfigException;
+
+use \yii\base\Component;
+use \yii\base\InvalidConfigException;
 
 /**
  * Logger records logged messages in memory.
@@ -17,7 +19,7 @@ use yii\base\InvalidConfigException;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class Logger extends \yii\base\Component
+class Logger extends Component
 {
 	/**
 	 * Error message level. An error message is one that indicates the abnormal termination of the
diff --git a/framework/logging/Router.php b/framework/logging/Router.php
index 2f399fe..f544b72 100644
--- a/framework/logging/Router.php
+++ b/framework/logging/Router.php
@@ -28,16 +28,16 @@ use yii\base\Application;
  *     'preload' => array('log'),
  *     'components' => array(
  *         'log' => array(
- *             'class' => '\yii\logging\Router',
+ *             'class' => 'yii\logging\Router',
  *             'targets' => array(
  *                 'file' => array(
- *                     'class' => '\yii\logging\FileTarget',
- *                     'levels' => 'trace, info',
- *                     'categories' => 'yii\*',
+ *                     'class' => 'yii\logging\FileTarget',
+ *                     'levels' => array('trace', 'info'),
+ *                     'categories' => array('yii\*'),
  *                 ),
  *                 'email' => array(
- *                     'class' => '\yii\logging\EmailTarget',
- *                     'levels' => 'error, warning',
+ *                     'class' => 'yii\logging\EmailTarget',
+ *                     'levels' => array('error', 'warning'),
  *                     'emails' => array('admin@example.com'),
  *                 ),
  *             ),
@@ -73,7 +73,6 @@ class Router extends Component
 	public function init()
 	{
 		parent::init();
-
 		foreach ($this->targets as $name => $target) {
 			if (!$target instanceof Target) {
 				$this->targets[$name] = Yii::createObject($target);

From c5bad9ea1b88adffe41390a9de13cea9bf0189f8 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Wed, 8 May 2013 09:39:34 -0400
Subject: [PATCH 095/152] Fixes issue #172: Added Object::className().

---
 apps/bootstrap/protected/views/layouts/main.php | 6 ++++--
 apps/bootstrap/protected/views/site/contact.php | 4 +++-
 apps/bootstrap/protected/views/site/login.php   | 4 +++-
 framework/base/Object.php                       | 8 ++++++++
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/apps/bootstrap/protected/views/layouts/main.php b/apps/bootstrap/protected/views/layouts/main.php
index 0eaeb99..1e8a3af 100644
--- a/apps/bootstrap/protected/views/layouts/main.php
+++ b/apps/bootstrap/protected/views/layouts/main.php
@@ -1,9 +1,11 @@
 <?php
+use yii\helpers\Html;
+use yii\widgets\Menu;
+
 /**
  * @var $this \yii\base\View
  * @var $content string
  */
-use yii\helpers\Html;
 $this->registerAssetBundle('app');
 ?>
 <?php $this->beginPage(); ?>
@@ -23,7 +25,7 @@ $this->registerAssetBundle('app');
 		<div class="navbar">
 			<div class="navbar-inner">
 				<div class="container">
-					<?php $this->widget('yii\widgets\Menu', array(
+					<?php $this->widget(Menu::className(), array(
 						'options' => array('class' => 'nav'),
 						'items' => array(
 							array('label' => 'Home', 'url' => array('/site/index')),
diff --git a/apps/bootstrap/protected/views/site/contact.php b/apps/bootstrap/protected/views/site/contact.php
index 5cb5a8e..4115b53 100644
--- a/apps/bootstrap/protected/views/site/contact.php
+++ b/apps/bootstrap/protected/views/site/contact.php
@@ -1,5 +1,7 @@
 <?php
 use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
 /**
  * @var yii\base\View $this
  * @var yii\widgets\ActiveForm $form
@@ -20,7 +22,7 @@ $this->params['breadcrumbs'][] = $this->title;
 	If you have business inquiries or other questions, please fill out the following form to contact us. Thank you.
 </p>
 
-<?php $form = $this->beginWidget('yii\widgets\ActiveForm', array(
+<?php $form = $this->beginWidget(ActiveForm::className(), array(
 	'options' => array('class' => 'form-horizontal'),
 	'fieldConfig' => array('inputOptions' => array('class' => 'input-xlarge')),
 )); ?>
diff --git a/apps/bootstrap/protected/views/site/login.php b/apps/bootstrap/protected/views/site/login.php
index f7f842e..65dc7d1 100644
--- a/apps/bootstrap/protected/views/site/login.php
+++ b/apps/bootstrap/protected/views/site/login.php
@@ -1,5 +1,7 @@
 <?php
 use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
 /**
  * @var yii\base\View $this
  * @var yii\widgets\ActiveForm $form
@@ -12,7 +14,7 @@ $this->params['breadcrumbs'][] = $this->title;
 
 <p>Please fill out the following fields to login:</p>
 
-<?php $form = $this->beginWidget('yii\widgets\ActiveForm', array('options' => array('class' => 'form-horizontal'))); ?>
+<?php $form = $this->beginWidget(ActiveForm::className(), array('options' => array('class' => 'form-horizontal'))); ?>
 	<?php echo $form->field($model, 'username')->textInput(); ?>
 	<?php echo $form->field($model, 'password')->passwordInput(); ?>
 	<?php echo $form->field($model, 'rememberMe')->checkbox(); ?>
diff --git a/framework/base/Object.php b/framework/base/Object.php
index a547990..a90a231 100644
--- a/framework/base/Object.php
+++ b/framework/base/Object.php
@@ -15,6 +15,14 @@ namespace yii\base;
 class Object
 {
 	/**
+	 * @return string the fully qualified name of this class.
+	 */
+	public static function className()
+	{
+		return get_called_class();
+	}
+
+	/**
 	 * Constructor.
 	 * The default implementation does two things:
 	 *

From 45e987d26c600b38bb52a48a1639e1795971076f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anderson=20M=C3=BCller?= <anderson.a.muller@gmail.com>
Date: Wed, 8 May 2013 20:09:34 +0300
Subject: [PATCH 096/152] Typo in isNewRecord property of ActiveRecord

---
 framework/db/ActiveRecord.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/db/ActiveRecord.php b/framework/db/ActiveRecord.php
index bf1f622..500029d 100644
--- a/framework/db/ActiveRecord.php
+++ b/framework/db/ActiveRecord.php
@@ -28,7 +28,7 @@ use yii\helpers\StringHelper;
  * @property TableSchema $tableSchema the schema information of the DB table associated with this AR class.
  * @property array $oldAttributes the old attribute values (name-value pairs).
  * @property array $dirtyAttributes the changed attribute values (name-value pairs).
- * @property boolean $isPrimaryKey whether the record is new and should be inserted when calling [[save()]].
+ * @property boolean $isNewRecord whether the record is new and should be inserted when calling [[save()]].
  * @property mixed $primaryKey the primary key value.
  * @property mixed $oldPrimaryKey the old primary key value.
  *

From 78b6607c11a9aeb810504213cb138965a10793f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anderson=20M=C3=BCller?= <anderson.a.muller@gmail.com>
Date: Wed, 8 May 2013 19:14:35 +0200
Subject: [PATCH 097/152] Fixes doc block in findWith method of ActiveRelation

---
 framework/db/ActiveRelation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/db/ActiveRelation.php b/framework/db/ActiveRelation.php
index 97e2a8c..42ae0e7 100644
--- a/framework/db/ActiveRelation.php
+++ b/framework/db/ActiveRelation.php
@@ -131,7 +131,7 @@ class ActiveRelation extends ActiveQuery
 
 	/**
 	 * Finds the related records and populates them into the primary models.
-	 * This method is internally by [[ActiveQuery]]. Do not call it directly.
+	 * This method is internally used by [[ActiveQuery]]. Do not call it directly.
 	 * @param string $name the relation name
 	 * @param array $primaryModels primary models
 	 * @return array the related models

From ded4ccd778c400c023d7e734304a70dfb1eea8d1 Mon Sep 17 00:00:00 2001
From: Suralc <thesurwaveing@googlemail.com>
Date: Wed, 8 May 2013 20:01:31 +0200
Subject: [PATCH 098/152] Fixed php 5.4+ Exception in Console helper

---
 framework/helpers/base/Console.php | 116 ++++++++++++++++++-------------------
 1 file changed, 58 insertions(+), 58 deletions(-)

diff --git a/framework/helpers/base/Console.php b/framework/helpers/base/Console.php
index 3c7dc0b..b611919 100644
--- a/framework/helpers/base/Console.php
+++ b/framework/helpers/base/Console.php
@@ -316,76 +316,76 @@ class Console
 				$styleA = array();
 				foreach (explode(';', $ansi) as $controlCode) {
 					switch ($controlCode) {
-						case static::FG_BLACK:
+						case self::FG_BLACK:
 							$style = array('color' => '#000000');
 							break;
-						case static::FG_BLUE:
+						case self::FG_BLUE:
 							$style = array('color' => '#000078');
 							break;
-						case static::FG_CYAN:
+						case self::FG_CYAN:
 							$style = array('color' => '#007878');
 							break;
-						case static::FG_GREEN:
+						case self::FG_GREEN:
 							$style = array('color' => '#007800');
 							break;
-						case static::FG_GREY:
+						case self::FG_GREY:
 							$style = array('color' => '#787878');
 							break;
-						case static::FG_PURPLE:
+						case self::FG_PURPLE:
 							$style = array('color' => '#780078');
 							break;
-						case static::FG_RED:
+						case self::FG_RED:
 							$style = array('color' => '#780000');
 							break;
-						case static::FG_YELLOW:
+						case self::FG_YELLOW:
 							$style = array('color' => '#787800');
 							break;
-						case static::BG_BLACK:
+						case self::BG_BLACK:
 							$style = array('background-color' => '#000000');
 							break;
-						case static::BG_BLUE:
+						case self::BG_BLUE:
 							$style = array('background-color' => '#000078');
 							break;
-						case static::BG_CYAN:
+						case self::BG_CYAN:
 							$style = array('background-color' => '#007878');
 							break;
-						case static::BG_GREEN:
+						case self::BG_GREEN:
 							$style = array('background-color' => '#007800');
 							break;
-						case static::BG_GREY:
+						case self::BG_GREY:
 							$style = array('background-color' => '#787878');
 							break;
-						case static::BG_PURPLE:
+						case self::BG_PURPLE:
 							$style = array('background-color' => '#780078');
 							break;
-						case static::BG_RED:
+						case self::BG_RED:
 							$style = array('background-color' => '#780000');
 							break;
-						case static::BG_YELLOW:
+						case self::BG_YELLOW:
 							$style = array('background-color' => '#787800');
 							break;
-						case static::BOLD:
+						case self::BOLD:
 							$style = array('font-weight' => 'bold');
 							break;
-						case static::ITALIC:
+						case self::ITALIC:
 							$style = array('font-style' => 'italic');
 							break;
-						case static::UNDERLINE:
+						case self::UNDERLINE:
 							$style = array('text-decoration' => array('underline'));
 							break;
-						case static::OVERLINED:
+						case self::OVERLINED:
 							$style = array('text-decoration' => array('overline'));
 							break;
-						case static::CROSSED_OUT:
+						case self::CROSSED_OUT:
 							$style = array('text-decoration' => array('line-through'));
 							break;
-						case static::BLINK:
+						case self::BLINK:
 							$style = array('text-decoration' => array('blink'));
 							break;
-						case static::NEGATIVE: // ???
-						case static::CONCEALED:
-						case static::ENCIRCLED:
-						case static::FRAMED:
+						case self::NEGATIVE: // ???
+						case self::CONCEALED:
+						case self::ENCIRCLED:
+						case self::FRAMED:
 							// TODO allow resetting codes
 							break;
 						case 0: // ansi reset
@@ -456,39 +456,39 @@ class Console
 	public static function renderColoredString($string, $colored = true)
 	{
 		static $conversions = array(
-			'%y' => array(static::FG_YELLOW),
-			'%g' => array(static::FG_GREEN),
-			'%b' => array(static::FG_BLUE),
-			'%r' => array(static::FG_RED),
-			'%p' => array(static::FG_PURPLE),
-			'%m' => array(static::FG_PURPLE),
-			'%c' => array(static::FG_CYAN),
-			'%w' => array(static::FG_GREY),
-			'%k' => array(static::FG_BLACK),
+			'%y' => array(self::FG_YELLOW),
+			'%g' => array(self::FG_GREEN),
+			'%b' => array(self::FG_BLUE),
+			'%r' => array(self::FG_RED),
+			'%p' => array(self::FG_PURPLE),
+			'%m' => array(self::FG_PURPLE),
+			'%c' => array(self::FG_CYAN),
+			'%w' => array(self::FG_GREY),
+			'%k' => array(self::FG_BLACK),
 			'%n' => array(0), // reset
-			'%Y' => array(static::FG_YELLOW, static::BOLD),
-			'%G' => array(static::FG_GREEN, static::BOLD),
-			'%B' => array(static::FG_BLUE, static::BOLD),
-			'%R' => array(static::FG_RED, static::BOLD),
-			'%P' => array(static::FG_PURPLE, static::BOLD),
-			'%M' => array(static::FG_PURPLE, static::BOLD),
-			'%C' => array(static::FG_CYAN, static::BOLD),
-			'%W' => array(static::FG_GREY, static::BOLD),
-			'%K' => array(static::FG_BLACK, static::BOLD),
-			'%N' => array(0, static::BOLD),
-			'%3' => array(static::BG_YELLOW),
-			'%2' => array(static::BG_GREEN),
-			'%4' => array(static::BG_BLUE),
-			'%1' => array(static::BG_RED),
-			'%5' => array(static::BG_PURPLE),
-			'%6' => array(static::BG_PURPLE),
-			'%7' => array(static::BG_CYAN),
-			'%0' => array(static::BG_GREY),
-			'%F' => array(static::BLINK),
-			'%U' => array(static::UNDERLINE),
-			'%8' => array(static::NEGATIVE),
-			'%9' => array(static::BOLD),
-			'%_' => array(static::BOLD)
+			'%Y' => array(self::FG_YELLOW, self::BOLD),
+			'%G' => array(self::FG_GREEN, self::BOLD),
+			'%B' => array(self::FG_BLUE, self::BOLD),
+			'%R' => array(self::FG_RED, self::BOLD),
+			'%P' => array(self::FG_PURPLE, self::BOLD),
+			'%M' => array(self::FG_PURPLE, self::BOLD),
+			'%C' => array(self::FG_CYAN, self::BOLD),
+			'%W' => array(self::FG_GREY, self::BOLD),
+			'%K' => array(self::FG_BLACK, self::BOLD),
+			'%N' => array(0, self::BOLD),
+			'%3' => array(self::BG_YELLOW),
+			'%2' => array(self::BG_GREEN),
+			'%4' => array(self::BG_BLUE),
+			'%1' => array(self::BG_RED),
+			'%5' => array(self::BG_PURPLE),
+			'%6' => array(self::BG_PURPLE),
+			'%7' => array(self::BG_CYAN),
+			'%0' => array(self::BG_GREY),
+			'%F' => array(self::BLINK),
+			'%U' => array(self::UNDERLINE),
+			'%8' => array(self::NEGATIVE),
+			'%9' => array(self::BOLD),
+			'%_' => array(self::BOLD)
 		);
 
 		if ($colored) {

From 8197ab556e33a917f989fc07617050dca648a7fe Mon Sep 17 00:00:00 2001
From: Suralc <thesurwaveing@googlemail.com>
Date: Wed, 8 May 2013 20:18:14 +0200
Subject: [PATCH 099/152] Revert static calls in switch

---
 framework/helpers/base/Console.php | 52 +++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/framework/helpers/base/Console.php b/framework/helpers/base/Console.php
index b611919..c2c8365 100644
--- a/framework/helpers/base/Console.php
+++ b/framework/helpers/base/Console.php
@@ -316,76 +316,76 @@ class Console
 				$styleA = array();
 				foreach (explode(';', $ansi) as $controlCode) {
 					switch ($controlCode) {
-						case self::FG_BLACK:
+						case static::FG_BLACK:
 							$style = array('color' => '#000000');
 							break;
-						case self::FG_BLUE:
+						case static::FG_BLUE:
 							$style = array('color' => '#000078');
 							break;
-						case self::FG_CYAN:
+						case static::FG_CYAN:
 							$style = array('color' => '#007878');
 							break;
-						case self::FG_GREEN:
+						case static::FG_GREEN:
 							$style = array('color' => '#007800');
 							break;
-						case self::FG_GREY:
+						case static::FG_GREY:
 							$style = array('color' => '#787878');
 							break;
-						case self::FG_PURPLE:
+						case static::FG_PURPLE:
 							$style = array('color' => '#780078');
 							break;
-						case self::FG_RED:
+						case static::FG_RED:
 							$style = array('color' => '#780000');
 							break;
-						case self::FG_YELLOW:
+						case static::FG_YELLOW:
 							$style = array('color' => '#787800');
 							break;
-						case self::BG_BLACK:
+						case static::BG_BLACK:
 							$style = array('background-color' => '#000000');
 							break;
-						case self::BG_BLUE:
+						case static::BG_BLUE:
 							$style = array('background-color' => '#000078');
 							break;
-						case self::BG_CYAN:
+						case static::BG_CYAN:
 							$style = array('background-color' => '#007878');
 							break;
-						case self::BG_GREEN:
+						case static::BG_GREEN:
 							$style = array('background-color' => '#007800');
 							break;
-						case self::BG_GREY:
+						case static::BG_GREY:
 							$style = array('background-color' => '#787878');
 							break;
-						case self::BG_PURPLE:
+						case static::BG_PURPLE:
 							$style = array('background-color' => '#780078');
 							break;
-						case self::BG_RED:
+						case static::BG_RED:
 							$style = array('background-color' => '#780000');
 							break;
-						case self::BG_YELLOW:
+						case static::BG_YELLOW:
 							$style = array('background-color' => '#787800');
 							break;
-						case self::BOLD:
+						case static::BOLD:
 							$style = array('font-weight' => 'bold');
 							break;
-						case self::ITALIC:
+						case static::ITALIC:
 							$style = array('font-style' => 'italic');
 							break;
-						case self::UNDERLINE:
+						case static::UNDERLINE:
 							$style = array('text-decoration' => array('underline'));
 							break;
-						case self::OVERLINED:
+						case static::OVERLINED:
 							$style = array('text-decoration' => array('overline'));
 							break;
-						case self::CROSSED_OUT:
+						case static::CROSSED_OUT:
 							$style = array('text-decoration' => array('line-through'));
 							break;
-						case self::BLINK:
+						case static::BLINK:
 							$style = array('text-decoration' => array('blink'));
 							break;
-						case self::NEGATIVE: // ???
-						case self::CONCEALED:
-						case self::ENCIRCLED:
-						case self::FRAMED:
+						case static::NEGATIVE: // ???
+						case static::CONCEALED:
+						case static::ENCIRCLED:
+						case static::FRAMED:
 							// TODO allow resetting codes
 							break;
 						case 0: // ansi reset

From 96fd37de2ef1107fb4a2f000244d43c45c67de7e Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Wed, 8 May 2013 15:27:06 -0400
Subject: [PATCH 100/152] Fixes issue #49: finished CAPTCHA feature.

---
 .../protected/controllers/SiteController.php       |   9 +
 apps/bootstrap/protected/models/ContactForm.php    |   2 +-
 apps/bootstrap/protected/views/site/contact.php    |  10 +
 framework/assets.php                               |   7 +
 framework/assets/yii.activeForm.js                 |   6 +-
 framework/assets/yii.captcha.js                    |  72 +++++
 framework/validators/CaptchaValidator.php          |   3 +-
 framework/web/CaptchaAction.php                    | 338 +++++++++++++++++++++
 framework/web/SpicyRice.md                         |  11 +
 framework/web/SpicyRice.ttf                        | Bin 0 -> 67244 bytes
 framework/widgets/ActiveField.php                  |   2 +-
 framework/widgets/Captcha.php                      | 102 +++++++
 12 files changed, 556 insertions(+), 6 deletions(-)
 create mode 100644 framework/assets/yii.captcha.js
 create mode 100644 framework/web/CaptchaAction.php
 create mode 100644 framework/web/SpicyRice.md
 create mode 100644 framework/web/SpicyRice.ttf
 create mode 100644 framework/widgets/Captcha.php

diff --git a/apps/bootstrap/protected/controllers/SiteController.php b/apps/bootstrap/protected/controllers/SiteController.php
index d1186f6..b06ed06 100644
--- a/apps/bootstrap/protected/controllers/SiteController.php
+++ b/apps/bootstrap/protected/controllers/SiteController.php
@@ -6,6 +6,15 @@ use app\models\ContactForm;
 
 class SiteController extends Controller
 {
+	public function actions()
+	{
+		return array(
+			'captcha' => array(
+				'class' => 'yii\web\CaptchaAction',
+			),
+		);
+	}
+
 	public function actionIndex()
 	{
 		echo $this->render('index');
diff --git a/apps/bootstrap/protected/models/ContactForm.php b/apps/bootstrap/protected/models/ContactForm.php
index 5124b2c..7b713a1 100644
--- a/apps/bootstrap/protected/models/ContactForm.php
+++ b/apps/bootstrap/protected/models/ContactForm.php
@@ -26,7 +26,7 @@ class ContactForm extends Model
 			// email has to be a valid email address
 			array('email', 'email'),
 			// verifyCode needs to be entered correctly
-			//array('verifyCode', 'captcha', 'allowEmpty' => !Captcha::checkRequirements()),
+			array('verifyCode', 'captcha'),
 		);
 	}
 
diff --git a/apps/bootstrap/protected/views/site/contact.php b/apps/bootstrap/protected/views/site/contact.php
index 4115b53..bee1ede 100644
--- a/apps/bootstrap/protected/views/site/contact.php
+++ b/apps/bootstrap/protected/views/site/contact.php
@@ -1,6 +1,7 @@
 <?php
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
+use yii\widgets\Captcha;
 
 /**
  * @var yii\base\View $this
@@ -30,6 +31,15 @@ $this->params['breadcrumbs'][] = $this->title;
 	<?php echo $form->field($model, 'email')->textInput(); ?>
 	<?php echo $form->field($model, 'subject')->textInput(); ?>
 	<?php echo $form->field($model, 'body')->textArea(array('rows' => 6)); ?>
+	<?php
+		$field = $form->field($model, 'verifyCode');
+		echo $field->begin();
+		echo $field->label();
+		$this->widget(Captcha::className());
+		echo Html::activeTextInput($model, 'verifyCode', array('class' => 'input-medium'));
+		echo $field->error();
+		echo $field->end();
+	?>
 	<div class="form-actions">
 		<?php echo Html::submitButton('Submit', null, null, array('class' => 'btn btn-primary')); ?>
 	</div>
diff --git a/framework/assets.php b/framework/assets.php
index 919011b..10a450a 100644
--- a/framework/assets.php
+++ b/framework/assets.php
@@ -28,4 +28,11 @@ return array(
 		),
 		'depends' => array('yii', 'yii/validation'),
 	),
+	'yii/captcha' => array(
+		'sourcePath' => __DIR__ . '/assets',
+		'js' => array(
+			'yii.captcha.js',
+		),
+		'depends' => array('yii'),
+	),
 );
diff --git a/framework/assets/yii.activeForm.js b/framework/assets/yii.activeForm.js
index 158ea74..d987879 100644
--- a/framework/assets/yii.activeForm.js
+++ b/framework/assets/yii.activeForm.js
@@ -116,8 +116,8 @@
 			});
 		},
 
-		options: function() {
-			return this.data('yiiActiveForm').settings;
+		data: function() {
+			return this.data('yiiActiveForm');
 		},
 
 		submitForm: function () {
@@ -384,4 +384,4 @@
 		}
 	};
 
-})(window.jQuery);
\ No newline at end of file
+})(window.jQuery);
diff --git a/framework/assets/yii.captcha.js b/framework/assets/yii.captcha.js
new file mode 100644
index 0000000..9211edb
--- /dev/null
+++ b/framework/assets/yii.captcha.js
@@ -0,0 +1,72 @@
+/**
+ * Yii Captcha widget.
+ *
+ * This is the JavaScript widget used by the yii\widgets\Captcha widget.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+(function ($) {
+	$.fn.yiiCaptcha = function (method) {
+		if (methods[method]) {
+			return methods[method].apply(this, Array.prototype.slice.call(arguments, 1));
+		} else if (typeof method === 'object' || !method) {
+			return methods.init.apply(this, arguments);
+		} else {
+			$.error('Method ' + method + ' does not exist on jQuery.yiiCaptcha');
+			return false;
+		}
+	};
+
+	var defaults = {
+		refreshUrl: undefined,
+		hashKey: undefined
+	};
+
+	var methods = {
+		init: function (options) {
+			return this.each(function () {
+				var $e = $(this);
+				var settings = $.extend({}, defaults, options || {});
+				$e.data('yiiCaptcha', {
+					settings: settings
+				});
+
+				$e.on('click.yiiCaptcha', function() {
+					methods.refresh.apply($e);
+					return false;
+				});
+
+			});
+		},
+
+		refresh: function () {
+			var $e = this,
+				settings = this.data('yiiCaptcha').settings;
+			$.ajax({
+				url: $e.data('yiiCaptcha').settings.refreshUrl,
+				dataType: 'json',
+				cache: false,
+				success: function(data) {
+					$e.attr('src', data['url']);
+					$('body').data(settings.hashKey, [data['hash1'], data['hash2']]);
+				}
+			});
+		},
+
+		destroy: function () {
+			return this.each(function () {
+				$(window).unbind('.yiiCaptcha');
+				$(this).removeData('yiiCaptcha');
+			});
+		},
+
+		data: function() {
+			return this.data('yiiCaptcha');
+		}
+	};
+})(window.jQuery);
+
diff --git a/framework/validators/CaptchaValidator.php b/framework/validators/CaptchaValidator.php
index 4eba9df..2e58cf2 100644
--- a/framework/validators/CaptchaValidator.php
+++ b/framework/validators/CaptchaValidator.php
@@ -21,6 +21,7 @@ use yii\helpers\Html;
  */
 class CaptchaValidator extends Validator
 {
+	public $skipOnEmpty = false;
 	/**
 	 * @var boolean whether the comparison is case sensitive. Defaults to false.
 	 */
@@ -70,7 +71,7 @@ class CaptchaValidator extends Validator
 	/**
 	 * Returns the CAPTCHA action object.
 	 * @throws InvalidConfigException
-	 * @return CaptchaAction the action object
+	 * @return \yii\web\CaptchaAction the action object
 	 */
 	public function getCaptchaAction()
 	{
diff --git a/framework/web/CaptchaAction.php b/framework/web/CaptchaAction.php
new file mode 100644
index 0000000..e3d6eaa
--- /dev/null
+++ b/framework/web/CaptchaAction.php
@@ -0,0 +1,338 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use Yii;
+use yii\base\Action;
+use yii\base\InvalidConfigException;
+use yii\widgets\Captcha;
+
+/**
+ * CaptchaAction renders a CAPTCHA image.
+ *
+ * CaptchaAction is used together with [[Captcha]] and [[\yii\validators\CaptchaValidator]]
+ * to provide the [CAPTCHA](http://en.wikipedia.org/wiki/Captcha) feature.
+ *
+ * By configuring the properties of CaptchaAction, you may customize the appearance of
+ * the generated CAPTCHA images, such as the font color, the background color, etc.
+ *
+ * Note that CaptchaAction requires either GD2 extension or ImageMagick PHP extension.
+ *
+ * Using CAPTCHA involves the following steps:
+ *
+ * 1. Override [[\yii\web\Controller::actions()]] and register an action of class CaptchaAction with ID 'captcha'
+ * 2. In the form model, declare an attribute to store user-entered verification code, and declare the attribute
+ *    to be validated by the 'captcha' validator.
+ * 3. In the controller view, insert a [[Captcha]] widget in the form.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class CaptchaAction extends Action
+{
+	/**
+	 * The name of the GET parameter indicating whether the CAPTCHA image should be regenerated.
+	 */
+	const REFRESH_GET_VAR = 'refresh';
+	/**
+	 * @var integer how many times should the same CAPTCHA be displayed. Defaults to 3.
+	 * A value less than or equal to 0 means the test is unlimited (available since version 1.1.2).
+	 */
+	public $testLimit = 3;
+	/**
+	 * @var integer the width of the generated CAPTCHA image. Defaults to 120.
+	 */
+	public $width = 120;
+	/**
+	 * @var integer the height of the generated CAPTCHA image. Defaults to 50.
+	 */
+	public $height = 50;
+	/**
+	 * @var integer padding around the text. Defaults to 2.
+	 */
+	public $padding = 2;
+	/**
+	 * @var integer the background color. For example, 0x55FF00.
+	 * Defaults to 0xFFFFFF, meaning white color.
+	 */
+	public $backColor = 0xFFFFFF;
+	/**
+	 * @var integer the font color. For example, 0x55FF00. Defaults to 0x2040A0 (blue color).
+	 */
+	public $foreColor = 0x2040A0;
+	/**
+	 * @var boolean whether to use transparent background. Defaults to false.
+	 */
+	public $transparent = false;
+	/**
+	 * @var integer the minimum length for randomly generated word. Defaults to 6.
+	 */
+	public $minLength = 6;
+	/**
+	 * @var integer the maximum length for randomly generated word. Defaults to 7.
+	 */
+	public $maxLength = 7;
+	/**
+	 * @var integer the offset between characters. Defaults to -2. You can adjust this property
+	 * in order to decrease or increase the readability of the captcha.
+	 **/
+	public $offset = -2;
+	/**
+	 * @var string the TrueType font file. This can be either a file path or path alias.
+	 */
+	public $fontFile = '@yii/web/SpicyRice.ttf';
+	/**
+	 * @var string the fixed verification code. When this is property is set,
+	 * [[getVerifyCode()]] will always return the value of this property.
+	 * This is mainly used in automated tests where we want to be able to reproduce
+	 * the same verification code each time we run the tests.
+	 * If not set, it means the verification code will be randomly generated.
+	 */
+	public $fixedVerifyCode;
+
+
+	/**
+	 * Initializes the action.
+	 * @throws InvalidConfigException if the font file does not exist.
+	 */
+	public function init()
+	{
+		$this->fontFile = Yii::getAlias($this->fontFile);
+		if (!is_file($this->fontFile)) {
+			throw new InvalidConfigException("The font file does not exist: {$this->fontFile}");
+		}
+	}
+
+	/**
+	 * Runs the action.
+	 */
+	public function run()
+	{
+		if (isset($_GET[self::REFRESH_GET_VAR])) {
+			// AJAX request for regenerating code
+			$code = $this->getVerifyCode(true);
+			echo json_encode(array(
+				'hash1' => $this->generateValidationHash($code),
+				'hash2' => $this->generateValidationHash(strtolower($code)),
+				// we add a random 'v' parameter so that FireFox can refresh the image
+				// when src attribute of image tag is changed
+				'url' => $this->controller->createUrl($this->id, array('v' => uniqid())),
+			));
+		} else {
+			$this->renderImage($this->getVerifyCode());
+		}
+		Yii::$app->end();
+	}
+
+	/**
+	 * Generates a hash code that can be used for client side validation.
+	 * @param string $code the CAPTCHA code
+	 * @return string a hash code generated from the CAPTCHA code
+	 */
+	public function generateValidationHash($code)
+	{
+		for ($h = 0, $i = strlen($code) - 1; $i >= 0; --$i) {
+			$h += ord($code[$i]);
+		}
+		return $h;
+	}
+
+	/**
+	 * Gets the verification code.
+	 * @param boolean $regenerate whether the verification code should be regenerated.
+	 * @return string the verification code.
+	 */
+	public function getVerifyCode($regenerate = false)
+	{
+		if ($this->fixedVerifyCode !== null) {
+			return $this->fixedVerifyCode;
+		}
+
+		$session = Yii::$app->session;
+		$session->open();
+		$name = $this->getSessionKey();
+		if ($session[$name] === null || $regenerate) {
+			$session[$name] = $this->generateVerifyCode();
+			$session[$name . 'count'] = 1;
+		}
+		return $session[$name];
+	}
+
+	/**
+	 * Validates the input to see if it matches the generated code.
+	 * @param string $input user input
+	 * @param boolean $caseSensitive whether the comparison should be case-sensitive
+	 * @return boolean whether the input is valid
+	 */
+	public function validate($input, $caseSensitive)
+	{
+		$code = $this->getVerifyCode();
+		$valid = $caseSensitive ? ($input === $code) : strcasecmp($input, $code) === 0;
+		$session = Yii::$app->session;
+		$session->open();
+		$name = $this->getSessionKey() . 'count';
+		$session[$name] = $session[$name] + 1;
+		if ($session[$name] > $this->testLimit && $this->testLimit > 0) {
+			$this->getVerifyCode(true);
+		}
+		return $valid;
+	}
+
+	/**
+	 * Generates a new verification code.
+	 * @return string the generated verification code
+	 */
+	protected function generateVerifyCode()
+	{
+		if ($this->minLength < 3) {
+			$this->minLength = 3;
+		}
+		if ($this->maxLength > 20) {
+			$this->maxLength = 20;
+		}
+		if ($this->minLength > $this->maxLength) {
+			$this->maxLength = $this->minLength;
+		}
+		$length = mt_rand($this->minLength, $this->maxLength);
+
+		$letters = 'bcdfghjklmnpqrstvwxyz';
+		$vowels = 'aeiou';
+		$code = '';
+		for ($i = 0; $i < $length; ++$i) {
+			if ($i % 2 && mt_rand(0, 10) > 2 || !($i % 2) && mt_rand(0, 10) > 9) {
+				$code .= $vowels[mt_rand(0, 4)];
+			} else {
+				$code .= $letters[mt_rand(0, 20)];
+			}
+		}
+
+		return $code;
+	}
+
+	/**
+	 * Returns the session variable name used to store verification code.
+	 * @return string the session variable name
+	 */
+	protected function getSessionKey()
+	{
+		return '__captcha/' . $this->getUniqueId();
+	}
+
+	/**
+	 * Renders the CAPTCHA image.
+	 * @param string $code the verification code
+	 */
+	protected function renderImage($code)
+	{
+		if (Captcha::checkRequirements() === 'gd') {
+			$this->renderImageByGD($code);
+		} else {
+			$this->renderImageByImagick($code);
+		}
+	}
+
+	/**
+	 * Renders the CAPTCHA image based on the code using GD library.
+	 * @param string $code the verification code
+	 */
+	protected function renderImageByGD($code)
+	{
+		$image = imagecreatetruecolor($this->width, $this->height);
+
+		$backColor = imagecolorallocate($image,
+			(int)($this->backColor % 0x1000000 / 0x10000),
+			(int)($this->backColor % 0x10000 / 0x100),
+			$this->backColor % 0x100);
+		imagefilledrectangle($image, 0, 0, $this->width, $this->height, $backColor);
+		imagecolordeallocate($image, $backColor);
+
+		if ($this->transparent) {
+			imagecolortransparent($image, $backColor);
+		}
+
+		$foreColor = imagecolorallocate($image,
+			(int)($this->foreColor % 0x1000000 / 0x10000),
+			(int)($this->foreColor % 0x10000 / 0x100),
+			$this->foreColor % 0x100);
+
+		if ($this->fontFile === null) {
+			$this->fontFile = dirname(__FILE__) . '/SpicyRice.ttf';
+		}
+
+		$length = strlen($code);
+		$box = imagettfbbox(30, 0, $this->fontFile, $code);
+		$w = $box[4] - $box[0] + $this->offset * ($length - 1);
+		$h = $box[1] - $box[5];
+		$scale = min(($this->width - $this->padding * 2) / $w, ($this->height - $this->padding * 2) / $h);
+		$x = 10;
+		$y = round($this->height * 27 / 40);
+		for ($i = 0; $i < $length; ++$i) {
+			$fontSize = (int)(rand(26, 32) * $scale * 0.8);
+			$angle = rand(-10, 10);
+			$letter = $code[$i];
+			$box = imagettftext($image, $fontSize, $angle, $x, $y, $foreColor, $this->fontFile, $letter);
+			$x = $box[2] + $this->offset;
+		}
+
+		imagecolordeallocate($image, $foreColor);
+
+		header('Pragma: public');
+		header('Expires: 0');
+		header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+		header('Content-Transfer-Encoding: binary');
+		header("Content-type: image/png");
+		imagepng($image);
+		imagedestroy($image);
+	}
+
+	/**
+	 * Renders the CAPTCHA image based on the code using ImageMagick library.
+	 * @param string $code the verification code
+	 */
+	protected function renderImageByImagick($code)
+	{
+		$backColor = $this->transparent ? new \ImagickPixel('transparent') : new \ImagickPixel('#' . dechex($this->backColor));
+		$foreColor = new \ImagickPixel('#' . dechex($this->foreColor));
+
+		$image = new \Imagick();
+		$image->newImage($this->width, $this->height, $backColor);
+
+		if ($this->fontFile === null) {
+			$this->fontFile = dirname(__FILE__) . '/SpicyRice.ttf';
+		}
+
+		$draw = new \ImagickDraw();
+		$draw->setFont($this->fontFile);
+		$draw->setFontSize(30);
+		$fontMetrics = $image->queryFontMetrics($draw, $code);
+
+		$length = strlen($code);
+		$w = (int)($fontMetrics['textWidth']) - 8 + $this->offset * ($length - 1);
+		$h = (int)($fontMetrics['textHeight']) - 8;
+		$scale = min(($this->width - $this->padding * 2) / $w, ($this->height - $this->padding * 2) / $h);
+		$x = 10;
+		$y = round($this->height * 27 / 40);
+		for ($i = 0; $i < $length; ++$i) {
+			$draw = new \ImagickDraw();
+			$draw->setFont($this->fontFile);
+			$draw->setFontSize((int)(rand(26, 32) * $scale * 0.8));
+			$draw->setFillColor($foreColor);
+			$image->annotateImage($draw, $x, $y, rand(-10, 10), $code[$i]);
+			$fontMetrics = $image->queryFontMetrics($draw, $code[$i]);
+			$x += (int)($fontMetrics['textWidth']) + $this->offset;
+		}
+
+		header('Pragma: public');
+		header('Expires: 0');
+		header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+		header('Content-Transfer-Encoding: binary');
+		header("Content-type: image/png");
+		$image->setImageFormat('png');
+		echo $image;
+	}
+}
diff --git a/framework/web/SpicyRice.md b/framework/web/SpicyRice.md
new file mode 100644
index 0000000..d99f3dc
--- /dev/null
+++ b/framework/web/SpicyRice.md
@@ -0,0 +1,11 @@
+## Spicy Rice font
+
+* **Author:** Brian J. Bonislawsky, Astigmatic (AOETI, Astigmatic One Eye Typographic Institute)
+* **License:** SIL Open Font License (OFL), version 1.1, [notes and FAQ](http://scripts.sil.org/OFL)
+
+## Links
+
+* [Astigmatic](http://www.astigmatic.com/)
+* [Google WebFonts](http://www.google.com/webfonts/specimen/Spicy+Rice)
+* [fontsquirrel.com](http://www.fontsquirrel.com/fonts/spicy-rice)
+* [fontspace.com](http://www.fontspace.com/astigmatic-one-eye-typographic-institute/spicy-rice)
diff --git a/framework/web/SpicyRice.ttf b/framework/web/SpicyRice.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..638436cd38eab22a9e9d1a3d160a4542ec73f955
GIT binary patch
literal 67244
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
W)Br(I?aL1N<zBQ1@#S7c`TqbUUn^Gt

literal 0
HcmV?d00001

diff --git a/framework/widgets/ActiveField.php b/framework/widgets/ActiveField.php
index aaa9470..9f3f201 100644
--- a/framework/widgets/ActiveField.php
+++ b/framework/widgets/ActiveField.php
@@ -152,7 +152,7 @@ class ActiveField extends Component
 			$options['enableAjaxValidation'] = 1;
 		}
 
-		if ($enableClientValidation || $enableAjaxValidation) {
+		if ($enableClientValidation && !empty($options['validate']) || $enableAjaxValidation) {
 			$inputID = Html::getInputId($this->model, $this->attribute);
 			$options['name'] = $inputID;
 			$names = array(
diff --git a/framework/widgets/Captcha.php b/framework/widgets/Captcha.php
new file mode 100644
index 0000000..918e30c
--- /dev/null
+++ b/framework/widgets/Captcha.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\widgets;
+
+use Yii;
+use yii\base\InvalidConfigException;
+use yii\base\Widget;
+use yii\helpers\Html;
+use yii\helpers\Json;
+use yii\web\CaptchaAction;
+
+/**
+ * Captcha renders a CAPTCHA image element.
+ *
+ * Captcha is used together with [[CaptchaAction]] provide [CAPTCHA](http://en.wikipedia.org/wiki/Captcha)
+ * - a way of preventing Website spamming.
+ *
+ * The image element rendered by Captcha will display a CAPTCHA image generated by
+ * an action whose route is specified by [[captchaAction]]. This action must be an instance of [[CaptchaAction]].
+ *
+ * When the user clicks on the CAPTCHA image, it will cause the CAPTCHA image
+ * to be refreshed with a new CAPTCHA.
+ *
+ * You may use [[\yii\validators\CaptchaValidator]] to validate the user input matches
+ * the current CAPTCHA verification code.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Captcha extends Widget
+{
+	/**
+	 * @var string the route of the action that generates the CAPTCHA images.
+	 * The action represented by this route must be an action of [[CaptchaAction]].
+	 */
+	public $captchaAction = 'site/captcha';
+	/**
+	 * @var array HTML attributes to be applied to the rendered image element.
+	 */
+	public $options = array();
+
+
+	/**
+	 * Renders the widget.
+	 */
+	public function run()
+	{
+		$this->checkRequirements();
+
+		if (!isset($this->options['id'])) {
+			$this->options['id'] = $this->getId();
+		}
+		$id = $this->options['id'];
+		$options = Json::encode($this->getClientOptions());
+		$this->view->registerAssetBundle('yii/captcha');
+		$this->view->registerJs("jQuery('#$id').yiiCaptcha($options);");
+		$url = Yii::$app->getUrlManager()->createUrl($this->captchaAction, array('v' => uniqid()));
+		echo Html::img($url, $this->options);
+	}
+
+	/**
+	 * Returns the options for the captcha JS widget.
+	 * @return array the options
+	 */
+	protected function getClientOptions()
+	{
+		$options = array(
+			'refreshUrl' => Html::url(array($this->captchaAction, CaptchaAction::REFRESH_GET_VAR => 1)),
+			'hashKey' => "yiiCaptcha/{$this->captchaAction}",
+		);
+		return $options;
+	}
+
+	/**
+	 * Checks if there is graphic extension available to generate CAPTCHA images.
+	 * This method will check the existence of ImageMagick and GD extensions.
+	 * @return string the name of the graphic extension, either "imagick" or "gd".
+	 * @throws InvalidConfigException if neither ImageMagick nor GD is installed.
+	 */
+	public static function checkRequirements()
+	{
+		if (extension_loaded('imagick')) {
+			$imagick = new \Imagick();
+			$imagickFormats = $imagick->queryFormats('PNG');
+			if (in_array('PNG', $imagickFormats)) {
+				return 'imagick';
+			}
+		}
+		if (extension_loaded('gd')) {
+			$gdInfo = gd_info();
+			if (!empty($gdInfo['FreeType Support'])) {
+				return 'gd';
+			}
+		}
+		throw new InvalidConfigException('GD with FreeType or ImageMagick PHP extensions are required.');
+	}
+}

From b836665dfd52a1880904b3f8120c9e60c2f0e056 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Wed, 8 May 2013 17:36:34 -0400
Subject: [PATCH 101/152] Added beginPage and endPage events.

---
 framework/base/View.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/framework/base/View.php b/framework/base/View.php
index af1f0d5..af65c49 100644
--- a/framework/base/View.php
+++ b/framework/base/View.php
@@ -23,6 +23,14 @@ use yii\helpers\Html;
 class View extends Component
 {
 	/**
+	 * @event ViewEvent an event that is triggered by [[beginPage()]].
+	 */
+	const EVENT_BEGIN_PAGE = 'beginPage';
+	/**
+	 * @event ViewEvent an event that is triggered by [[endPage()]].
+	 */
+	const EVENT_END_PAGE = 'endPage';
+	/**
 	 * @event ViewEvent an event that is triggered by [[renderFile()]] right before it renders a view file.
 	 */
 	const EVENT_BEFORE_RENDER = 'beforeRender';
@@ -555,6 +563,8 @@ class View extends Component
 	{
 		ob_start();
 		ob_implicit_flush(false);
+
+		$this->trigger(self::EVENT_BEGIN_PAGE);
 	}
 
 	/**
@@ -562,6 +572,8 @@ class View extends Component
 	 */
 	public function endPage()
 	{
+		$this->trigger(self::EVENT_END_PAGE);
+
 		$content = ob_get_clean();
 		echo strtr($content, array(
 			self::PL_HEAD => $this->renderHeadHtml(),

From 6ed419849eff3888240940ab0eea706cd411ed56 Mon Sep 17 00:00:00 2001
From: Dev-Speranza <dev.speranza@gmail.com>
Date: Thu, 9 May 2013 02:40:02 +0300
Subject: [PATCH 102/152] Fix $schemaMap declaration for Mssql driver

---
 framework/db/Connection.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/db/Connection.php b/framework/db/Connection.php
index 03b10a8..37a5307 100644
--- a/framework/db/Connection.php
+++ b/framework/db/Connection.php
@@ -242,7 +242,7 @@ class Connection extends Component
 		'mysql' => 'yii\db\mysql\Schema',    // MySQL
 		'sqlite' => 'yii\db\sqlite\Schema',  // sqlite 3
 		'sqlite2' => 'yii\db\sqlite\Schema', // sqlite 2
-		'mssql' => 'yi\db\dao\mssql\Schema', // Mssql driver on windows hosts
+		'mssql' => 'yii\db\dao\mssql\Schema', // Mssql driver on windows hosts
 		'sqlsrv' => 'yii\db\mssql\Schema',   // Mssql
 		'oci' => 'yii\db\oci\Schema',        // Oracle driver
 		'dblib' => 'yii\db\mssql\Schema',    // dblib drivers on linux (and maybe others os) hosts

From c7e40f5c7a910dc39e89390054d52bd0d1dab4dd Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Wed, 8 May 2013 22:58:32 -0400
Subject: [PATCH 103/152] Debug toolbar WIP.

---
 apps/bootstrap/protected/config/main.php          |  5 +++
 apps/bootstrap/protected/views/layouts/main.php   |  1 +
 framework/assets.php                              |  7 +++++
 framework/assets/yii.debug.js                     | 26 ++++++++++++++++
 framework/assets/yii.validation.js                |  2 +-
 framework/debug/Module.php                        | 17 ++++++++++
 framework/debug/Toolbar.php                       | 38 +++++++++++++++++++++++
 framework/debug/controllers/DefaultController.php | 22 +++++++++++++
 framework/logging/Logger.php                      |  6 ++++
 9 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 framework/assets/yii.debug.js
 create mode 100644 framework/debug/Module.php
 create mode 100644 framework/debug/Toolbar.php
 create mode 100644 framework/debug/controllers/DefaultController.php

diff --git a/apps/bootstrap/protected/config/main.php b/apps/bootstrap/protected/config/main.php
index 20b5e7e..f19dead 100644
--- a/apps/bootstrap/protected/config/main.php
+++ b/apps/bootstrap/protected/config/main.php
@@ -4,6 +4,11 @@ return array(
 	'id' => 'hello',
 	'basePath' => dirname(__DIR__),
 	'preload' => array('log'),
+	'modules' => array(
+		'debug' => array(
+			'class' => 'yii\debug\Module',
+		)
+	),
 	'components' => array(
 		'cache' => array(
 			'class' => 'yii\caching\FileCache',
diff --git a/apps/bootstrap/protected/views/layouts/main.php b/apps/bootstrap/protected/views/layouts/main.php
index 1e8a3af..a81f983 100644
--- a/apps/bootstrap/protected/views/layouts/main.php
+++ b/apps/bootstrap/protected/views/layouts/main.php
@@ -58,6 +58,7 @@ $this->registerAssetBundle('app');
 	</div>
 	<?php $this->endBody(); ?>
 </div>
+<?php $this->widget('yii\debug\Toolbar'); ?>
 </body>
 </html>
 <?php $this->endPage(); ?>
diff --git a/framework/assets.php b/framework/assets.php
index 10a450a..7ee177d 100644
--- a/framework/assets.php
+++ b/framework/assets.php
@@ -35,4 +35,11 @@ return array(
 		),
 		'depends' => array('yii'),
 	),
+	'yii/debug' => array(
+		'sourcePath' => __DIR__ . '/assets',
+		'js' => array(
+			'yii.debug.js',
+		),
+		'depends' => array('yii'),
+	),
 );
diff --git a/framework/assets/yii.debug.js b/framework/assets/yii.debug.js
new file mode 100644
index 0000000..4e32d89
--- /dev/null
+++ b/framework/assets/yii.debug.js
@@ -0,0 +1,26 @@
+/**
+ * Yii debug module.
+ *
+ * This JavaScript module provides the functions needed by the Yii debug toolbar.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+
+yii.debug = (function ($) {
+	return {
+		load: function (id, url) {
+			$.ajax({
+				url: url,
+				//dataType: 'json',
+				success: function(data) {
+					var $e = $('#' + id);
+					$e.html(data);
+				}
+			});
+		}
+	};
+})(jQuery);
diff --git a/framework/assets/yii.validation.js b/framework/assets/yii.validation.js
index fd098be..5fa8492 100644
--- a/framework/assets/yii.validation.js
+++ b/framework/assets/yii.validation.js
@@ -1,7 +1,7 @@
 /**
  * Yii validation module.
  *
- * This JavaScript module provides the validation methods for the built-in validaotrs.
+ * This JavaScript module provides the validation methods for the built-in validators.
  *
  * @link http://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
diff --git a/framework/debug/Module.php b/framework/debug/Module.php
new file mode 100644
index 0000000..3421d95
--- /dev/null
+++ b/framework/debug/Module.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\debug;
+
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Module extends \yii\base\Module
+{
+	public $controllerNamespace = 'yii\debug\controllers';
+}
\ No newline at end of file
diff --git a/framework/debug/Toolbar.php b/framework/debug/Toolbar.php
new file mode 100644
index 0000000..84b55c8
--- /dev/null
+++ b/framework/debug/Toolbar.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\debug;
+
+use Yii;
+use yii\base\Widget;
+use yii\helpers\Html;
+
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Toolbar extends Widget
+{
+	public $debugAction = 'debug';
+	public $enabled = YII_DEBUG;
+
+	public function run()
+	{
+		if ($this->enabled) {
+			$id = 'yii-debug-toolbar';
+			$url = Yii::$app->getUrlManager()->createUrl($this->debugAction, array(
+				'tag' => Yii::getLogger()->tag,
+			));
+			$this->view->registerJs("yii.debug.load('$id', '$url');");
+			$this->view->registerAssetBundle('yii/debug');
+			echo Html::tag('div', '', array(
+				'id' => $id,
+				'style' => 'display: none',
+			));
+		}
+	}
+}
diff --git a/framework/debug/controllers/DefaultController.php b/framework/debug/controllers/DefaultController.php
new file mode 100644
index 0000000..ca90920
--- /dev/null
+++ b/framework/debug/controllers/DefaultController.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\debug\controllers;
+
+use yii\web\Controller;
+
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class DefaultController extends Controller
+{
+	public function actionIndex($tag)
+	{
+		echo $tag;
+	}
+}
\ No newline at end of file
diff --git a/framework/logging/Logger.php b/framework/logging/Logger.php
index 5c9a89d..b557c5e 100644
--- a/framework/logging/Logger.php
+++ b/framework/logging/Logger.php
@@ -82,6 +82,11 @@ class Logger extends Component
 	 * @var Router the log target router registered with this logger.
 	 */
 	public $router;
+	/**
+	 * @var string a tag that uniquely identifies the current request. This can be used
+	 * to differentiate the log messages for different requests.
+	 */
+	public $tag;
 
 	/**
 	 * Initializes the logger by registering [[flush()]] as a shutdown function.
@@ -89,6 +94,7 @@ class Logger extends Component
 	public function init()
 	{
 		parent::init();
+		$this->tag = date('Ymd-His', microtime(true));
 		register_shutdown_function(array($this, 'flush'), true);
 	}
 

From a51019bbed999d20c61563d5e1ab73bccc8e0119 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Thu, 9 May 2013 11:31:34 +0200
Subject: [PATCH 104/152] Console helper: use self:: for refering to constants

---
 framework/helpers/base/Console.php | 52 +++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/framework/helpers/base/Console.php b/framework/helpers/base/Console.php
index c2c8365..b611919 100644
--- a/framework/helpers/base/Console.php
+++ b/framework/helpers/base/Console.php
@@ -316,76 +316,76 @@ class Console
 				$styleA = array();
 				foreach (explode(';', $ansi) as $controlCode) {
 					switch ($controlCode) {
-						case static::FG_BLACK:
+						case self::FG_BLACK:
 							$style = array('color' => '#000000');
 							break;
-						case static::FG_BLUE:
+						case self::FG_BLUE:
 							$style = array('color' => '#000078');
 							break;
-						case static::FG_CYAN:
+						case self::FG_CYAN:
 							$style = array('color' => '#007878');
 							break;
-						case static::FG_GREEN:
+						case self::FG_GREEN:
 							$style = array('color' => '#007800');
 							break;
-						case static::FG_GREY:
+						case self::FG_GREY:
 							$style = array('color' => '#787878');
 							break;
-						case static::FG_PURPLE:
+						case self::FG_PURPLE:
 							$style = array('color' => '#780078');
 							break;
-						case static::FG_RED:
+						case self::FG_RED:
 							$style = array('color' => '#780000');
 							break;
-						case static::FG_YELLOW:
+						case self::FG_YELLOW:
 							$style = array('color' => '#787800');
 							break;
-						case static::BG_BLACK:
+						case self::BG_BLACK:
 							$style = array('background-color' => '#000000');
 							break;
-						case static::BG_BLUE:
+						case self::BG_BLUE:
 							$style = array('background-color' => '#000078');
 							break;
-						case static::BG_CYAN:
+						case self::BG_CYAN:
 							$style = array('background-color' => '#007878');
 							break;
-						case static::BG_GREEN:
+						case self::BG_GREEN:
 							$style = array('background-color' => '#007800');
 							break;
-						case static::BG_GREY:
+						case self::BG_GREY:
 							$style = array('background-color' => '#787878');
 							break;
-						case static::BG_PURPLE:
+						case self::BG_PURPLE:
 							$style = array('background-color' => '#780078');
 							break;
-						case static::BG_RED:
+						case self::BG_RED:
 							$style = array('background-color' => '#780000');
 							break;
-						case static::BG_YELLOW:
+						case self::BG_YELLOW:
 							$style = array('background-color' => '#787800');
 							break;
-						case static::BOLD:
+						case self::BOLD:
 							$style = array('font-weight' => 'bold');
 							break;
-						case static::ITALIC:
+						case self::ITALIC:
 							$style = array('font-style' => 'italic');
 							break;
-						case static::UNDERLINE:
+						case self::UNDERLINE:
 							$style = array('text-decoration' => array('underline'));
 							break;
-						case static::OVERLINED:
+						case self::OVERLINED:
 							$style = array('text-decoration' => array('overline'));
 							break;
-						case static::CROSSED_OUT:
+						case self::CROSSED_OUT:
 							$style = array('text-decoration' => array('line-through'));
 							break;
-						case static::BLINK:
+						case self::BLINK:
 							$style = array('text-decoration' => array('blink'));
 							break;
-						case static::NEGATIVE: // ???
-						case static::CONCEALED:
-						case static::ENCIRCLED:
-						case static::FRAMED:
+						case self::NEGATIVE: // ???
+						case self::CONCEALED:
+						case self::ENCIRCLED:
+						case self::FRAMED:
 							// TODO allow resetting codes
 							break;
 						case 0: // ansi reset

From bac5c0e7295e04d86df7a6f74f0538a3387a2174 Mon Sep 17 00:00:00 2001
From: Suralc <thesurwaveing@googlemail.com>
Date: Thu, 9 May 2013 12:18:17 +0200
Subject: [PATCH 105/152] Check if trait was loaded

---
 framework/YiiBase.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/framework/YiiBase.php b/framework/YiiBase.php
index aeed6f5..a37c913 100644
--- a/framework/YiiBase.php
+++ b/framework/YiiBase.php
@@ -332,6 +332,11 @@ class YiiBase
 	 */
 	public static function autoload($className)
 	{
+		static $hasTraitFunctionality;
+		if($hasTraitFunctionality === null) {
+			$hasTraitFunctionality = function_exists('trait_exists');
+		}
+		
 		$className = ltrim($className, '\\');
 
 		if (isset(self::$classMap[$className])) {
@@ -370,7 +375,8 @@ class YiiBase
 
 		include($classFile);
 
-		if (class_exists($className, false) || interface_exists($className, false)) {
+		if (class_exists($className, false) || interface_exists($className, false) ||
+			($hasTraitFunctionality === true && trait_exists($className, false))) {
 			return true;
 		} else {
 			throw new UnknownClassException("Unable to find '$className' in file: $classFile");

From ad26b7d3d12ee16ad3b68444a639a21d1138615e Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 9 May 2013 14:26:14 +0400
Subject: [PATCH 106/152] Use Composer autoload to handle dependency class
 loading

---
 apps/bootstrap/index.php                   | 9 +++++++--
 framework/helpers/base/Markdown.php        | 1 -
 framework/helpers/base/Purifier.php        | 4 ----
 framework/renderers/SmartyViewRenderer.php | 6 ------
 framework/renderers/TwigViewRenderer.php   | 9 ---------
 5 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/apps/bootstrap/index.php b/apps/bootstrap/index.php
index e3188c1..d9aca6f 100644
--- a/apps/bootstrap/index.php
+++ b/apps/bootstrap/index.php
@@ -1,9 +1,14 @@
 <?php
-
+// Set to false to disable debug mode
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 
-require(__DIR__ . '/../../framework/yii.php');
+$frameworkPath = __DIR__ . '/../../framework/';
+require($frameworkPath . 'yii.php');
 
 $config = require(__DIR__ . '/protected/config/main.php');
 $application = new yii\web\Application($config);
+
+// Register Composer autoloader
+@include $frameworkPath . '/vendor/autoload.php';
+
 $application->run();
diff --git a/framework/helpers/base/Markdown.php b/framework/helpers/base/Markdown.php
index 342c56b..1efdccb 100644
--- a/framework/helpers/base/Markdown.php
+++ b/framework/helpers/base/Markdown.php
@@ -7,7 +7,6 @@
 
 namespace yii\helpers\base;
 
-\Yii::setAlias('@Michelf', \Yii::getAlias('@yii/vendor/michelf/php-markdown/Michelf'));
 use Michelf\MarkdownExtra;
 
 /**
diff --git a/framework/helpers/base/Purifier.php b/framework/helpers/base/Purifier.php
index 1342374..2c5d334 100644
--- a/framework/helpers/base/Purifier.php
+++ b/framework/helpers/base/Purifier.php
@@ -6,10 +6,6 @@
  */
 namespace yii\helpers\base;
 
-if (!class_exists('HTMLPurifier_Bootstrap', false)) {
-	require_once(\Yii::getAlias('@yii/vendor/ezyang/htmlpurifier/library/HTMLPurifier.auto.php'));
-}
-
 /**
  * Purifier provides an ability to clean up HTML from any harmful code.
  *
diff --git a/framework/renderers/SmartyViewRenderer.php b/framework/renderers/SmartyViewRenderer.php
index cb82438..c6147c0 100644
--- a/framework/renderers/SmartyViewRenderer.php
+++ b/framework/renderers/SmartyViewRenderer.php
@@ -24,11 +24,6 @@ use yii\helpers\Html;
 class SmartyViewRenderer extends ViewRenderer
 {
 	/**
-	 * @var string the directory or path alias pointing to where Smarty code is located.
-	 */
-	public $smartyPath = '@yii/vendor/smarty/smarty/distribution/libs';
-
-	/**
 	 * @var string the directory or path alias pointing to where Smarty cache will be stored.
 	 */
 	public $cachePath = '@app/runtime/Smarty/cache';
@@ -45,7 +40,6 @@ class SmartyViewRenderer extends ViewRenderer
 
 	public function init()
 	{
-		require_once(Yii::getAlias($this->smartyPath) . '/Smarty.class.php');
 		$this->smarty = new Smarty();
 		$this->smarty->setCompileDir(Yii::getAlias($this->compilePath));
 		$this->smarty->setCacheDir(Yii::getAlias($this->cachePath));
diff --git a/framework/renderers/TwigViewRenderer.php b/framework/renderers/TwigViewRenderer.php
index d48dc5b..de561d3 100644
--- a/framework/renderers/TwigViewRenderer.php
+++ b/framework/renderers/TwigViewRenderer.php
@@ -23,11 +23,6 @@ use yii\helpers\Html;
 class TwigViewRenderer extends ViewRenderer
 {
 	/**
-	 * @var string the directory or path alias pointing to where Twig code is located.
-	 */
-	public $twigPath = '@yii/vendor/twig/twig/lib/Twig';
-
-	/**
 	 * @var string the directory or path alias pointing to where Twig cache will be stored.
 	 */
 	public $cachePath = '@app/runtime/Twig/cache';
@@ -45,10 +40,6 @@ class TwigViewRenderer extends ViewRenderer
 
 	public function init()
 	{
-		if (!isset(Yii::$aliases['@Twig'])) {
-			Yii::setAlias('@Twig', $this->twigPath);
-		}
-
 		$loader = new \Twig_Loader_String();
 
 		$this->twig = new \Twig_Environment($loader, array_merge(array(

From e2a57e4b885f61dd13ba3069c0b5a852f0c360ba Mon Sep 17 00:00:00 2001
From: Antonio Ramirez <amigo.cobos@gmail.com>
Date: Thu, 9 May 2013 12:42:50 +0200
Subject: [PATCH 107/152] Enhance ArrayHelper with popValue method

---
 framework/helpers/base/ArrayHelper.php           | 33 ++++++++++++++++++++++--
 tests/unit/framework/helpers/ArrayHelperTest.php | 10 +++++++
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/framework/helpers/base/ArrayHelper.php b/framework/helpers/base/ArrayHelper.php
index 672c7b9..7a0b606 100644
--- a/framework/helpers/base/ArrayHelper.php
+++ b/framework/helpers/base/ArrayHelper.php
@@ -87,6 +87,35 @@ class ArrayHelper
 	}
 
 	/**
+	 * Removes an item from an array and returns the value. If the key does not exist in the array, the default value
+	 * will be returned instead.
+	 *
+	 * Usage examples,
+	 *
+	 * ~~~
+	 * // $array = array('type'=>'A', 'options'=>array(1,2));
+	 * // working with array
+	 * $type = \yii\helpers\ArrayHelper::getValue($array, 'type');
+	 * // $array content
+	 * // $array = array('options'=>array(1,2));
+	 * ~~~
+	 *
+	 * @param array $array the array to extract value from
+	 * @param string $key key name of the array element
+	 * @param mixed $default the default value to be returned if the specified key does not exist
+	 * @return mixed|null the value of the element if found, default value otherwise
+	 */
+	public static function popValue(&$array, $key, $default = null)
+	{
+		if (is_array($array)) {
+			$value = static::getValue($array, $key, $default);
+			unset($array[$key]);
+			return $value;
+		}
+		return $default;
+	}
+
+	/**
 	 * Indexes an array according to a specified key.
 	 * The input array should be multidimensional or an array of objects.
 	 *
@@ -284,12 +313,12 @@ class ArrayHelper
 					$args[] = $column;
 				}
 			} else {
-				$args[] =  static::getColumn($array, $key);
+				$args[] = static::getColumn($array, $key);
 			}
 			$args[] = $ascending[$i] ? SORT_ASC : SORT_DESC;
 			$args[] = $flag;
 		}
-		$args[] = &$array;
+		$args[] = & $array;
 		call_user_func_array('array_multisort', $args);
 	}
 
diff --git a/tests/unit/framework/helpers/ArrayHelperTest.php b/tests/unit/framework/helpers/ArrayHelperTest.php
index b3ffabf..897fcf7 100644
--- a/tests/unit/framework/helpers/ArrayHelperTest.php
+++ b/tests/unit/framework/helpers/ArrayHelperTest.php
@@ -12,6 +12,16 @@ class ArrayHelperTest extends \yii\test\TestCase
 
 	}
 
+	public function testPopvalue()
+	{
+		$array = array('name' => 'b', 'age' => 3);
+		$name = ArrayHelper::popValue($array, 'name');
+
+		$this->assertEquals($name, 'b');
+		$this->assertEquals($array, array('age' => 3));
+	}
+
+
 	public function testMultisort()
 	{
 		// single key

From ad25cdc906e768ed1fe3650483f316e05ab2d3c1 Mon Sep 17 00:00:00 2001
From: Antonio Ramirez <amigo.cobos@gmail.com>
Date: Thu, 9 May 2013 12:51:08 +0200
Subject: [PATCH 108/152] Fix 'automated' (?) space

---
 framework/helpers/base/ArrayHelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/helpers/base/ArrayHelper.php b/framework/helpers/base/ArrayHelper.php
index 7a0b606..5df483a 100644
--- a/framework/helpers/base/ArrayHelper.php
+++ b/framework/helpers/base/ArrayHelper.php
@@ -318,7 +318,7 @@ class ArrayHelper
 			$args[] = $ascending[$i] ? SORT_ASC : SORT_DESC;
 			$args[] = $flag;
 		}
-		$args[] = & $array;
+		$args[] = &$array;
 		call_user_func_array('array_multisort', $args);
 	}
 

From 673d207253aa6b9b8f7bba49861398fe6e9a521b Mon Sep 17 00:00:00 2001
From: Antonio Ramirez <amigo.cobos@gmail.com>
Date: Thu, 9 May 2013 13:10:18 +0200
Subject: [PATCH 109/152] Fix silly typo

---
 framework/helpers/base/ArrayHelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/helpers/base/ArrayHelper.php b/framework/helpers/base/ArrayHelper.php
index 5df483a..4802651 100644
--- a/framework/helpers/base/ArrayHelper.php
+++ b/framework/helpers/base/ArrayHelper.php
@@ -95,7 +95,7 @@ class ArrayHelper
 	 * ~~~
 	 * // $array = array('type'=>'A', 'options'=>array(1,2));
 	 * // working with array
-	 * $type = \yii\helpers\ArrayHelper::getValue($array, 'type');
+	 * $type = \yii\helpers\ArrayHelper::popValue($array, 'type');
 	 * // $array content
 	 * // $array = array('options'=>array(1,2));
 	 * ~~~

From 849740e6ccabe1994d1cbc9ca1edc14664a0dafb Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Thu, 9 May 2013 12:24:52 +0200
Subject: [PATCH 110/152] Fixed YiiBaseTest echo

it echoed Yii version which is not necessary
---
 tests/unit/framework/YiiBaseTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/unit/framework/YiiBaseTest.php b/tests/unit/framework/YiiBaseTest.php
index 47474f2..4ebf45c 100644
--- a/tests/unit/framework/YiiBaseTest.php
+++ b/tests/unit/framework/YiiBaseTest.php
@@ -47,7 +47,6 @@ class YiiBaseTest extends TestCase
 
 	public function testGetVersion()
 	{
-		echo Yii::getVersion();
 		$this->assertTrue((boolean)preg_match('~\d+\.\d+(?:\.\d+)?(?:-\w+)?~', \Yii::getVersion()));
 	}
 

From 776162b05e960718cbbabe0a0a44bcb15361bbbf Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Thu, 9 May 2013 13:13:16 +0200
Subject: [PATCH 111/152] created StringHelper::basename()

In contrast to php function basename() It that always uses \ and /
as directory separator.
It is needed for use on Classnames that contain namespaces.
Fixes #192
---
 framework/db/ActiveRecord.php                     |  2 +-
 framework/helpers/base/StringHelper.php           | 23 ++++++++++++
 tests/unit/framework/helpers/StringHelperTest.php | 44 +++++++++++++++++++++++
 3 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/framework/db/ActiveRecord.php b/framework/db/ActiveRecord.php
index 500029d..356819d 100644
--- a/framework/db/ActiveRecord.php
+++ b/framework/db/ActiveRecord.php
@@ -252,7 +252,7 @@ class ActiveRecord extends Model
 	 */
 	public static function tableName()
 	{
-		return 'tbl_' . StringHelper::camel2id(basename(get_called_class()), '_');
+		return 'tbl_' . StringHelper::camel2id(StringHelper::basename(get_called_class()), '_');
 	}
 
 	/**
diff --git a/framework/helpers/base/StringHelper.php b/framework/helpers/base/StringHelper.php
index cb4b09b..646bcbb 100644
--- a/framework/helpers/base/StringHelper.php
+++ b/framework/helpers/base/StringHelper.php
@@ -44,6 +44,29 @@ class StringHelper
 	}
 
 	/**
+	 * Returns the trailing name component of a path.
+	 * This method does the same as the php function basename() except that it will
+	 * always use \ and / as directory separators, independent of the operating system.
+	 * Note: basename() operates naively on the input string, and is not aware of the
+	 * actual filesystem, or path components such as "..".
+	 * @param string $path A path string.
+	 * @param string $suffix If the name component ends in suffix this will also be cut off.
+	 * @return string the trailing name component of the given path.
+	 * @see http://www.php.net/manual/en/function.basename.php
+	 */
+	public static function basename($path, $suffix = '')
+	{
+		if (($len = mb_strlen($suffix)) > 0 && mb_substr($path, -$len) == $suffix) {
+			$path = mb_substr($path, 0, -$len);
+		}
+		$path = rtrim(str_replace('\\', '/', $path), '/\\');
+		if (($pos = mb_strrpos($path, '/')) !== false) {
+			return mb_substr($path, $pos + 1);
+		}
+		return $path;
+	}
+
+	/**
 	 * Converts a word to its plural form.
 	 * Note that this is for English only!
 	 * For example, 'apple' will become 'apples', and 'child' will become 'children'.
diff --git a/tests/unit/framework/helpers/StringHelperTest.php b/tests/unit/framework/helpers/StringHelperTest.php
index c37aafd..64811d1 100644
--- a/tests/unit/framework/helpers/StringHelperTest.php
+++ b/tests/unit/framework/helpers/StringHelperTest.php
@@ -70,4 +70,48 @@ class StringHelperTest extends \yii\test\TestCase
 		$this->assertEquals('PostTag', StringHelper::id2camel('post-tag'));
 		$this->assertEquals('PostTag', StringHelper::id2camel('post_tag', '_'));
 	}
+
+	public function testBasename()
+	{
+		$this->assertEquals('', StringHelper::basename(''));
+
+		$this->assertEquals('file', StringHelper::basename('file'));
+		$this->assertEquals('file.test', StringHelper::basename('file.test', '.test2'));
+		$this->assertEquals('file', StringHelper::basename('file.test', '.test'));
+
+		$this->assertEquals('file', StringHelper::basename('/file'));
+		$this->assertEquals('file.test', StringHelper::basename('/file.test', '.test2'));
+		$this->assertEquals('file', StringHelper::basename('/file.test', '.test'));
+
+		$this->assertEquals('file', StringHelper::basename('/path/to/file'));
+		$this->assertEquals('file.test', StringHelper::basename('/path/to/file.test', '.test2'));
+		$this->assertEquals('file', StringHelper::basename('/path/to/file.test', '.test'));
+
+		$this->assertEquals('file', StringHelper::basename('\file'));
+		$this->assertEquals('file.test', StringHelper::basename('\file.test', '.test2'));
+		$this->assertEquals('file', StringHelper::basename('\file.test', '.test'));
+
+		$this->assertEquals('file', StringHelper::basename('C:\file'));
+		$this->assertEquals('file.test', StringHelper::basename('C:\file.test', '.test2'));
+		$this->assertEquals('file', StringHelper::basename('C:\file.test', '.test'));
+
+		$this->assertEquals('file', StringHelper::basename('C:\path\to\file'));
+		$this->assertEquals('file.test', StringHelper::basename('C:\path\to\file.test', '.test2'));
+		$this->assertEquals('file', StringHelper::basename('C:\path\to\file.test', '.test'));
+
+		// mixed paths
+		$this->assertEquals('file.test', StringHelper::basename('/path\to/file.test'));
+		$this->assertEquals('file.test', StringHelper::basename('/path/to\file.test'));
+		$this->assertEquals('file.test', StringHelper::basename('\path/to\file.test'));
+
+		// \ and / in suffix
+		$this->assertEquals('file', StringHelper::basename('/path/to/filete/st', 'te/st'));
+		$this->assertEquals('st', StringHelper::basename('/path/to/filete/st', 'te\st'));
+		$this->assertEquals('file', StringHelper::basename('/path/to/filete\st', 'te\st'));
+		$this->assertEquals('st', StringHelper::basename('/path/to/filete\st', 'te/st'));
+
+		// http://www.php.net/manual/en/function.basename.php#72254
+		$this->assertEquals('foo', StringHelper::basename('/bar/foo/'));
+		$this->assertEquals('foo', StringHelper::basename('\\bar\\foo\\'));
+	}
 }

From 2387e59c4e49cf8e3ab2b963002cf5268e360985 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Thu, 9 May 2013 13:31:43 +0200
Subject: [PATCH 112/152] Renamed yii.php -> Yii.php for class, filename
 consitency

See https://github.com/yiisoft/yii2/issues/123#issuecomment-17657374
Issue #123
---
 apps/bootstrap/index.php |  2 +-
 build/build              |  2 +-
 framework/Yii.php        | 25 +++++++++++++++++++++++++
 framework/yii.php        | 25 -------------------------
 framework/yiic.php       |  2 +-
 tests/unit/bootstrap.php |  2 +-
 tests/web/app/index.php  |  2 +-
 7 files changed, 30 insertions(+), 30 deletions(-)
 create mode 100644 framework/Yii.php
 delete mode 100644 framework/yii.php

diff --git a/apps/bootstrap/index.php b/apps/bootstrap/index.php
index d9aca6f..d4b447a 100644
--- a/apps/bootstrap/index.php
+++ b/apps/bootstrap/index.php
@@ -3,7 +3,7 @@
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 
 $frameworkPath = __DIR__ . '/../../framework/';
-require($frameworkPath . 'yii.php');
+require($frameworkPath . 'Yii.php');
 
 $config = require(__DIR__ . '/protected/config/main.php');
 $application = new yii\web\Application($config);
diff --git a/build/build b/build/build
index 691eba9..95b51e4 100755
--- a/build/build
+++ b/build/build
@@ -11,7 +11,7 @@
 // fcgi doesn't have STDIN defined by default
 defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
 
-require(__DIR__ . '/../framework/yii.php');
+require(__DIR__ . '/../framework/Yii.php');
 
 $id = 'yiic-build';
 $basePath = __DIR__;
diff --git a/framework/Yii.php b/framework/Yii.php
new file mode 100644
index 0000000..109e2fd
--- /dev/null
+++ b/framework/Yii.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Yii bootstrap file.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+require(__DIR__ . '/YiiBase.php');
+
+/**
+ * Yii is a helper class serving common framework functionalities.
+ *
+ * It extends from [[YiiBase]] which provides the actual implementation.
+ * By writing your own Yii class, you can customize some functionalities of [[YiiBase]].
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Yii extends \yii\YiiBase
+{
+}
+
+spl_autoload_register(array('Yii', 'autoload'));
diff --git a/framework/yii.php b/framework/yii.php
deleted file mode 100644
index 109e2fd..0000000
--- a/framework/yii.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Yii bootstrap file.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-require(__DIR__ . '/YiiBase.php');
-
-/**
- * Yii is a helper class serving common framework functionalities.
- *
- * It extends from [[YiiBase]] which provides the actual implementation.
- * By writing your own Yii class, you can customize some functionalities of [[YiiBase]].
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Yii extends \yii\YiiBase
-{
-}
-
-spl_autoload_register(array('Yii', 'autoload'));
diff --git a/framework/yiic.php b/framework/yiic.php
index 3872e2f..7cd0c40 100644
--- a/framework/yiic.php
+++ b/framework/yiic.php
@@ -12,7 +12,7 @@ defined('YII_DEBUG') or define('YII_DEBUG', true);
 // fcgi doesn't have STDIN defined by default
 defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
 
-require(__DIR__ . '/yii.php');
+require(__DIR__ . '/Yii.php');
 
 $application = new yii\console\Application(array(
 	'id' => 'yiic',
diff --git a/tests/unit/bootstrap.php b/tests/unit/bootstrap.php
index 8290bbe..58a931b 100644
--- a/tests/unit/bootstrap.php
+++ b/tests/unit/bootstrap.php
@@ -5,7 +5,7 @@ define('YII_DEBUG', true);
 $_SERVER['SCRIPT_NAME'] = '/' . __DIR__;
 $_SERVER['SCRIPT_FILENAME'] = __FILE__;
 
-require_once(__DIR__ . '/../../framework/yii.php');
+require_once(__DIR__ . '/../../framework/Yii.php');
 
 Yii::setAlias('@yiiunit', __DIR__);
 
diff --git a/tests/web/app/index.php b/tests/web/app/index.php
index 4cfa1ab..72d3189 100644
--- a/tests/web/app/index.php
+++ b/tests/web/app/index.php
@@ -1,6 +1,6 @@
 <?php
 
-require(__DIR__ . '/../../../framework/yii.php');
+require(__DIR__ . '/../../../framework/Yii.php');
 
 $application = new yii\web\Application('test', __DIR__ . '/protected');
 $application->run();

From 882a611666b182471d69c9e1a9f2ad3fff8a98d4 Mon Sep 17 00:00:00 2001
From: Suralc <thesurwaveing@googlemail.com>
Date: Thu, 9 May 2013 13:44:37 +0200
Subject: [PATCH 113/152] Removed static variable from autoload per qiangxue's
 suggestion

---
 framework/YiiBase.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/framework/YiiBase.php b/framework/YiiBase.php
index a37c913..0618c2b 100644
--- a/framework/YiiBase.php
+++ b/framework/YiiBase.php
@@ -332,11 +332,6 @@ class YiiBase
 	 */
 	public static function autoload($className)
 	{
-		static $hasTraitFunctionality;
-		if($hasTraitFunctionality === null) {
-			$hasTraitFunctionality = function_exists('trait_exists');
-		}
-		
 		$className = ltrim($className, '\\');
 
 		if (isset(self::$classMap[$className])) {
@@ -376,7 +371,7 @@ class YiiBase
 		include($classFile);
 
 		if (class_exists($className, false) || interface_exists($className, false) ||
-			($hasTraitFunctionality === true && trait_exists($className, false))) {
+			function_exists('trait_exists') && trait_exists($className, false)) {
 			return true;
 		} else {
 			throw new UnknownClassException("Unable to find '$className' in file: $classFile");

From 9158e110dad9a888a9988cfaeca75eb241424ef9 Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Thu, 9 May 2013 17:21:18 +0400
Subject: [PATCH 114/152] Auth manager init version

---
 framework/base/Application.php   |   6 +-
 framework/web/AuthAssignment.php |  97 +++++++++++++++
 framework/web/AuthItem.php       | 261 +++++++++++++++++++++++++++++++++++++++
 framework/web/AuthManager.php    | 143 +++++++++++++++++++++
 framework/web/IAuthManager.php   | 173 ++++++++++++++++++++++++++
 framework/web/User.php           |  40 ++++--
 6 files changed, 705 insertions(+), 15 deletions(-)
 create mode 100644 framework/web/AuthAssignment.php
 create mode 100644 framework/web/AuthItem.php
 create mode 100644 framework/web/AuthManager.php
 create mode 100644 framework/web/IAuthManager.php

diff --git a/framework/base/Application.php b/framework/base/Application.php
index ac7cc6a..6bd31f1 100644
--- a/framework/base/Application.php
+++ b/framework/base/Application.php
@@ -305,12 +305,12 @@ class Application extends Module
 	}
 
 	/**
-	 * @return null|Component
-	 * @todo
+	 * Returns the auth manager for this application.
+	 * @return \yii\web\AuthManager the auth manager for this application.
 	 */
 	public function getAuthManager()
 	{
-		return $this->getComponent('auth');
+		return $this->getComponent('authManager');
 	}
 
 	/**
diff --git a/framework/web/AuthAssignment.php b/framework/web/AuthAssignment.php
new file mode 100644
index 0000000..c08e12d
--- /dev/null
+++ b/framework/web/AuthAssignment.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use Yii;
+use yii\base\Object;
+
+/**
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Alexander Kochetov <creocoder@gmail.com>
+ * @since 2.0
+ */
+class AuthAssignment extends Object
+{
+	private $_auth;
+	private $_itemName;
+	private $_userId;
+	private $_bizRule;
+	private $_data;
+
+	/**
+	 * Constructor.
+	 * @param IAuthManager $auth the authorization manager
+	 * @param string $itemName authorization item name
+	 * @param mixed $userId user ID (see [[User::id]])
+	 * @param string $bizRule the business rule associated with this assignment
+	 * @param mixed $data additional data for this assignment
+	 */
+	public function __construct($auth, $itemName, $userId, $bizRule = null, $data = null)
+	{
+		$this->_auth = $auth;
+		$this->_itemName = $itemName;
+		$this->_userId = $userId;
+		$this->_bizRule = $bizRule;
+		$this->_data = $data;
+	}
+
+	/**
+	 * @return mixed user ID (see [[User::id]])
+	 */
+	public function getUserId()
+	{
+		return $this->_userId;
+	}
+
+	/**
+	 * @return string the authorization item name
+	 */
+	public function getItemName()
+	{
+		return $this->_itemName;
+	}
+
+	/**
+	 * @return string the business rule associated with this assignment
+	 */
+	public function getBizRule()
+	{
+		return $this->_bizRule;
+	}
+
+	/**
+	 * @param string $value the business rule associated with this assignment
+	 */
+	public function setBizRule($value)
+	{
+		if ($this->_bizRule !== $value) {
+			$this->_bizRule = $value;
+			$this->_auth->saveAuthAssignment($this);
+		}
+	}
+
+	/**
+	 * @return mixed additional data for this assignment
+	 */
+	public function getData()
+	{
+		return $this->_data;
+	}
+
+	/**
+	 * @param mixed $value additional data for this assignment
+	 */
+	public function setData($value)
+	{
+		if ($this->_data !== $value) {
+			$this->_data = $value;
+			$this->_auth->saveAuthAssignment($this);
+		}
+	}
+}
diff --git a/framework/web/AuthItem.php b/framework/web/AuthItem.php
new file mode 100644
index 0000000..0d3553d
--- /dev/null
+++ b/framework/web/AuthItem.php
@@ -0,0 +1,261 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use Yii;
+use yii\base\Object;
+
+/**
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Alexander Kochetov <creocoder@gmail.com>
+ * @since 2.0
+ */
+class AuthItem extends Object
+{
+	const TYPE_OPERATION = 0;
+	const TYPE_TASK = 1;
+	const TYPE_ROLE = 2;
+
+	private $_auth;
+	private $_type;
+	private $_name;
+	private $_description;
+	private $_bizRule;
+	private $_data;
+
+	/**
+	 * Constructor.
+	 * @param IAuthManager $auth authorization manager
+	 * @param string $name authorization item name
+	 * @param integer $type authorization item type. This can be 0 (operation), 1 (task) or 2 (role).
+	 * @param string $description the description
+	 * @param string $bizRule the business rule associated with this item
+	 * @param mixed $data additional data for this item
+	 */
+	public function __construct($auth, $name, $type, $description = '', $bizRule = null, $data = null)
+	{
+		$this->_type = (int)$type;
+		$this->_auth = $auth;
+		$this->_name = $name;
+		$this->_description = $description;
+		$this->_bizRule = $bizRule;
+		$this->_data = $data;
+	}
+
+	/**
+	 * Checks to see if the specified item is within the hierarchy starting from this item.
+	 * This method is expected to be internally used by the actual implementations
+	 * of the [[IAuthManager::checkAccess()]].
+	 * @param string $itemName the name of the item to be checked
+	 * @param array $params the parameters to be passed to business rule evaluation
+	 * @return boolean whether the specified item is within the hierarchy starting from this item.
+	 */
+	public function checkAccess($itemName, $params = array())
+	{
+		Yii::trace('Checking permission: ' . $this->_name, __METHOD__);
+		if ($this->_auth->executeBizRule($this->_bizRule, $params, $this->_data)) {
+			if ($this->_name == $itemName) {
+				return true;
+			}
+			foreach ($this->_auth->getItemChildren($this->_name) as $item) {
+				if ($item->checkAccess($itemName, $params)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * @return IAuthManager the authorization manager
+	 */
+	public function getAuthManager()
+	{
+		return $this->_auth;
+	}
+
+	/**
+	 * @return integer the authorization item type. This could be 0 (operation), 1 (task) or 2 (role).
+	 */
+	public function getType()
+	{
+		return $this->_type;
+	}
+
+	/**
+	 * @return string the item name
+	 */
+	public function getName()
+	{
+		return $this->_name;
+	}
+
+	/**
+	 * @param string $value the item name
+	 */
+	public function setName($value)
+	{
+		if ($this->_name !== $value) {
+			$oldName = $this->_name;
+			$this->_name = $value;
+			$this->_auth->saveAuthItem($this, $oldName);
+		}
+	}
+
+	/**
+	 * @return string the item description
+	 */
+	public function getDescription()
+	{
+		return $this->_description;
+	}
+
+	/**
+	 * @param string $value the item description
+	 */
+	public function setDescription($value)
+	{
+		if ($this->_description !== $value) {
+			$this->_description = $value;
+			$this->_auth->saveAuthItem($this);
+		}
+	}
+
+	/**
+	 * @return string the business rule associated with this item
+	 */
+	public function getBizRule()
+	{
+		return $this->_bizRule;
+	}
+
+	/**
+	 * @param string $value the business rule associated with this item
+	 */
+	public function setBizRule($value)
+	{
+		if ($this->_bizRule !== $value) {
+			$this->_bizRule = $value;
+			$this->_auth->saveAuthItem($this);
+		}
+	}
+
+	/**
+	 * @return mixed the additional data associated with this item
+	 */
+	public function getData()
+	{
+		return $this->_data;
+	}
+
+	/**
+	 * @param mixed $value the additional data associated with this item
+	 */
+	public function setData($value)
+	{
+		if ($this->_data !== $value) {
+			$this->_data = $value;
+			$this->_auth->saveAuthItem($this);
+		}
+	}
+
+	/**
+	 * Adds a child item.
+	 * @param string $name the name of the child item
+	 * @return boolean whether the item is added successfully
+	 * @throws \yii\base\Exception if either parent or child doesn't exist or if a loop has been detected.
+	 * @see IAuthManager::addItemChild
+	 */
+	public function addChild($name)
+	{
+		return $this->_auth->addItemChild($this->_name, $name);
+	}
+
+	/**
+	 * Removes a child item.
+	 * Note, the child item is not deleted. Only the parent-child relationship is removed.
+	 * @param string $name the child item name
+	 * @return boolean whether the removal is successful
+	 * @see IAuthManager::removeItemChild
+	 */
+	public function removeChild($name)
+	{
+		return $this->_auth->removeItemChild($this->_name, $name);
+	}
+
+	/**
+	 * Returns a value indicating whether a child exists
+	 * @param string $name the child item name
+	 * @return boolean whether the child exists
+	 * @see IAuthManager::hasItemChild
+	 */
+	public function hasChild($name)
+	{
+		return $this->_auth->hasItemChild($this->_name, $name);
+	}
+
+	/**
+	 * Returns the children of this item.
+	 * @return array all child items of this item.
+	 * @see IAuthManager::getItemChildren
+	 */
+	public function getChildren()
+	{
+		return $this->_auth->getItemChildren($this->_name);
+	}
+
+	/**
+	 * Assigns this item to a user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $bizRule the business rule to be executed when [[checkAccess()]] is called
+	 * for this particular authorization item.
+	 * @param mixed $data additional data associated with this assignment
+	 * @return AuthAssignment the authorization assignment information.
+	 * @throws \yii\base\Exception if the item has already been assigned to the user
+	 * @see IAuthManager::assign
+	 */
+	public function assign($userId, $bizRule = null, $data = null)
+	{
+		return $this->_auth->assign($this->_name, $userId, $bizRule, $data);
+	}
+
+	/**
+	 * Revokes an authorization assignment from a user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @return boolean whether removal is successful
+	 * @see IAuthManager::revoke
+	 */
+	public function revoke($userId)
+	{
+		return $this->_auth->revoke($this->_name, $userId);
+	}
+
+	/**
+	 * Returns a value indicating whether this item has been assigned to the user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @return boolean whether the item has been assigned to the user.
+	 * @see IAuthManager::isAssigned
+	 */
+	public function isAssigned($userId)
+	{
+		return $this->_auth->isAssigned($this->_name, $userId);
+	}
+
+	/**
+	 * Returns the item assignment information.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @return AuthAssignment the item assignment information. Null is returned if
+	 * this item is not assigned to the user.
+	 * @see IAuthManager::getAuthAssignment
+	 */
+	public function getAssignment($userId)
+	{
+		return $this->_auth->getAuthAssignment($this->_name, $userId);
+	}
+}
diff --git a/framework/web/AuthManager.php b/framework/web/AuthManager.php
new file mode 100644
index 0000000..4888689
--- /dev/null
+++ b/framework/web/AuthManager.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use Yii;
+use yii\base\Component;
+use yii\base\Exception;
+
+/**
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Alexander Kochetov <creocoder@gmail.com>
+ * @since 2.0
+ */
+abstract class AuthManager extends Component implements IAuthManager
+{
+	/**
+	 * @var boolean Enable error reporting for bizRules.
+	 */
+	public $showErrors = false;
+
+	/**
+	 * @var array list of role names that are assigned to all users implicitly.
+	 * These roles do not need to be explicitly assigned to any user.
+	 * When calling [[checkAccess()]], these roles will be checked first.
+	 * For performance reason, you should minimize the number of such roles.
+	 * A typical usage of such roles is to define an 'authenticated' role and associate
+	 * it with a biz rule which checks if the current user is authenticated.
+	 * And then declare 'authenticated' in this property so that it can be applied to
+	 * every authenticated user.
+	 */
+	public $defaultRoles = array();
+
+	/**
+	 * Creates a role.
+	 * This is a shortcut method to [[IAuthManager::createAuthItem()]].
+	 * @param string $name the item name
+	 * @param string $description the item description.
+	 * @param string $bizRule the business rule associated with this item
+	 * @param mixed $data additional data to be passed when evaluating the business rule
+	 * @return AuthItem the authorization item
+	 */
+	public function createRole($name, $description = '', $bizRule = null, $data = null)
+	{
+		return $this->createAuthItem($name, AuthItem::TYPE_ROLE, $description, $bizRule, $data);
+	}
+
+	/**
+	 * Creates a task.
+	 * This is a shortcut method to [[IAuthManager::createAuthItem()]].
+	 * @param string $name the item name
+	 * @param string $description the item description.
+	 * @param string $bizRule the business rule associated with this item
+	 * @param mixed $data additional data to be passed when evaluating the business rule
+	 * @return AuthItem the authorization item
+	 */
+	public function createTask($name, $description = '', $bizRule = null, $data = null)
+	{
+		return $this->createAuthItem($name, AuthItem::TYPE_TASK, $description, $bizRule, $data);
+	}
+
+	/**
+	 * Creates an operation.
+	 * This is a shortcut method to [[IAuthManager::createAuthItem()]].
+	 * @param string $name the item name
+	 * @param string $description the item description.
+	 * @param string $bizRule the business rule associated with this item
+	 * @param mixed $data additional data to be passed when evaluating the business rule
+	 * @return AuthItem the authorization item
+	 */
+	public function createOperation($name, $description = '', $bizRule = null, $data = null)
+	{
+		return $this->createAuthItem($name, AuthItem::TYPE_OPERATION, $description, $bizRule, $data);
+	}
+
+	/**
+	 * Returns roles.
+	 * This is a shortcut method to [[IAuthManager::getAuthItems()]].
+	 * @param mixed $userId the user ID. If not null, only the roles directly assigned to the user
+	 * will be returned. Otherwise, all roles will be returned.
+	 * @return array roles (name=>AuthItem)
+	 */
+	public function getRoles($userId = null)
+	{
+		return $this->getAuthItems(AuthItem::TYPE_ROLE, $userId);
+	}
+
+	/**
+	 * Returns tasks.
+	 * This is a shortcut method to [[IAuthManager::getAuthItems()]].
+	 * @param mixed $userId the user ID. If not null, only the tasks directly assigned to the user
+	 * will be returned. Otherwise, all tasks will be returned.
+	 * @return array tasks (name=>AuthItem)
+	 */
+	public function getTasks($userId = null)
+	{
+		return $this->getAuthItems(AuthItem::TYPE_TASK, $userId);
+	}
+
+	/**
+	 * Returns operations.
+	 * This is a shortcut method to [[IAuthManager::getAuthItems()]].
+	 * @param mixed $userId the user ID. If not null, only the operations directly assigned to the user
+	 * will be returned. Otherwise, all operations will be returned.
+	 * @return array operations (name=>AuthItem)
+	 */
+	public function getOperations($userId = null)
+	{
+		return $this->getAuthItems(AuthItem::TYPE_OPERATION, $userId);
+	}
+
+	/**
+	 * Executes the specified business rule.
+	 * @param string $bizRule the business rule to be executed.
+	 * @param array $params parameters passed to [[IAuthManager::checkAccess()]].
+	 * @param mixed $data additional data associated with the authorization item or assignment.
+	 * @return boolean whether the business rule returns true.
+	 * If the business rule is empty, it will still return true.
+	 */
+	public function executeBizRule($bizRule, $params, $data)
+	{
+		return $bizRule === '' || $bizRule === null || ($this->showErrors ? eval($bizRule) != 0 : @eval($bizRule) != 0);
+	}
+
+	/**
+	 * Checks the item types to make sure a child can be added to a parent.
+	 * @param integer $parentType parent item type
+	 * @param integer $childType child item type
+	 * @throws Exception if the item cannot be added as a child due to its incompatible type.
+	 */
+	protected function checkItemChildType($parentType, $childType)
+	{
+		static $types = array('operation', 'task', 'role');
+		if ($parentType < $childType) {
+			throw new Exception("Cannot add an item of type '$types[$childType]' to an item of type '$types[$parentType]'.");
+		}
+	}
+}
diff --git a/framework/web/IAuthManager.php b/framework/web/IAuthManager.php
new file mode 100644
index 0000000..1d2fbb9
--- /dev/null
+++ b/framework/web/IAuthManager.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+/**
+ * IAuthManager interface is implemented by an auth manager application component.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Alexander Kochetov <creocoder@gmail.com>
+ * @since 2.0
+ */
+interface IAuthManager
+{
+	/**
+	 * Performs access check for the specified user.
+	 * @param mixed $userId the user ID. This should be either an integer or a string representing
+	 * the unique identifier of a user. See [[User::id]].
+	 * @param string $itemName the name of the operation that we are checking access to
+	 * @param array $params name-value pairs that would be passed to biz rules associated
+	 * with the tasks and roles assigned to the user.
+	 * @return boolean whether the operations can be performed by the user.
+	 */
+	public function checkAccess($userId, $itemName, $params = array());
+
+	/**
+	 * Creates an authorization item.
+	 * An authorization item represents an action permission (e.g. creating a post).
+	 * It has three types: operation, task and role.
+	 * Authorization items form a hierarchy. Higher level items inheirt permissions representing
+	 * by lower level items.
+	 * @param string $name the item name. This must be a unique identifier.
+	 * @param integer $type the item type (0: operation, 1: task, 2: role).
+	 * @param string $description description of the item
+	 * @param string $bizRule business rule associated with the item. This is a piece of
+	 * PHP code that will be executed when [[checkAccess()]] is called for the item.
+	 * @param mixed $data additional data associated with the item.
+	 * @throws \yii\base\Exception if an item with the same name already exists
+	 * @return AuthItem the authorization item
+	 */
+	public function createAuthItem($name, $type, $description = '', $bizRule = null, $data = null);
+	/**
+	 * Removes the specified authorization item.
+	 * @param string $name the name of the item to be removed
+	 * @return boolean whether the item exists in the storage and has been removed
+	 */
+	public function removeAuthItem($name);
+	/**
+	 * Returns the authorization items of the specific type and user.
+	 * @param mixed $userId the user ID. Defaults to null, meaning returning all items even if
+	 * they are not assigned to a user.
+	 * @param integer $type the item type (0: operation, 1: task, 2: role). Defaults to null,
+	 * meaning returning all items regardless of their type.
+	 * @return array the authorization items of the specific type.
+	 */
+	public function getAuthItems($userId = null, $type = null);
+	/**
+	 * Returns the authorization item with the specified name.
+	 * @param string $name the name of the item
+	 * @return AuthItem the authorization item. Null if the item cannot be found.
+	 */
+	public function getAuthItem($name);
+	/**
+	 * Saves an authorization item to persistent storage.
+	 * @param AuthItem $item the item to be saved.
+	 * @param string $oldName the old item name. If null, it means the item name is not changed.
+	 */
+	public function saveAuthItem($item, $oldName = null);
+
+	/**
+	 * Adds an item as a child of another item.
+	 * @param string $itemName the parent item name
+	 * @param string $childName the child item name
+	 * @throws \yii\base\Exception if either parent or child doesn't exist or if a loop has been detected.
+	 */
+	public function addItemChild($itemName, $childName);
+	/**
+	 * Removes a child from its parent.
+	 * Note, the child item is not deleted. Only the parent-child relationship is removed.
+	 * @param string $itemName the parent item name
+	 * @param string $childName the child item name
+	 * @return boolean whether the removal is successful
+	 */
+	public function removeItemChild($itemName, $childName);
+	/**
+	 * Returns a value indicating whether a child exists within a parent.
+	 * @param string $itemName the parent item name
+	 * @param string $childName the child item name
+	 * @return boolean whether the child exists
+	 */
+	public function hasItemChild($itemName, $childName);
+	/**
+	 * Returns the children of the specified item.
+	 * @param mixed $itemName the parent item name. This can be either a string or an array.
+	 * The latter represents a list of item names.
+	 * @return array all child items of the parent
+	 */
+	public function getItemChildren($itemName);
+
+	/**
+	 * Assigns an authorization item to a user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @param string $bizRule the business rule to be executed when [[checkAccess()]] is called
+	 * for this particular authorization item.
+	 * @param mixed $data additional data associated with this assignment
+	 * @return AuthAssignment the authorization assignment information.
+	 * @throws \yii\base\Exception if the item does not exist or if the item has already been assigned to the user
+	 */
+	public function assign($userId, $itemName, $bizRule = null, $data = null);
+	/**
+	 * Revokes an authorization assignment from a user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @return boolean whether removal is successful
+	 */
+	public function revoke($userId, $itemName);
+	/**
+	 * Returns a value indicating whether the item has been assigned to the user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @return boolean whether the item has been assigned to the user.
+	 */
+	public function isAssigned($userId, $itemName);
+	/**
+	 * Returns the item assignment information.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @return AuthAssignment the item assignment information. Null is returned if
+	 * the item is not assigned to the user.
+	 */
+	public function getAuthAssignment($userId, $itemName);
+	/**
+	 * Returns the item assignments for the specified user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @return array the item assignment information for the user. An empty array will be
+	 * returned if there is no item assigned to the user.
+	 */
+	public function getAuthAssignments($userId);
+	/**
+	 * Saves the changes to an authorization assignment.
+	 * @param AuthAssignment $assignment the assignment that has been changed.
+	 */
+	public function saveAuthAssignment($assignment);
+	/**
+	 * Removes all authorization data.
+	 */
+	public function clearAll();
+	/**
+	 * Removes all authorization assignments.
+	 */
+	public function clearAuthAssignments();
+	/**
+	 * Saves authorization data into persistent storage.
+	 * If any change is made to the authorization data, please make
+	 * sure you call this method to save the changed data into persistent storage.
+	 */
+	public function save();
+	/**
+	 * Executes a business rule.
+	 * A business rule is a piece of PHP code that will be executed when [[checkAccess()]] is called.
+	 * @param string $bizRule the business rule to be executed.
+	 * @param array $params additional parameters to be passed to the business rule when being executed.
+	 * @param mixed $data additional data that is associated with the corresponding authorization item or assignment
+	 * @return boolean whether the execution returns a true value.
+	 * If the business rule is empty, it will also return true.
+	 */
+	public function executeBizRule($bizRule, $params, $data);
+}
diff --git a/framework/web/User.php b/framework/web/User.php
index 88fc12d..7d8e300 100644
--- a/framework/web/User.php
+++ b/framework/web/User.php
@@ -40,11 +40,11 @@ class User extends Component
 	 */
 	public $enableAutoLogin = false;
 	/**
-	 * @var string|array the URL for login when [[loginRequired()]] is called. 
+	 * @var string|array the URL for login when [[loginRequired()]] is called.
 	 * If an array is given, [[UrlManager::createUrl()]] will be called to create the corresponding URL.
-	 * The first element of the array should be the route to the login action, and the rest of 
+	 * The first element of the array should be the route to the login action, and the rest of
 	 * the name-value pairs are GET parameters used to construct the login URL. For example,
-	 * 
+	 *
 	 * ~~~
 	 * array('site/login', 'ref' => 1)
 	 * ~~~
@@ -86,6 +86,8 @@ class User extends Component
 	 */
 	public $returnUrlVar = '__returnUrl';
 
+	private $_access = array();
+
 
 	/**
 	 * Initializes the application component.
@@ -449,19 +451,33 @@ class User extends Component
 	}
 
 	/**
-	 * Checks whether the user has access to the specified operation.
-	 * @param $operator
-	 * @param array $params
-	 * @return bool
-	 * @todo
+	 * Performs access check for this user.
+	 * @param string $operation the name of the operation that need access check.
+	 * @param array $params name-value pairs that would be passed to business rules associated
+	 * with the tasks and roles assigned to the user. A param with name 'userId' is added to
+	 * this array, which holds the value of [[id]] when [[DbAuthManager]] or
+	 * [[PhpAuthManager]] is used.
+	 * @param boolean $allowCaching whether to allow caching the result of access check.
+	 * When this parameter is true (default), if the access check of an operation was performed
+	 * before, its result will be directly returned when calling this method to check the same
+	 * operation. If this parameter is false, this method will always call
+	 * [[AuthManager::checkAccess()]] to obtain the up-to-date access result. Note that this
+	 * caching is effective only within the same request and only works when `$params = array()`.
+	 * @return boolean whether the operations can be performed by this user.
 	 */
-	public function checkAccess($operation, $params = array())
+	public function checkAccess($operation, $params = array(), $allowCaching = true)
 	{
 		$auth = Yii::$app->getAuthManager();
-		if ($auth !== null) {
-			return $auth->checkAccess($this->getId(), $operation, $params);
-		} else {
+		if ($auth === null) {
 			return false;
 		}
+		if ($allowCaching && empty($params) && isset($this->_access[$operation])) {
+			return $this->_access[$operation];
+		}
+		$access = $auth->checkAccess($this->getId(), $operation, $params);
+		if ($allowCaching && empty($params)) {
+			$this->_access[$operation] = $access;
+		}
+		return $access;
 	}
 }

From aad6d7d9922a6eecdd804bb72fccc711e8dce15e Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Thu, 9 May 2013 10:18:25 -0400
Subject: [PATCH 115/152] refactoring.

---
 apps/bootstrap/index.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/apps/bootstrap/index.php b/apps/bootstrap/index.php
index d4b447a..a9bf4b6 100644
--- a/apps/bootstrap/index.php
+++ b/apps/bootstrap/index.php
@@ -1,14 +1,13 @@
 <?php
-// Set to false to disable debug mode
+// comment out the following line to disable debug mode
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 
-$frameworkPath = __DIR__ . '/../../framework/';
-require($frameworkPath . 'Yii.php');
-
-$config = require(__DIR__ . '/protected/config/main.php');
-$application = new yii\web\Application($config);
+$frameworkPath = __DIR__ . '/../../framework';
 
+require($frameworkPath . '/Yii.php');
 // Register Composer autoloader
-@include $frameworkPath . '/vendor/autoload.php';
+@include($frameworkPath . '/vendor/autoload.php');
 
+$config = require(__DIR__ . '/protected/config/main.php');
+$application = new yii\web\Application($config);
 $application->run();

From cd3387067155f34df056629c233fa895dfb1ba83 Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Thu, 9 May 2013 18:53:17 +0400
Subject: [PATCH 116/152] Moved to framework/rbac + method names refactoring

---
 framework/rbac/Assignment.php    |  97 ++++++++
 framework/rbac/Item.php          | 261 +++++++++++++++++++++
 framework/rbac/Manager.php       | 143 ++++++++++++
 framework/rbac/PhpManager.php    | 492 +++++++++++++++++++++++++++++++++++++++
 framework/web/AuthAssignment.php |  97 --------
 framework/web/AuthItem.php       | 261 ---------------------
 framework/web/AuthManager.php    | 143 ------------
 framework/web/IAuthManager.php   | 173 --------------
 8 files changed, 993 insertions(+), 674 deletions(-)
 create mode 100644 framework/rbac/Assignment.php
 create mode 100644 framework/rbac/Item.php
 create mode 100644 framework/rbac/Manager.php
 create mode 100644 framework/rbac/PhpManager.php
 delete mode 100644 framework/web/AuthAssignment.php
 delete mode 100644 framework/web/AuthItem.php
 delete mode 100644 framework/web/AuthManager.php
 delete mode 100644 framework/web/IAuthManager.php

diff --git a/framework/rbac/Assignment.php b/framework/rbac/Assignment.php
new file mode 100644
index 0000000..c2a9f56
--- /dev/null
+++ b/framework/rbac/Assignment.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\rbac;
+
+use Yii;
+use yii\base\Object;
+
+/**
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Alexander Kochetov <creocoder@gmail.com>
+ * @since 2.0
+ */
+class Assignment extends Object
+{
+	private $_auth;
+	private $_itemName;
+	private $_userId;
+	private $_bizRule;
+	private $_data;
+
+	/**
+	 * Constructor.
+	 * @param IManager $auth the authorization manager
+	 * @param string $itemName authorization item name
+	 * @param mixed $userId user ID (see [[User::id]])
+	 * @param string $bizRule the business rule associated with this assignment
+	 * @param mixed $data additional data for this assignment
+	 */
+	public function __construct($auth, $itemName, $userId, $bizRule = null, $data = null)
+	{
+		$this->_auth = $auth;
+		$this->_itemName = $itemName;
+		$this->_userId = $userId;
+		$this->_bizRule = $bizRule;
+		$this->_data = $data;
+	}
+
+	/**
+	 * @return mixed user ID (see [[User::id]])
+	 */
+	public function getUserId()
+	{
+		return $this->_userId;
+	}
+
+	/**
+	 * @return string the authorization item name
+	 */
+	public function getItemName()
+	{
+		return $this->_itemName;
+	}
+
+	/**
+	 * @return string the business rule associated with this assignment
+	 */
+	public function getBizRule()
+	{
+		return $this->_bizRule;
+	}
+
+	/**
+	 * @param string $value the business rule associated with this assignment
+	 */
+	public function setBizRule($value)
+	{
+		if ($this->_bizRule !== $value) {
+			$this->_bizRule = $value;
+			$this->_auth->saveAssignment($this);
+		}
+	}
+
+	/**
+	 * @return mixed additional data for this assignment
+	 */
+	public function getData()
+	{
+		return $this->_data;
+	}
+
+	/**
+	 * @param mixed $value additional data for this assignment
+	 */
+	public function setData($value)
+	{
+		if ($this->_data !== $value) {
+			$this->_data = $value;
+			$this->_auth->saveAssignment($this);
+		}
+	}
+}
diff --git a/framework/rbac/Item.php b/framework/rbac/Item.php
new file mode 100644
index 0000000..ba78e60
--- /dev/null
+++ b/framework/rbac/Item.php
@@ -0,0 +1,261 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\rbac;
+
+use Yii;
+use yii\base\Object;
+
+/**
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Alexander Kochetov <creocoder@gmail.com>
+ * @since 2.0
+ */
+class Item extends Object
+{
+	const TYPE_OPERATION = 0;
+	const TYPE_TASK = 1;
+	const TYPE_ROLE = 2;
+
+	private $_auth;
+	private $_type;
+	private $_name;
+	private $_description;
+	private $_bizRule;
+	private $_data;
+
+	/**
+	 * Constructor.
+	 * @param IManager $auth authorization manager
+	 * @param string $name authorization item name
+	 * @param integer $type authorization item type. This can be 0 (operation), 1 (task) or 2 (role).
+	 * @param string $description the description
+	 * @param string $bizRule the business rule associated with this item
+	 * @param mixed $data additional data for this item
+	 */
+	public function __construct($auth, $name, $type, $description = '', $bizRule = null, $data = null)
+	{
+		$this->_type = (int)$type;
+		$this->_auth = $auth;
+		$this->_name = $name;
+		$this->_description = $description;
+		$this->_bizRule = $bizRule;
+		$this->_data = $data;
+	}
+
+	/**
+	 * Checks to see if the specified item is within the hierarchy starting from this item.
+	 * This method is expected to be internally used by the actual implementations
+	 * of the [[IManager::checkAccess()]].
+	 * @param string $itemName the name of the item to be checked
+	 * @param array $params the parameters to be passed to business rule evaluation
+	 * @return boolean whether the specified item is within the hierarchy starting from this item.
+	 */
+	public function checkAccess($itemName, $params = array())
+	{
+		Yii::trace('Checking permission: ' . $this->_name, __METHOD__);
+		if ($this->_auth->executeBizRule($this->_bizRule, $params, $this->_data)) {
+			if ($this->_name == $itemName) {
+				return true;
+			}
+			foreach ($this->_auth->getItemChildren($this->_name) as $item) {
+				if ($item->checkAccess($itemName, $params)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * @return IManager the authorization manager
+	 */
+	public function getManager()
+	{
+		return $this->_auth;
+	}
+
+	/**
+	 * @return integer the authorization item type. This could be 0 (operation), 1 (task) or 2 (role).
+	 */
+	public function getType()
+	{
+		return $this->_type;
+	}
+
+	/**
+	 * @return string the item name
+	 */
+	public function getName()
+	{
+		return $this->_name;
+	}
+
+	/**
+	 * @param string $value the item name
+	 */
+	public function setName($value)
+	{
+		if ($this->_name !== $value) {
+			$oldName = $this->_name;
+			$this->_name = $value;
+			$this->_auth->saveItem($this, $oldName);
+		}
+	}
+
+	/**
+	 * @return string the item description
+	 */
+	public function getDescription()
+	{
+		return $this->_description;
+	}
+
+	/**
+	 * @param string $value the item description
+	 */
+	public function setDescription($value)
+	{
+		if ($this->_description !== $value) {
+			$this->_description = $value;
+			$this->_auth->saveItem($this);
+		}
+	}
+
+	/**
+	 * @return string the business rule associated with this item
+	 */
+	public function getBizRule()
+	{
+		return $this->_bizRule;
+	}
+
+	/**
+	 * @param string $value the business rule associated with this item
+	 */
+	public function setBizRule($value)
+	{
+		if ($this->_bizRule !== $value) {
+			$this->_bizRule = $value;
+			$this->_auth->saveItem($this);
+		}
+	}
+
+	/**
+	 * @return mixed the additional data associated with this item
+	 */
+	public function getData()
+	{
+		return $this->_data;
+	}
+
+	/**
+	 * @param mixed $value the additional data associated with this item
+	 */
+	public function setData($value)
+	{
+		if ($this->_data !== $value) {
+			$this->_data = $value;
+			$this->_auth->saveItem($this);
+		}
+	}
+
+	/**
+	 * Adds a child item.
+	 * @param string $name the name of the child item
+	 * @return boolean whether the item is added successfully
+	 * @throws \yii\base\Exception if either parent or child doesn't exist or if a loop has been detected.
+	 * @see IManager::addItemChild
+	 */
+	public function addChild($name)
+	{
+		return $this->_auth->addItemChild($this->_name, $name);
+	}
+
+	/**
+	 * Removes a child item.
+	 * Note, the child item is not deleted. Only the parent-child relationship is removed.
+	 * @param string $name the child item name
+	 * @return boolean whether the removal is successful
+	 * @see IManager::removeItemChild
+	 */
+	public function removeChild($name)
+	{
+		return $this->_auth->removeItemChild($this->_name, $name);
+	}
+
+	/**
+	 * Returns a value indicating whether a child exists
+	 * @param string $name the child item name
+	 * @return boolean whether the child exists
+	 * @see IManager::hasItemChild
+	 */
+	public function hasChild($name)
+	{
+		return $this->_auth->hasItemChild($this->_name, $name);
+	}
+
+	/**
+	 * Returns the children of this item.
+	 * @return array all child items of this item.
+	 * @see IManager::getItemChildren
+	 */
+	public function getChildren()
+	{
+		return $this->_auth->getItemChildren($this->_name);
+	}
+
+	/**
+	 * Assigns this item to a user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $bizRule the business rule to be executed when [[checkAccess()]] is called
+	 * for this particular authorization item.
+	 * @param mixed $data additional data associated with this assignment
+	 * @return Assignment the authorization assignment information.
+	 * @throws \yii\base\Exception if the item has already been assigned to the user
+	 * @see IManager::assign
+	 */
+	public function assign($userId, $bizRule = null, $data = null)
+	{
+		return $this->_auth->assign($userId, $this->_name, $bizRule, $data);
+	}
+
+	/**
+	 * Revokes an authorization assignment from a user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @return boolean whether removal is successful
+	 * @see IManager::revoke
+	 */
+	public function revoke($userId)
+	{
+		return $this->_auth->revoke($userId, $this->_name);
+	}
+
+	/**
+	 * Returns a value indicating whether this item has been assigned to the user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @return boolean whether the item has been assigned to the user.
+	 * @see IManager::isAssigned
+	 */
+	public function isAssigned($userId)
+	{
+		return $this->_auth->isAssigned($userId, $this->_name);
+	}
+
+	/**
+	 * Returns the item assignment information.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @return Assignment the item assignment information. Null is returned if
+	 * this item is not assigned to the user.
+	 * @see IManager::getAssignment
+	 */
+	public function getAssignment($userId)
+	{
+		return $this->_auth->getAssignment($userId, $this->_name);
+	}
+}
diff --git a/framework/rbac/Manager.php b/framework/rbac/Manager.php
new file mode 100644
index 0000000..2f77e10
--- /dev/null
+++ b/framework/rbac/Manager.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\rbac;
+
+use Yii;
+use yii\base\Component;
+use yii\base\Exception;
+
+/**
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Alexander Kochetov <creocoder@gmail.com>
+ * @since 2.0
+ */
+abstract class Manager extends Component implements IManager
+{
+	/**
+	 * @var boolean Enable error reporting for bizRules.
+	 */
+	public $showErrors = false;
+
+	/**
+	 * @var array list of role names that are assigned to all users implicitly.
+	 * These roles do not need to be explicitly assigned to any user.
+	 * When calling [[checkAccess()]], these roles will be checked first.
+	 * For performance reason, you should minimize the number of such roles.
+	 * A typical usage of such roles is to define an 'authenticated' role and associate
+	 * it with a biz rule which checks if the current user is authenticated.
+	 * And then declare 'authenticated' in this property so that it can be applied to
+	 * every authenticated user.
+	 */
+	public $defaultRoles = array();
+
+	/**
+	 * Creates a role.
+	 * This is a shortcut method to [[IManager::createItem()]].
+	 * @param string $name the item name
+	 * @param string $description the item description.
+	 * @param string $bizRule the business rule associated with this item
+	 * @param mixed $data additional data to be passed when evaluating the business rule
+	 * @return Item the authorization item
+	 */
+	public function createRole($name, $description = '', $bizRule = null, $data = null)
+	{
+		return $this->createItem($name, Item::TYPE_ROLE, $description, $bizRule, $data);
+	}
+
+	/**
+	 * Creates a task.
+	 * This is a shortcut method to [[IManager::createItem()]].
+	 * @param string $name the item name
+	 * @param string $description the item description.
+	 * @param string $bizRule the business rule associated with this item
+	 * @param mixed $data additional data to be passed when evaluating the business rule
+	 * @return Item the authorization item
+	 */
+	public function createTask($name, $description = '', $bizRule = null, $data = null)
+	{
+		return $this->createItem($name, Item::TYPE_TASK, $description, $bizRule, $data);
+	}
+
+	/**
+	 * Creates an operation.
+	 * This is a shortcut method to [[IManager::createItem()]].
+	 * @param string $name the item name
+	 * @param string $description the item description.
+	 * @param string $bizRule the business rule associated with this item
+	 * @param mixed $data additional data to be passed when evaluating the business rule
+	 * @return Item the authorization item
+	 */
+	public function createOperation($name, $description = '', $bizRule = null, $data = null)
+	{
+		return $this->createItem($name, Item::TYPE_OPERATION, $description, $bizRule, $data);
+	}
+
+	/**
+	 * Returns roles.
+	 * This is a shortcut method to [[IManager::getItems()]].
+	 * @param mixed $userId the user ID. If not null, only the roles directly assigned to the user
+	 * will be returned. Otherwise, all roles will be returned.
+	 * @return array roles (name=>AuthItem)
+	 */
+	public function getRoles($userId = null)
+	{
+		return $this->getItems($userId, Item::TYPE_ROLE);
+	}
+
+	/**
+	 * Returns tasks.
+	 * This is a shortcut method to [[IManager::getItems()]].
+	 * @param mixed $userId the user ID. If not null, only the tasks directly assigned to the user
+	 * will be returned. Otherwise, all tasks will be returned.
+	 * @return array tasks (name=>AuthItem)
+	 */
+	public function getTasks($userId = null)
+	{
+		return $this->getItems($userId, Item::TYPE_TASK);
+	}
+
+	/**
+	 * Returns operations.
+	 * This is a shortcut method to [[IManager::getItems()]].
+	 * @param mixed $userId the user ID. If not null, only the operations directly assigned to the user
+	 * will be returned. Otherwise, all operations will be returned.
+	 * @return array operations (name=>AuthItem)
+	 */
+	public function getOperations($userId = null)
+	{
+		return $this->getItems($userId, Item::TYPE_OPERATION);
+	}
+
+	/**
+	 * Executes the specified business rule.
+	 * @param string $bizRule the business rule to be executed.
+	 * @param array $params parameters passed to [[IManager::checkAccess()]].
+	 * @param mixed $data additional data associated with the authorization item or assignment.
+	 * @return boolean whether the business rule returns true.
+	 * If the business rule is empty, it will still return true.
+	 */
+	public function executeBizRule($bizRule, $params, $data)
+	{
+		return $bizRule === '' || $bizRule === null || ($this->showErrors ? eval($bizRule) != 0 : @eval($bizRule) != 0);
+	}
+
+	/**
+	 * Checks the item types to make sure a child can be added to a parent.
+	 * @param integer $parentType parent item type
+	 * @param integer $childType child item type
+	 * @throws Exception if the item cannot be added as a child due to its incompatible type.
+	 */
+	protected function checkItemChildType($parentType, $childType)
+	{
+		static $types = array('operation', 'task', 'role');
+		if ($parentType < $childType) {
+			throw new Exception("Cannot add an item of type '$types[$childType]' to an item of type '$types[$parentType]'.");
+		}
+	}
+}
diff --git a/framework/rbac/PhpManager.php b/framework/rbac/PhpManager.php
new file mode 100644
index 0000000..08f5c83
--- /dev/null
+++ b/framework/rbac/PhpManager.php
@@ -0,0 +1,492 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\rbac;
+
+use Yii;
+use yii\base\Exception;
+
+/**
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Alexander Kochetov <creocoder@gmail.com>
+ * @since 2.0
+ */
+class PhpManager extends Manager
+{
+	/**
+	 * @var string the path of the PHP script that contains the authorization data.
+	 * If not set, it will be using 'protected/data/auth.php' as the data file.
+	 * Make sure this file is writable by the Web server process if the authorization
+	 * needs to be changed.
+	 * @see loadFromFile
+	 * @see saveToFile
+	 */
+	public $authFile;
+
+	private $_items = array(); // itemName => item
+	private $_children = array(); // itemName, childName => child
+	private $_assignments = array(); // userId, itemName => assignment
+
+	/**
+	 * Initializes the application component.
+	 * This method overrides parent implementation by loading the authorization data
+	 * from PHP script.
+	 */
+	public function init()
+	{
+		parent::init();
+		if ($this->authFile === null) {
+			$this->authFile = Yii::getAlias('@app/data/rbac') . '.php';
+		}
+		$this->load();
+	}
+
+	/**
+	 * Performs access check for the specified user.
+	 * @param mixed $userId the user ID. This can be either an integer or a string representing
+	 * @param string $itemName the name of the operation that need access check
+	 * the unique identifier of a user. See [[User::id]].
+	 * @param array $params name-value pairs that would be passed to biz rules associated
+	 * with the tasks and roles assigned to the user.
+	 * Since version 1.1.11 a param with name 'userId' is added to this array, which holds the value of <code>$userId</code>.
+	 * @return boolean whether the operations can be performed by the user.
+	 */
+	public function checkAccess($userId, $itemName, $params = array())
+	{
+		if (!isset($this->_items[$itemName])) {
+			return false;
+		}
+		$item = $this->_items[$itemName];
+		Yii::trace('Checking permission: ' . $item->getName(), __METHOD__);
+		if (!isset($params['userId'])) {
+			$params['userId'] = $userId;
+		}
+		if ($this->executeBizRule($item->getBizRule(), $params, $item->getData())) {
+			if (in_array($itemName, $this->defaultRoles)) {
+				return true;
+			}
+			if (isset($this->_assignments[$userId][$itemName])) {
+				$assignment = $this->_assignments[$userId][$itemName];
+				if ($this->executeBizRule($assignment->getBizRule(), $params, $assignment->getData())) {
+					return true;
+				}
+			}
+			foreach ($this->_children as $parentName => $children) {
+				if (isset($children[$itemName]) && $this->checkAccess($userId, $parentName, $params)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Adds an item as a child of another item.
+	 * @param string $itemName the parent item name
+	 * @param string $childName the child item name
+	 * @return boolean whether the item is added successfully
+	 * @throws Exception if either parent or child doesn't exist or if a loop has been detected.
+	 */
+	public function addItemChild($itemName, $childName)
+	{
+		if (!isset($this->_items[$childName], $this->_items[$itemName])) {
+			throw new Exception("Either '$itemName' or '$childName' does not exist.");
+		}
+		$child = $this->_items[$childName];
+		$item = $this->_items[$itemName];
+		$this->checkItemChildType($item->getType(), $child->getType());
+		if ($this->detectLoop($itemName, $childName)) {
+			throw new Exception("Cannot add '$childName' as a child of '$itemName'. A loop has been detected.");
+		}
+		if (isset($this->_children[$itemName][$childName])) {
+			throw new Exception("The item '$itemName' already has a child '$childName'.");
+		}
+		$this->_children[$itemName][$childName] = $this->_items[$childName];
+		return true;
+	}
+
+	/**
+	 * Removes a child from its parent.
+	 * Note, the child item is not deleted. Only the parent-child relationship is removed.
+	 * @param string $itemName the parent item name
+	 * @param string $childName the child item name
+	 * @return boolean whether the removal is successful
+	 */
+	public function removeItemChild($itemName, $childName)
+	{
+		if (isset($this->_children[$itemName][$childName])) {
+			unset($this->_children[$itemName][$childName]);
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Returns a value indicating whether a child exists within a parent.
+	 * @param string $itemName the parent item name
+	 * @param string $childName the child item name
+	 * @return boolean whether the child exists
+	 */
+	public function hasItemChild($itemName, $childName)
+	{
+		return isset($this->_children[$itemName][$childName]);
+	}
+
+	/**
+	 * Returns the children of the specified item.
+	 * @param mixed $names the parent item name. This can be either a string or an array.
+	 * The latter represents a list of item names.
+	 * @return array all child items of the parent
+	 */
+	public function getItemChildren($names)
+	{
+		if (is_string($names)) {
+			return isset($this->_children[$names]) ? $this->_children[$names] : array();
+		}
+
+		$children = array();
+		foreach ($names as $name) {
+			if (isset($this->_children[$name])) {
+				$children = array_merge($children, $this->_children[$name]);
+			}
+		}
+		return $children;
+	}
+
+	/**
+	 * Assigns an authorization item to a user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @param string $bizRule the business rule to be executed when [[checkAccess()]] is called
+	 * for this particular authorization item.
+	 * @param mixed $data additional data associated with this assignment
+	 * @return Assignment the authorization assignment information.
+	 * @throws Exception if the item does not exist or if the item has already been assigned to the user
+	 */
+	public function assign($userId, $itemName, $bizRule = null, $data = null)
+	{
+		if (!isset($this->_items[$itemName])) {
+			throw new Exception("Unknown authorization item '$itemName'.");
+		} elseif (isset($this->_assignments[$userId][$itemName])) {
+			throw new Exception("Authorization item '$itemName' has already been assigned to user '$userId'.");
+		} else {
+			return $this->_assignments[$userId][$itemName] = new Assignment($this, $itemName, $userId, $bizRule, $data);
+		}
+	}
+
+	/**
+	 * Revokes an authorization assignment from a user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @return boolean whether removal is successful
+	 */
+	public function revoke($userId, $itemName)
+	{
+		if (isset($this->_assignments[$userId][$itemName])) {
+			unset($this->_assignments[$userId][$itemName]);
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Returns a value indicating whether the item has been assigned to the user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @return boolean whether the item has been assigned to the user.
+	 */
+	public function isAssigned($userId, $itemName)
+	{
+		return isset($this->_assignments[$userId][$itemName]);
+	}
+
+	/**
+	 * Returns the item assignment information.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @return Assignment the item assignment information. Null is returned if
+	 * the item is not assigned to the user.
+	 */
+	public function getAssignment($userId, $itemName)
+	{
+		return isset($this->_assignments[$userId][$itemName]) ? $this->_assignments[$userId][$itemName] : null;
+	}
+
+	/**
+	 * Returns the item assignments for the specified user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @return array the item assignment information for the user. An empty array will be
+	 * returned if there is no item assigned to the user.
+	 */
+	public function getAssignments($userId)
+	{
+		return isset($this->_assignments[$userId]) ? $this->_assignments[$userId] : array();
+	}
+
+	/**
+	 * Returns the authorization items of the specific type and user.
+	 * @param mixed $userId the user ID. Defaults to null, meaning returning all items even if
+	 * they are not assigned to a user.
+	 * @param integer $type the item type (0: operation, 1: task, 2: role). Defaults to null,
+	 * meaning returning all items regardless of their type.
+	 * @return array the authorization items of the specific type.
+	 */
+	public function getItems($userId = null, $type = null)
+	{
+		if ($type === null && $userId === null) {
+			return $this->_items;
+		}
+		$items = array();
+		if ($userId === null) {
+			foreach ($this->_items as $name => $item) {
+				if ($item->getType() == $type) {
+					$items[$name] = $item;
+				}
+			}
+		} elseif (isset($this->_assignments[$userId])) {
+			foreach ($this->_assignments[$userId] as $assignment) {
+				$name = $assignment->getItemName();
+				if (isset($this->_items[$name]) && ($type === null || $this->_items[$name]->getType() == $type)) {
+					$items[$name] = $this->_items[$name];
+				}
+			}
+		}
+		return $items;
+	}
+
+	/**
+	 * Creates an authorization item.
+	 * An authorization item represents an action permission (e.g. creating a post).
+	 * It has three types: operation, task and role.
+	 * Authorization items form a hierarchy. Higher level items inheirt permissions representing
+	 * by lower level items.
+	 * @param string $name the item name. This must be a unique identifier.
+	 * @param integer $type the item type (0: operation, 1: task, 2: role).
+	 * @param string $description description of the item
+	 * @param string $bizRule business rule associated with the item. This is a piece of
+	 * PHP code that will be executed when [[checkAccess()]] is called for the item.
+	 * @param mixed $data additional data associated with the item.
+	 * @return Item the authorization item
+	 * @throws Exception if an item with the same name already exists
+	 */
+	public function createItem($name, $type, $description = '', $bizRule = null, $data = null)
+	{
+		if (isset($this->_items[$name])) {
+			throw new Exception('Unable to add an item whose name is the same as an existing item.');
+		}
+		return $this->_items[$name] = new Item($this, $name, $type, $description, $bizRule, $data);
+	}
+
+	/**
+	 * Removes the specified authorization item.
+	 * @param string $name the name of the item to be removed
+	 * @return boolean whether the item exists in the storage and has been removed
+	 */
+	public function removeItem($name)
+	{
+		if (isset($this->_items[$name])) {
+			foreach ($this->_children as &$children) {
+				unset($children[$name]);
+			}
+			foreach ($this->_assignments as &$assignments) {
+				unset($assignments[$name]);
+			}
+			unset($this->_items[$name]);
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Returns the authorization item with the specified name.
+	 * @param string $name the name of the item
+	 * @return Item the authorization item. Null if the item cannot be found.
+	 */
+	public function getItem($name)
+	{
+		return isset($this->_items[$name]) ? $this->_items[$name] : null;
+	}
+
+	/**
+	 * Saves an authorization item to persistent storage.
+	 * @param Item $item the item to be saved.
+	 * @param string $oldName the old item name. If null, it means the item name is not changed.
+	 * @throws Exception if an item with the same name already taken
+	 */
+	public function saveItem($item, $oldName = null)
+	{
+		if ($oldName !== null && ($newName = $item->getName()) !== $oldName) // name changed
+		{
+			if (isset($this->_items[$newName])) {
+				throw new Exception("Unable to change the item name. The name '$newName' is already used by another item.");
+			}
+			if (isset($this->_items[$oldName]) && $this->_items[$oldName] === $item) {
+				unset($this->_items[$oldName]);
+				$this->_items[$newName] = $item;
+				if (isset($this->_children[$oldName])) {
+					$this->_children[$newName] = $this->_children[$oldName];
+					unset($this->_children[$oldName]);
+				}
+				foreach ($this->_children as &$children) {
+					if (isset($children[$oldName])) {
+						$children[$newName] = $children[$oldName];
+						unset($children[$oldName]);
+					}
+				}
+				foreach ($this->_assignments as &$assignments) {
+					if (isset($assignments[$oldName])) {
+						$assignments[$newName] = $assignments[$oldName];
+						unset($assignments[$oldName]);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Saves the changes to an authorization assignment.
+	 * @param Assignment $assignment the assignment that has been changed.
+	 */
+	public function saveAssignment($assignment)
+	{
+	}
+
+	/**
+	 * Saves authorization data into persistent storage.
+	 * If any change is made to the authorization data, please make
+	 * sure you call this method to save the changed data into persistent storage.
+	 */
+	public function save()
+	{
+		$items = array();
+		foreach ($this->_items as $name => $item) {
+			$items[$name] = array(
+				'type' => $item->getType(),
+				'description' => $item->getDescription(),
+				'bizRule' => $item->getBizRule(),
+				'data' => $item->getData(),
+			);
+			if (isset($this->_children[$name])) {
+				foreach ($this->_children[$name] as $child) {
+					$items[$name]['children'][] = $child->getName();
+				}
+			}
+		}
+
+		foreach ($this->_assignments as $userId => $assignments) {
+			foreach ($assignments as $name => $assignment) {
+				if (isset($items[$name])) {
+					$items[$name]['assignments'][$userId] = array(
+						'bizRule' => $assignment->getBizRule(),
+						'data' => $assignment->getData(),
+					);
+				}
+			}
+		}
+
+		$this->saveToFile($items, $this->authFile);
+	}
+
+	/**
+	 * Loads authorization data.
+	 */
+	public function load()
+	{
+		$this->clearAll();
+
+		$items = $this->loadFromFile($this->authFile);
+
+		foreach ($items as $name => $item) {
+			$this->_items[$name] = new Item($this, $name, $item['type'], $item['description'], $item['bizRule'], $item['data']);
+		}
+
+		foreach ($items as $name => $item) {
+			if (isset($item['children'])) {
+				foreach ($item['children'] as $childName) {
+					if (isset($this->_items[$childName])) {
+						$this->_children[$name][$childName] = $this->_items[$childName];
+					}
+				}
+			}
+			if (isset($item['assignments'])) {
+				foreach ($item['assignments'] as $userId => $assignment) {
+					$this->_assignments[$userId][$name] = new Assignment($this, $name, $userId, $assignment['bizRule'], $assignment['data']);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Removes all authorization data.
+	 */
+	public function clearAll()
+	{
+		$this->clearAssignments();
+		$this->_children = array();
+		$this->_items = array();
+	}
+
+	/**
+	 * Removes all authorization assignments.
+	 */
+	public function clearAssignments()
+	{
+		$this->_assignments = array();
+	}
+
+	/**
+	 * Checks whether there is a loop in the authorization item hierarchy.
+	 * @param string $itemName parent item name
+	 * @param string $childName the name of the child item that is to be added to the hierarchy
+	 * @return boolean whether a loop exists
+	 */
+	protected function detectLoop($itemName, $childName)
+	{
+		if ($childName === $itemName) {
+			return true;
+		}
+		if (!isset($this->_children[$childName], $this->_items[$itemName])) {
+			return false;
+		}
+		foreach ($this->_children[$childName] as $child) {
+			if ($this->detectLoop($itemName, $child->getName())) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Loads the authorization data from a PHP script file.
+	 * @param string $file the file path.
+	 * @return array the authorization data
+	 * @see saveToFile
+	 */
+	protected function loadFromFile($file)
+	{
+		if (is_file($file)) {
+			return require($file);
+		} else {
+			return array();
+		}
+	}
+
+	/**
+	 * Saves the authorization data to a PHP script file.
+	 * @param array $data the authorization data
+	 * @param string $file the file path.
+	 * @see loadFromFile
+	 */
+	protected function saveToFile($data, $file)
+	{
+		file_put_contents($file, "<?php\nreturn " . var_export($data, true) . ";\n");
+	}
+}
diff --git a/framework/web/AuthAssignment.php b/framework/web/AuthAssignment.php
deleted file mode 100644
index c08e12d..0000000
--- a/framework/web/AuthAssignment.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-use Yii;
-use yii\base\Object;
-
-/**
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @author Alexander Kochetov <creocoder@gmail.com>
- * @since 2.0
- */
-class AuthAssignment extends Object
-{
-	private $_auth;
-	private $_itemName;
-	private $_userId;
-	private $_bizRule;
-	private $_data;
-
-	/**
-	 * Constructor.
-	 * @param IAuthManager $auth the authorization manager
-	 * @param string $itemName authorization item name
-	 * @param mixed $userId user ID (see [[User::id]])
-	 * @param string $bizRule the business rule associated with this assignment
-	 * @param mixed $data additional data for this assignment
-	 */
-	public function __construct($auth, $itemName, $userId, $bizRule = null, $data = null)
-	{
-		$this->_auth = $auth;
-		$this->_itemName = $itemName;
-		$this->_userId = $userId;
-		$this->_bizRule = $bizRule;
-		$this->_data = $data;
-	}
-
-	/**
-	 * @return mixed user ID (see [[User::id]])
-	 */
-	public function getUserId()
-	{
-		return $this->_userId;
-	}
-
-	/**
-	 * @return string the authorization item name
-	 */
-	public function getItemName()
-	{
-		return $this->_itemName;
-	}
-
-	/**
-	 * @return string the business rule associated with this assignment
-	 */
-	public function getBizRule()
-	{
-		return $this->_bizRule;
-	}
-
-	/**
-	 * @param string $value the business rule associated with this assignment
-	 */
-	public function setBizRule($value)
-	{
-		if ($this->_bizRule !== $value) {
-			$this->_bizRule = $value;
-			$this->_auth->saveAuthAssignment($this);
-		}
-	}
-
-	/**
-	 * @return mixed additional data for this assignment
-	 */
-	public function getData()
-	{
-		return $this->_data;
-	}
-
-	/**
-	 * @param mixed $value additional data for this assignment
-	 */
-	public function setData($value)
-	{
-		if ($this->_data !== $value) {
-			$this->_data = $value;
-			$this->_auth->saveAuthAssignment($this);
-		}
-	}
-}
diff --git a/framework/web/AuthItem.php b/framework/web/AuthItem.php
deleted file mode 100644
index 0d3553d..0000000
--- a/framework/web/AuthItem.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-use Yii;
-use yii\base\Object;
-
-/**
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @author Alexander Kochetov <creocoder@gmail.com>
- * @since 2.0
- */
-class AuthItem extends Object
-{
-	const TYPE_OPERATION = 0;
-	const TYPE_TASK = 1;
-	const TYPE_ROLE = 2;
-
-	private $_auth;
-	private $_type;
-	private $_name;
-	private $_description;
-	private $_bizRule;
-	private $_data;
-
-	/**
-	 * Constructor.
-	 * @param IAuthManager $auth authorization manager
-	 * @param string $name authorization item name
-	 * @param integer $type authorization item type. This can be 0 (operation), 1 (task) or 2 (role).
-	 * @param string $description the description
-	 * @param string $bizRule the business rule associated with this item
-	 * @param mixed $data additional data for this item
-	 */
-	public function __construct($auth, $name, $type, $description = '', $bizRule = null, $data = null)
-	{
-		$this->_type = (int)$type;
-		$this->_auth = $auth;
-		$this->_name = $name;
-		$this->_description = $description;
-		$this->_bizRule = $bizRule;
-		$this->_data = $data;
-	}
-
-	/**
-	 * Checks to see if the specified item is within the hierarchy starting from this item.
-	 * This method is expected to be internally used by the actual implementations
-	 * of the [[IAuthManager::checkAccess()]].
-	 * @param string $itemName the name of the item to be checked
-	 * @param array $params the parameters to be passed to business rule evaluation
-	 * @return boolean whether the specified item is within the hierarchy starting from this item.
-	 */
-	public function checkAccess($itemName, $params = array())
-	{
-		Yii::trace('Checking permission: ' . $this->_name, __METHOD__);
-		if ($this->_auth->executeBizRule($this->_bizRule, $params, $this->_data)) {
-			if ($this->_name == $itemName) {
-				return true;
-			}
-			foreach ($this->_auth->getItemChildren($this->_name) as $item) {
-				if ($item->checkAccess($itemName, $params)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @return IAuthManager the authorization manager
-	 */
-	public function getAuthManager()
-	{
-		return $this->_auth;
-	}
-
-	/**
-	 * @return integer the authorization item type. This could be 0 (operation), 1 (task) or 2 (role).
-	 */
-	public function getType()
-	{
-		return $this->_type;
-	}
-
-	/**
-	 * @return string the item name
-	 */
-	public function getName()
-	{
-		return $this->_name;
-	}
-
-	/**
-	 * @param string $value the item name
-	 */
-	public function setName($value)
-	{
-		if ($this->_name !== $value) {
-			$oldName = $this->_name;
-			$this->_name = $value;
-			$this->_auth->saveAuthItem($this, $oldName);
-		}
-	}
-
-	/**
-	 * @return string the item description
-	 */
-	public function getDescription()
-	{
-		return $this->_description;
-	}
-
-	/**
-	 * @param string $value the item description
-	 */
-	public function setDescription($value)
-	{
-		if ($this->_description !== $value) {
-			$this->_description = $value;
-			$this->_auth->saveAuthItem($this);
-		}
-	}
-
-	/**
-	 * @return string the business rule associated with this item
-	 */
-	public function getBizRule()
-	{
-		return $this->_bizRule;
-	}
-
-	/**
-	 * @param string $value the business rule associated with this item
-	 */
-	public function setBizRule($value)
-	{
-		if ($this->_bizRule !== $value) {
-			$this->_bizRule = $value;
-			$this->_auth->saveAuthItem($this);
-		}
-	}
-
-	/**
-	 * @return mixed the additional data associated with this item
-	 */
-	public function getData()
-	{
-		return $this->_data;
-	}
-
-	/**
-	 * @param mixed $value the additional data associated with this item
-	 */
-	public function setData($value)
-	{
-		if ($this->_data !== $value) {
-			$this->_data = $value;
-			$this->_auth->saveAuthItem($this);
-		}
-	}
-
-	/**
-	 * Adds a child item.
-	 * @param string $name the name of the child item
-	 * @return boolean whether the item is added successfully
-	 * @throws \yii\base\Exception if either parent or child doesn't exist or if a loop has been detected.
-	 * @see IAuthManager::addItemChild
-	 */
-	public function addChild($name)
-	{
-		return $this->_auth->addItemChild($this->_name, $name);
-	}
-
-	/**
-	 * Removes a child item.
-	 * Note, the child item is not deleted. Only the parent-child relationship is removed.
-	 * @param string $name the child item name
-	 * @return boolean whether the removal is successful
-	 * @see IAuthManager::removeItemChild
-	 */
-	public function removeChild($name)
-	{
-		return $this->_auth->removeItemChild($this->_name, $name);
-	}
-
-	/**
-	 * Returns a value indicating whether a child exists
-	 * @param string $name the child item name
-	 * @return boolean whether the child exists
-	 * @see IAuthManager::hasItemChild
-	 */
-	public function hasChild($name)
-	{
-		return $this->_auth->hasItemChild($this->_name, $name);
-	}
-
-	/**
-	 * Returns the children of this item.
-	 * @return array all child items of this item.
-	 * @see IAuthManager::getItemChildren
-	 */
-	public function getChildren()
-	{
-		return $this->_auth->getItemChildren($this->_name);
-	}
-
-	/**
-	 * Assigns this item to a user.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @param string $bizRule the business rule to be executed when [[checkAccess()]] is called
-	 * for this particular authorization item.
-	 * @param mixed $data additional data associated with this assignment
-	 * @return AuthAssignment the authorization assignment information.
-	 * @throws \yii\base\Exception if the item has already been assigned to the user
-	 * @see IAuthManager::assign
-	 */
-	public function assign($userId, $bizRule = null, $data = null)
-	{
-		return $this->_auth->assign($this->_name, $userId, $bizRule, $data);
-	}
-
-	/**
-	 * Revokes an authorization assignment from a user.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @return boolean whether removal is successful
-	 * @see IAuthManager::revoke
-	 */
-	public function revoke($userId)
-	{
-		return $this->_auth->revoke($this->_name, $userId);
-	}
-
-	/**
-	 * Returns a value indicating whether this item has been assigned to the user.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @return boolean whether the item has been assigned to the user.
-	 * @see IAuthManager::isAssigned
-	 */
-	public function isAssigned($userId)
-	{
-		return $this->_auth->isAssigned($this->_name, $userId);
-	}
-
-	/**
-	 * Returns the item assignment information.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @return AuthAssignment the item assignment information. Null is returned if
-	 * this item is not assigned to the user.
-	 * @see IAuthManager::getAuthAssignment
-	 */
-	public function getAssignment($userId)
-	{
-		return $this->_auth->getAuthAssignment($this->_name, $userId);
-	}
-}
diff --git a/framework/web/AuthManager.php b/framework/web/AuthManager.php
deleted file mode 100644
index 4888689..0000000
--- a/framework/web/AuthManager.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-use Yii;
-use yii\base\Component;
-use yii\base\Exception;
-
-/**
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @author Alexander Kochetov <creocoder@gmail.com>
- * @since 2.0
- */
-abstract class AuthManager extends Component implements IAuthManager
-{
-	/**
-	 * @var boolean Enable error reporting for bizRules.
-	 */
-	public $showErrors = false;
-
-	/**
-	 * @var array list of role names that are assigned to all users implicitly.
-	 * These roles do not need to be explicitly assigned to any user.
-	 * When calling [[checkAccess()]], these roles will be checked first.
-	 * For performance reason, you should minimize the number of such roles.
-	 * A typical usage of such roles is to define an 'authenticated' role and associate
-	 * it with a biz rule which checks if the current user is authenticated.
-	 * And then declare 'authenticated' in this property so that it can be applied to
-	 * every authenticated user.
-	 */
-	public $defaultRoles = array();
-
-	/**
-	 * Creates a role.
-	 * This is a shortcut method to [[IAuthManager::createAuthItem()]].
-	 * @param string $name the item name
-	 * @param string $description the item description.
-	 * @param string $bizRule the business rule associated with this item
-	 * @param mixed $data additional data to be passed when evaluating the business rule
-	 * @return AuthItem the authorization item
-	 */
-	public function createRole($name, $description = '', $bizRule = null, $data = null)
-	{
-		return $this->createAuthItem($name, AuthItem::TYPE_ROLE, $description, $bizRule, $data);
-	}
-
-	/**
-	 * Creates a task.
-	 * This is a shortcut method to [[IAuthManager::createAuthItem()]].
-	 * @param string $name the item name
-	 * @param string $description the item description.
-	 * @param string $bizRule the business rule associated with this item
-	 * @param mixed $data additional data to be passed when evaluating the business rule
-	 * @return AuthItem the authorization item
-	 */
-	public function createTask($name, $description = '', $bizRule = null, $data = null)
-	{
-		return $this->createAuthItem($name, AuthItem::TYPE_TASK, $description, $bizRule, $data);
-	}
-
-	/**
-	 * Creates an operation.
-	 * This is a shortcut method to [[IAuthManager::createAuthItem()]].
-	 * @param string $name the item name
-	 * @param string $description the item description.
-	 * @param string $bizRule the business rule associated with this item
-	 * @param mixed $data additional data to be passed when evaluating the business rule
-	 * @return AuthItem the authorization item
-	 */
-	public function createOperation($name, $description = '', $bizRule = null, $data = null)
-	{
-		return $this->createAuthItem($name, AuthItem::TYPE_OPERATION, $description, $bizRule, $data);
-	}
-
-	/**
-	 * Returns roles.
-	 * This is a shortcut method to [[IAuthManager::getAuthItems()]].
-	 * @param mixed $userId the user ID. If not null, only the roles directly assigned to the user
-	 * will be returned. Otherwise, all roles will be returned.
-	 * @return array roles (name=>AuthItem)
-	 */
-	public function getRoles($userId = null)
-	{
-		return $this->getAuthItems(AuthItem::TYPE_ROLE, $userId);
-	}
-
-	/**
-	 * Returns tasks.
-	 * This is a shortcut method to [[IAuthManager::getAuthItems()]].
-	 * @param mixed $userId the user ID. If not null, only the tasks directly assigned to the user
-	 * will be returned. Otherwise, all tasks will be returned.
-	 * @return array tasks (name=>AuthItem)
-	 */
-	public function getTasks($userId = null)
-	{
-		return $this->getAuthItems(AuthItem::TYPE_TASK, $userId);
-	}
-
-	/**
-	 * Returns operations.
-	 * This is a shortcut method to [[IAuthManager::getAuthItems()]].
-	 * @param mixed $userId the user ID. If not null, only the operations directly assigned to the user
-	 * will be returned. Otherwise, all operations will be returned.
-	 * @return array operations (name=>AuthItem)
-	 */
-	public function getOperations($userId = null)
-	{
-		return $this->getAuthItems(AuthItem::TYPE_OPERATION, $userId);
-	}
-
-	/**
-	 * Executes the specified business rule.
-	 * @param string $bizRule the business rule to be executed.
-	 * @param array $params parameters passed to [[IAuthManager::checkAccess()]].
-	 * @param mixed $data additional data associated with the authorization item or assignment.
-	 * @return boolean whether the business rule returns true.
-	 * If the business rule is empty, it will still return true.
-	 */
-	public function executeBizRule($bizRule, $params, $data)
-	{
-		return $bizRule === '' || $bizRule === null || ($this->showErrors ? eval($bizRule) != 0 : @eval($bizRule) != 0);
-	}
-
-	/**
-	 * Checks the item types to make sure a child can be added to a parent.
-	 * @param integer $parentType parent item type
-	 * @param integer $childType child item type
-	 * @throws Exception if the item cannot be added as a child due to its incompatible type.
-	 */
-	protected function checkItemChildType($parentType, $childType)
-	{
-		static $types = array('operation', 'task', 'role');
-		if ($parentType < $childType) {
-			throw new Exception("Cannot add an item of type '$types[$childType]' to an item of type '$types[$parentType]'.");
-		}
-	}
-}
diff --git a/framework/web/IAuthManager.php b/framework/web/IAuthManager.php
deleted file mode 100644
index 1d2fbb9..0000000
--- a/framework/web/IAuthManager.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-/**
- * IAuthManager interface is implemented by an auth manager application component.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @author Alexander Kochetov <creocoder@gmail.com>
- * @since 2.0
- */
-interface IAuthManager
-{
-	/**
-	 * Performs access check for the specified user.
-	 * @param mixed $userId the user ID. This should be either an integer or a string representing
-	 * the unique identifier of a user. See [[User::id]].
-	 * @param string $itemName the name of the operation that we are checking access to
-	 * @param array $params name-value pairs that would be passed to biz rules associated
-	 * with the tasks and roles assigned to the user.
-	 * @return boolean whether the operations can be performed by the user.
-	 */
-	public function checkAccess($userId, $itemName, $params = array());
-
-	/**
-	 * Creates an authorization item.
-	 * An authorization item represents an action permission (e.g. creating a post).
-	 * It has three types: operation, task and role.
-	 * Authorization items form a hierarchy. Higher level items inheirt permissions representing
-	 * by lower level items.
-	 * @param string $name the item name. This must be a unique identifier.
-	 * @param integer $type the item type (0: operation, 1: task, 2: role).
-	 * @param string $description description of the item
-	 * @param string $bizRule business rule associated with the item. This is a piece of
-	 * PHP code that will be executed when [[checkAccess()]] is called for the item.
-	 * @param mixed $data additional data associated with the item.
-	 * @throws \yii\base\Exception if an item with the same name already exists
-	 * @return AuthItem the authorization item
-	 */
-	public function createAuthItem($name, $type, $description = '', $bizRule = null, $data = null);
-	/**
-	 * Removes the specified authorization item.
-	 * @param string $name the name of the item to be removed
-	 * @return boolean whether the item exists in the storage and has been removed
-	 */
-	public function removeAuthItem($name);
-	/**
-	 * Returns the authorization items of the specific type and user.
-	 * @param mixed $userId the user ID. Defaults to null, meaning returning all items even if
-	 * they are not assigned to a user.
-	 * @param integer $type the item type (0: operation, 1: task, 2: role). Defaults to null,
-	 * meaning returning all items regardless of their type.
-	 * @return array the authorization items of the specific type.
-	 */
-	public function getAuthItems($userId = null, $type = null);
-	/**
-	 * Returns the authorization item with the specified name.
-	 * @param string $name the name of the item
-	 * @return AuthItem the authorization item. Null if the item cannot be found.
-	 */
-	public function getAuthItem($name);
-	/**
-	 * Saves an authorization item to persistent storage.
-	 * @param AuthItem $item the item to be saved.
-	 * @param string $oldName the old item name. If null, it means the item name is not changed.
-	 */
-	public function saveAuthItem($item, $oldName = null);
-
-	/**
-	 * Adds an item as a child of another item.
-	 * @param string $itemName the parent item name
-	 * @param string $childName the child item name
-	 * @throws \yii\base\Exception if either parent or child doesn't exist or if a loop has been detected.
-	 */
-	public function addItemChild($itemName, $childName);
-	/**
-	 * Removes a child from its parent.
-	 * Note, the child item is not deleted. Only the parent-child relationship is removed.
-	 * @param string $itemName the parent item name
-	 * @param string $childName the child item name
-	 * @return boolean whether the removal is successful
-	 */
-	public function removeItemChild($itemName, $childName);
-	/**
-	 * Returns a value indicating whether a child exists within a parent.
-	 * @param string $itemName the parent item name
-	 * @param string $childName the child item name
-	 * @return boolean whether the child exists
-	 */
-	public function hasItemChild($itemName, $childName);
-	/**
-	 * Returns the children of the specified item.
-	 * @param mixed $itemName the parent item name. This can be either a string or an array.
-	 * The latter represents a list of item names.
-	 * @return array all child items of the parent
-	 */
-	public function getItemChildren($itemName);
-
-	/**
-	 * Assigns an authorization item to a user.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @param string $itemName the item name
-	 * @param string $bizRule the business rule to be executed when [[checkAccess()]] is called
-	 * for this particular authorization item.
-	 * @param mixed $data additional data associated with this assignment
-	 * @return AuthAssignment the authorization assignment information.
-	 * @throws \yii\base\Exception if the item does not exist or if the item has already been assigned to the user
-	 */
-	public function assign($userId, $itemName, $bizRule = null, $data = null);
-	/**
-	 * Revokes an authorization assignment from a user.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @param string $itemName the item name
-	 * @return boolean whether removal is successful
-	 */
-	public function revoke($userId, $itemName);
-	/**
-	 * Returns a value indicating whether the item has been assigned to the user.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @param string $itemName the item name
-	 * @return boolean whether the item has been assigned to the user.
-	 */
-	public function isAssigned($userId, $itemName);
-	/**
-	 * Returns the item assignment information.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @param string $itemName the item name
-	 * @return AuthAssignment the item assignment information. Null is returned if
-	 * the item is not assigned to the user.
-	 */
-	public function getAuthAssignment($userId, $itemName);
-	/**
-	 * Returns the item assignments for the specified user.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @return array the item assignment information for the user. An empty array will be
-	 * returned if there is no item assigned to the user.
-	 */
-	public function getAuthAssignments($userId);
-	/**
-	 * Saves the changes to an authorization assignment.
-	 * @param AuthAssignment $assignment the assignment that has been changed.
-	 */
-	public function saveAuthAssignment($assignment);
-	/**
-	 * Removes all authorization data.
-	 */
-	public function clearAll();
-	/**
-	 * Removes all authorization assignments.
-	 */
-	public function clearAuthAssignments();
-	/**
-	 * Saves authorization data into persistent storage.
-	 * If any change is made to the authorization data, please make
-	 * sure you call this method to save the changed data into persistent storage.
-	 */
-	public function save();
-	/**
-	 * Executes a business rule.
-	 * A business rule is a piece of PHP code that will be executed when [[checkAccess()]] is called.
-	 * @param string $bizRule the business rule to be executed.
-	 * @param array $params additional parameters to be passed to the business rule when being executed.
-	 * @param mixed $data additional data that is associated with the corresponding authorization item or assignment
-	 * @return boolean whether the execution returns a true value.
-	 * If the business rule is empty, it will also return true.
-	 */
-	public function executeBizRule($bizRule, $params, $data);
-}

From 17906e712c301e252343bfb74cf6a648d955096b Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Thu, 9 May 2013 19:04:50 +0400
Subject: [PATCH 117/152] Application::getAuthManager() comment fix

---
 framework/base/Application.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/base/Application.php b/framework/base/Application.php
index 6bd31f1..2e068ef 100644
--- a/framework/base/Application.php
+++ b/framework/base/Application.php
@@ -306,7 +306,7 @@ class Application extends Module
 
 	/**
 	 * Returns the auth manager for this application.
-	 * @return \yii\web\AuthManager the auth manager for this application.
+	 * @return \yii\rbac\Manager the auth manager for this application.
 	 */
 	public function getAuthManager()
 	{

From 8520be08dea9127e8a3c7b2675062398f233eb9e Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Thu, 9 May 2013 11:40:51 -0400
Subject: [PATCH 118/152] Fixes issue #174: make URL parameters available in
 $_GET.

---
 framework/web/Request.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/web/Request.php b/framework/web/Request.php
index 5e2f064..d3f419b 100644
--- a/framework/web/Request.php
+++ b/framework/web/Request.php
@@ -69,8 +69,8 @@ class Request extends \yii\base\Request
 		$result = Yii::$app->getUrlManager()->parseRequest($this);
 		if ($result !== false) {
 			list ($route, $params) = $result;
-			$params = array_merge($_GET, $params);
-			return array($route, $params);
+			$_GET = array_merge($_GET, $params);
+			return array($route, $_GET);
 		} else {
 			throw new HttpException(404, Yii::t('yii|Page not found.'));
 		}

From b68bd8ef631b7ef154d4b6fc092fe546eb5d915e Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Thu, 9 May 2013 11:53:13 -0400
Subject: [PATCH 119/152] Fixed Yii::importNamespaces() bug.

---
 framework/YiiBase.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/YiiBase.php b/framework/YiiBase.php
index aeed6f5..faf8a6e 100644
--- a/framework/YiiBase.php
+++ b/framework/YiiBase.php
@@ -158,8 +158,8 @@ class YiiBase
 	{
 		foreach ($namespaces as $name => $path) {
 			if ($name !== '') {
-				$name = '@' . str_replace('\\', '/', $name);
-				static::setAlias($name, $path);
+				$name = trim(strtr($name, array('\\' => '/', '_' => '/')), '/');
+				static::setAlias('@' . $name, rtrim($path, '/\\') . '/' . $name);
 			}
 		}
 	}

From 0d814fa5236f2a7c708acfeea30f8a05f1f268fe Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Thu, 9 May 2013 12:00:15 -0400
Subject: [PATCH 120/152] Moved "framework" to "iii".

---
 .gitignore                                         |    2 +-
 apps/bootstrap/index.php                           |    2 +-
 framework/.htaccess                                |    1 -
 framework/Yii.php                                  |   25 -
 framework/YiiBase.php                              |  615 --------
 framework/assets.php                               |   45 -
 framework/assets/jquery.min.js                     |    5 -
 framework/assets/yii.activeForm.js                 |  387 -----
 framework/assets/yii.captcha.js                    |   72 -
 framework/assets/yii.debug.js                      |   26 -
 framework/assets/yii.js                            |   65 -
 framework/assets/yii.validation.js                 |  198 ---
 framework/base/Action.php                          |   80 --
 framework/base/ActionEvent.php                     |   41 -
 framework/base/ActionFilter.php                    |   90 --
 framework/base/Application.php                     |  463 ------
 framework/base/Behavior.php                        |   91 --
 framework/base/Component.php                       |  555 --------
 framework/base/Controller.php                      |  504 -------
 framework/base/Dictionary.php                      |  297 ----
 framework/base/DictionaryIterator.php              |   92 --
 framework/base/ErrorException.php                  |  109 --
 framework/base/ErrorHandler.php                    |  280 ----
 framework/base/Event.php                           |   48 -
 framework/base/Exception.php                       |   25 -
 framework/base/HttpException.php                   |  108 --
 framework/base/InlineAction.php                    |   49 -
 framework/base/InvalidCallException.php            |   26 -
 framework/base/InvalidConfigException.php          |   26 -
 framework/base/InvalidParamException.php           |   26 -
 framework/base/InvalidRequestException.php         |   26 -
 framework/base/InvalidRouteException.php           |   26 -
 framework/base/Model.php                           |  688 ---------
 framework/base/ModelEvent.php                      |   25 -
 framework/base/Module.php                          |  650 ---------
 framework/base/NotSupportedException.php           |   26 -
 framework/base/Object.php                          |  219 ---
 framework/base/Request.php                         |   77 -
 framework/base/Response.php                        |   59 -
 framework/base/Theme.php                           |  114 --
 framework/base/UnknownClassException.php           |   26 -
 framework/base/UnknownMethodException.php          |   26 -
 framework/base/UnknownPropertyException.php        |   26 -
 framework/base/UserException.php                   |   19 -
 framework/base/Vector.php                          |  341 -----
 framework/base/VectorIterator.php                  |   92 --
 framework/base/View.php                            |  810 -----------
 framework/base/ViewEvent.php                       |   44 -
 framework/base/ViewRenderer.php                    |   30 -
 framework/base/Widget.php                          |  137 --
 framework/caching/ApcCache.php                     |   91 --
 framework/caching/Cache.php                        |  352 -----
 framework/caching/ChainedDependency.php            |   86 --
 framework/caching/DbCache.php                      |  247 ----
 framework/caching/DbDependency.php                 |   75 -
 framework/caching/Dependency.php                   |   52 -
 framework/caching/DummyCache.php                   |   81 --
 framework/caching/ExpressionDependency.php         |   59 -
 framework/caching/FileCache.php                    |  206 ---
 framework/caching/FileDependency.php               |   47 -
 framework/caching/MemCache.php                     |  225 ---
 framework/caching/MemCacheServer.php               |   49 -
 framework/caching/WinCache.php                     |   92 --
 framework/caching/XCache.php                       |   89 --
 framework/caching/ZendDataCache.php                |   83 --
 framework/console/Application.php                  |  152 --
 framework/console/Controller.php                   |  264 ----
 framework/console/Exception.php                    |   28 -
 framework/console/Request.php                      |   51 -
 framework/console/controllers/AppController.php    |  324 -----
 framework/console/controllers/AssetController.php  |  353 -----
 framework/console/controllers/CacheController.php  |   47 -
 framework/console/controllers/HelpController.php   |  421 ------
 .../console/controllers/MessageController.php      |  206 ---
 .../console/controllers/MigrateController.php      |  633 ---------
 framework/console/runtime/.gitignore               |    1 -
 framework/db/ActiveQuery.php                       |  380 -----
 framework/db/ActiveRecord.php                      | 1339 ------------------
 framework/db/ActiveRelation.php                    |  304 ----
 framework/db/ColumnSchema.php                      |  101 --
 framework/db/Command.php                           |  754 ----------
 framework/db/Connection.php                        |  563 --------
 framework/db/DataReader.php                        |  264 ----
 framework/db/Exception.php                         |   44 -
 framework/db/Expression.php                        |   60 -
 framework/db/Migration.php                         |  371 -----
 framework/db/Query.php                             |  607 --------
 framework/db/QueryBuilder.php                      |  912 ------------
 framework/db/Schema.php                            |  363 -----
 framework/db/StaleObjectException.php              |   23 -
 framework/db/TableSchema.php                       |  103 --
 framework/db/Transaction.php                       |  105 --
 framework/db/mysql/QueryBuilder.php                |  165 ---
 framework/db/mysql/Schema.php                      |  246 ----
 framework/db/sqlite/QueryBuilder.php               |  181 ---
 framework/db/sqlite/Schema.php                     |  183 ---
 framework/debug/Module.php                         |   17 -
 framework/debug/Toolbar.php                        |   38 -
 framework/debug/controllers/DefaultController.php  |   22 -
 framework/helpers/ArrayHelper.php                  |   19 -
 framework/helpers/Console.php                      |   22 -
 framework/helpers/FileHelper.php                   |   21 -
 framework/helpers/Html.php                         |   18 -
 framework/helpers/Json.php                         |   18 -
 framework/helpers/Markdown.php                     |   33 -
 framework/helpers/Purifier.php                     |   34 -
 framework/helpers/SecurityHelper.php               |   29 -
 framework/helpers/StringHelper.php                 |   19 -
 framework/helpers/VarDumper.php                    |   28 -
 framework/helpers/base/ArrayHelper.php             |  352 -----
 framework/helpers/base/Console.php                 |  781 -----------
 framework/helpers/base/FileHelper.php              |  172 ---
 framework/helpers/base/Html.php                    | 1483 --------------------
 framework/helpers/base/Json.php                    |  107 --
 framework/helpers/base/Markdown.php                |   50 -
 framework/helpers/base/Purifier.php                |   39 -
 framework/helpers/base/SecurityHelper.php          |  275 ----
 framework/helpers/base/StringHelper.php            |  148 --
 framework/helpers/base/VarDumper.php               |  134 --
 framework/helpers/base/mimeTypes.php               |  187 ---
 framework/i18n/I18N.php                            |  198 ---
 framework/i18n/MessageSource.php                   |  121 --
 framework/i18n/MissingTranslationEvent.php         |   33 -
 framework/i18n/PhpMessageSource.php                |   79 --
 framework/i18n/data/plurals.php                    |  627 ---------
 framework/i18n/data/plurals.xml                    |  109 --
 framework/logging/DbTarget.php                     |   93 --
 framework/logging/EmailTarget.php                  |   72 -
 framework/logging/FileTarget.php                   |  115 --
 framework/logging/Logger.php                       |  234 ---
 framework/logging/ProfileTarget.php                |  192 ---
 framework/logging/Router.php                       |   99 --
 framework/logging/Target.php                       |  244 ----
 framework/logging/WebTarget.php                    |   61 -
 framework/renderers/SmartyViewRenderer.php         |   99 --
 framework/renderers/TwigViewRenderer.php           |   73 -
 framework/test/TestCase.php                        |   25 -
 framework/test/WebTestCase.php                     |   25 -
 framework/validators/BooleanValidator.php          |  105 --
 framework/validators/CaptchaValidator.php          |  117 --
 framework/validators/CompareValidator.php          |  208 ---
 framework/validators/DateValidator.php             |   76 -
 framework/validators/DefaultValueValidator.php     |   43 -
 framework/validators/EmailValidator.php            |  121 --
 framework/validators/ExistValidator.php            |  102 --
 framework/validators/FileValidator.php             |  251 ----
 framework/validators/FilterValidator.php           |   70 -
 framework/validators/InlineValidator.php           |   99 --
 framework/validators/NumberValidator.php           |  154 --
 framework/validators/RangeValidator.php            |  106 --
 .../validators/RegularExpressionValidator.php      |  115 --
 framework/validators/RequiredValidator.php         |  129 --
 framework/validators/StringValidator.php           |  174 ---
 framework/validators/UniqueValidator.php           |  100 --
 framework/validators/UrlValidator.php              |  129 --
 framework/validators/Validator.php                 |  268 ----
 framework/views/error.php                          |   67 -
 framework/views/exception.php                      |  211 ---
 framework/views/migration.php                      |   23 -
 framework/web/AccessControl.php                    |  106 --
 framework/web/AccessRule.php                       |  185 ---
 framework/web/Application.php                      |  134 --
 framework/web/AssetBundle.php                      |  176 ---
 framework/web/AssetConverter.php                   |   62 -
 framework/web/AssetManager.php                     |  330 -----
 framework/web/CacheSession.php                     |  106 --
 framework/web/CaptchaAction.php                    |  338 -----
 framework/web/Controller.php                       |   43 -
 framework/web/Cookie.php                           |   65 -
 framework/web/CookieCollection.php                 |  247 ----
 framework/web/DbSession.php                        |  221 ---
 framework/web/HttpCache.php                        |  131 --
 framework/web/IAssetConverter.php                  |   27 -
 framework/web/Identity.php                         |   81 --
 framework/web/JsExpression.php                     |   45 -
 framework/web/PageCache.php                        |  104 --
 framework/web/Pagination.php                       |  208 ---
 framework/web/Request.php                          |  794 -----------
 framework/web/Response.php                         |  235 ----
 framework/web/Session.php                          |  678 ---------
 framework/web/SessionIterator.php                  |   84 --
 framework/web/Sort.php                             |  336 -----
 framework/web/SpicyRice.md                         |   11 -
 framework/web/SpicyRice.ttf                        |  Bin 67244 -> 0 bytes
 framework/web/UploadedFile.php                     |  246 ----
 framework/web/UrlManager.php                       |  264 ----
 framework/web/UrlRule.php                          |  283 ----
 framework/web/User.php                             |  467 ------
 framework/web/UserEvent.php                        |   34 -
 framework/widgets/ActiveField.php                  |  544 -------
 framework/widgets/ActiveForm.php                   |  229 ---
 framework/widgets/Block.php                        |   49 -
 framework/widgets/Breadcrumbs.php                  |  139 --
 framework/widgets/Captcha.php                      |  102 --
 framework/widgets/ContentDecorator.php             |   52 -
 framework/widgets/FragmentCache.php                |  174 ---
 framework/widgets/Menu.php                         |  287 ----
 framework/yiic                                     |   13 -
 framework/yiic.bat                                 |   22 -
 framework/yiic.php                                 |   22 -
 tests/unit/bootstrap.php                           |    2 +-
 tests/web/app/index.php                            |    2 +-
 yii/.htaccess                                      |    1 +
 yii/Yii.php                                        |   25 +
 yii/YiiBase.php                                    |  615 ++++++++
 yii/assets.php                                     |   45 +
 yii/assets/jquery.min.js                           |    5 +
 yii/assets/yii.activeForm.js                       |  387 +++++
 yii/assets/yii.captcha.js                          |   72 +
 yii/assets/yii.debug.js                            |   26 +
 yii/assets/yii.js                                  |   65 +
 yii/assets/yii.validation.js                       |  198 +++
 yii/base/Action.php                                |   80 ++
 yii/base/ActionEvent.php                           |   41 +
 yii/base/ActionFilter.php                          |   90 ++
 yii/base/Application.php                           |  463 ++++++
 yii/base/Behavior.php                              |   91 ++
 yii/base/Component.php                             |  555 ++++++++
 yii/base/Controller.php                            |  504 +++++++
 yii/base/Dictionary.php                            |  297 ++++
 yii/base/DictionaryIterator.php                    |   92 ++
 yii/base/ErrorException.php                        |  109 ++
 yii/base/ErrorHandler.php                          |  280 ++++
 yii/base/Event.php                                 |   48 +
 yii/base/Exception.php                             |   25 +
 yii/base/HttpException.php                         |  108 ++
 yii/base/InlineAction.php                          |   49 +
 yii/base/InvalidCallException.php                  |   26 +
 yii/base/InvalidConfigException.php                |   26 +
 yii/base/InvalidParamException.php                 |   26 +
 yii/base/InvalidRequestException.php               |   26 +
 yii/base/InvalidRouteException.php                 |   26 +
 yii/base/Model.php                                 |  688 +++++++++
 yii/base/ModelEvent.php                            |   25 +
 yii/base/Module.php                                |  650 +++++++++
 yii/base/NotSupportedException.php                 |   26 +
 yii/base/Object.php                                |  219 +++
 yii/base/Request.php                               |   77 +
 yii/base/Response.php                              |   59 +
 yii/base/Theme.php                                 |  114 ++
 yii/base/UnknownClassException.php                 |   26 +
 yii/base/UnknownMethodException.php                |   26 +
 yii/base/UnknownPropertyException.php              |   26 +
 yii/base/UserException.php                         |   19 +
 yii/base/Vector.php                                |  341 +++++
 yii/base/VectorIterator.php                        |   92 ++
 yii/base/View.php                                  |  810 +++++++++++
 yii/base/ViewEvent.php                             |   44 +
 yii/base/ViewRenderer.php                          |   30 +
 yii/base/Widget.php                                |  137 ++
 yii/caching/ApcCache.php                           |   91 ++
 yii/caching/Cache.php                              |  352 +++++
 yii/caching/ChainedDependency.php                  |   86 ++
 yii/caching/DbCache.php                            |  247 ++++
 yii/caching/DbDependency.php                       |   75 +
 yii/caching/Dependency.php                         |   52 +
 yii/caching/DummyCache.php                         |   81 ++
 yii/caching/ExpressionDependency.php               |   59 +
 yii/caching/FileCache.php                          |  206 +++
 yii/caching/FileDependency.php                     |   47 +
 yii/caching/MemCache.php                           |  225 +++
 yii/caching/MemCacheServer.php                     |   49 +
 yii/caching/WinCache.php                           |   92 ++
 yii/caching/XCache.php                             |   89 ++
 yii/caching/ZendDataCache.php                      |   83 ++
 yii/console/Application.php                        |  152 ++
 yii/console/Controller.php                         |  264 ++++
 yii/console/Exception.php                          |   28 +
 yii/console/Request.php                            |   51 +
 yii/console/controllers/AppController.php          |  324 +++++
 yii/console/controllers/AssetController.php        |  353 +++++
 yii/console/controllers/CacheController.php        |   47 +
 yii/console/controllers/HelpController.php         |  421 ++++++
 yii/console/controllers/MessageController.php      |  206 +++
 yii/console/controllers/MigrateController.php      |  633 +++++++++
 yii/console/runtime/.gitignore                     |    1 +
 yii/db/ActiveQuery.php                             |  380 +++++
 yii/db/ActiveRecord.php                            | 1339 ++++++++++++++++++
 yii/db/ActiveRelation.php                          |  304 ++++
 yii/db/ColumnSchema.php                            |  101 ++
 yii/db/Command.php                                 |  754 ++++++++++
 yii/db/Connection.php                              |  563 ++++++++
 yii/db/DataReader.php                              |  264 ++++
 yii/db/Exception.php                               |   44 +
 yii/db/Expression.php                              |   60 +
 yii/db/Migration.php                               |  371 +++++
 yii/db/Query.php                                   |  607 ++++++++
 yii/db/QueryBuilder.php                            |  912 ++++++++++++
 yii/db/Schema.php                                  |  363 +++++
 yii/db/StaleObjectException.php                    |   23 +
 yii/db/TableSchema.php                             |  103 ++
 yii/db/Transaction.php                             |  105 ++
 yii/db/mysql/QueryBuilder.php                      |  165 +++
 yii/db/mysql/Schema.php                            |  246 ++++
 yii/db/sqlite/QueryBuilder.php                     |  181 +++
 yii/db/sqlite/Schema.php                           |  183 +++
 yii/debug/Module.php                               |   17 +
 yii/debug/Toolbar.php                              |   38 +
 yii/debug/controllers/DefaultController.php        |   22 +
 yii/helpers/ArrayHelper.php                        |   19 +
 yii/helpers/Console.php                            |   22 +
 yii/helpers/FileHelper.php                         |   21 +
 yii/helpers/Html.php                               |   18 +
 yii/helpers/Json.php                               |   18 +
 yii/helpers/Markdown.php                           |   33 +
 yii/helpers/Purifier.php                           |   34 +
 yii/helpers/SecurityHelper.php                     |   29 +
 yii/helpers/StringHelper.php                       |   19 +
 yii/helpers/VarDumper.php                          |   28 +
 yii/helpers/base/ArrayHelper.php                   |  352 +++++
 yii/helpers/base/Console.php                       |  781 +++++++++++
 yii/helpers/base/FileHelper.php                    |  172 +++
 yii/helpers/base/Html.php                          | 1483 ++++++++++++++++++++
 yii/helpers/base/Json.php                          |  107 ++
 yii/helpers/base/Markdown.php                      |   50 +
 yii/helpers/base/Purifier.php                      |   39 +
 yii/helpers/base/SecurityHelper.php                |  275 ++++
 yii/helpers/base/StringHelper.php                  |  148 ++
 yii/helpers/base/VarDumper.php                     |  134 ++
 yii/helpers/base/mimeTypes.php                     |  187 +++
 yii/i18n/I18N.php                                  |  198 +++
 yii/i18n/MessageSource.php                         |  121 ++
 yii/i18n/MissingTranslationEvent.php               |   33 +
 yii/i18n/PhpMessageSource.php                      |   79 ++
 yii/i18n/data/plurals.php                          |  627 +++++++++
 yii/i18n/data/plurals.xml                          |  109 ++
 yii/logging/DbTarget.php                           |   93 ++
 yii/logging/EmailTarget.php                        |   72 +
 yii/logging/FileTarget.php                         |  115 ++
 yii/logging/Logger.php                             |  234 +++
 yii/logging/ProfileTarget.php                      |  192 +++
 yii/logging/Router.php                             |   99 ++
 yii/logging/Target.php                             |  244 ++++
 yii/logging/WebTarget.php                          |   61 +
 yii/renderers/SmartyViewRenderer.php               |   99 ++
 yii/renderers/TwigViewRenderer.php                 |   73 +
 yii/test/TestCase.php                              |   25 +
 yii/test/WebTestCase.php                           |   25 +
 yii/validators/BooleanValidator.php                |  105 ++
 yii/validators/CaptchaValidator.php                |  117 ++
 yii/validators/CompareValidator.php                |  208 +++
 yii/validators/DateValidator.php                   |   76 +
 yii/validators/DefaultValueValidator.php           |   43 +
 yii/validators/EmailValidator.php                  |  121 ++
 yii/validators/ExistValidator.php                  |  102 ++
 yii/validators/FileValidator.php                   |  251 ++++
 yii/validators/FilterValidator.php                 |   70 +
 yii/validators/InlineValidator.php                 |   99 ++
 yii/validators/NumberValidator.php                 |  154 ++
 yii/validators/RangeValidator.php                  |  106 ++
 yii/validators/RegularExpressionValidator.php      |  115 ++
 yii/validators/RequiredValidator.php               |  129 ++
 yii/validators/StringValidator.php                 |  174 +++
 yii/validators/UniqueValidator.php                 |  100 ++
 yii/validators/UrlValidator.php                    |  129 ++
 yii/validators/Validator.php                       |  268 ++++
 yii/views/error.php                                |   67 +
 yii/views/exception.php                            |  211 +++
 yii/views/migration.php                            |   23 +
 yii/web/AccessControl.php                          |  106 ++
 yii/web/AccessRule.php                             |  185 +++
 yii/web/Application.php                            |  134 ++
 yii/web/AssetBundle.php                            |  176 +++
 yii/web/AssetConverter.php                         |   62 +
 yii/web/AssetManager.php                           |  330 +++++
 yii/web/CacheSession.php                           |  106 ++
 yii/web/CaptchaAction.php                          |  338 +++++
 yii/web/Controller.php                             |   43 +
 yii/web/Cookie.php                                 |   65 +
 yii/web/CookieCollection.php                       |  247 ++++
 yii/web/DbSession.php                              |  221 +++
 yii/web/HttpCache.php                              |  131 ++
 yii/web/IAssetConverter.php                        |   27 +
 yii/web/Identity.php                               |   81 ++
 yii/web/JsExpression.php                           |   45 +
 yii/web/PageCache.php                              |  104 ++
 yii/web/Pagination.php                             |  208 +++
 yii/web/Request.php                                |  794 +++++++++++
 yii/web/Response.php                               |  235 ++++
 yii/web/Session.php                                |  678 +++++++++
 yii/web/SessionIterator.php                        |   84 ++
 yii/web/Sort.php                                   |  336 +++++
 yii/web/SpicyRice.md                               |   11 +
 yii/web/SpicyRice.ttf                              |  Bin 0 -> 67244 bytes
 yii/web/UploadedFile.php                           |  246 ++++
 yii/web/UrlManager.php                             |  264 ++++
 yii/web/UrlRule.php                                |  283 ++++
 yii/web/User.php                                   |  467 ++++++
 yii/web/UserEvent.php                              |   34 +
 yii/widgets/ActiveField.php                        |  544 +++++++
 yii/widgets/ActiveForm.php                         |  229 +++
 yii/widgets/Block.php                              |   49 +
 yii/widgets/Breadcrumbs.php                        |  139 ++
 yii/widgets/Captcha.php                            |  102 ++
 yii/widgets/ContentDecorator.php                   |   52 +
 yii/widgets/FragmentCache.php                      |  174 +++
 yii/widgets/Menu.php                               |  287 ++++
 yii/yiic                                           |   13 +
 yii/yiic.bat                                       |   22 +
 yii/yiic.php                                       |   22 +
 400 files changed, 36083 insertions(+), 36083 deletions(-)
 delete mode 100644 framework/.htaccess
 delete mode 100644 framework/Yii.php
 delete mode 100644 framework/YiiBase.php
 delete mode 100644 framework/assets.php
 delete mode 100644 framework/assets/jquery.min.js
 delete mode 100644 framework/assets/yii.activeForm.js
 delete mode 100644 framework/assets/yii.captcha.js
 delete mode 100644 framework/assets/yii.debug.js
 delete mode 100644 framework/assets/yii.js
 delete mode 100644 framework/assets/yii.validation.js
 delete mode 100644 framework/base/Action.php
 delete mode 100644 framework/base/ActionEvent.php
 delete mode 100644 framework/base/ActionFilter.php
 delete mode 100644 framework/base/Application.php
 delete mode 100644 framework/base/Behavior.php
 delete mode 100644 framework/base/Component.php
 delete mode 100644 framework/base/Controller.php
 delete mode 100644 framework/base/Dictionary.php
 delete mode 100644 framework/base/DictionaryIterator.php
 delete mode 100644 framework/base/ErrorException.php
 delete mode 100644 framework/base/ErrorHandler.php
 delete mode 100644 framework/base/Event.php
 delete mode 100644 framework/base/Exception.php
 delete mode 100644 framework/base/HttpException.php
 delete mode 100644 framework/base/InlineAction.php
 delete mode 100644 framework/base/InvalidCallException.php
 delete mode 100644 framework/base/InvalidConfigException.php
 delete mode 100644 framework/base/InvalidParamException.php
 delete mode 100644 framework/base/InvalidRequestException.php
 delete mode 100644 framework/base/InvalidRouteException.php
 delete mode 100644 framework/base/Model.php
 delete mode 100644 framework/base/ModelEvent.php
 delete mode 100644 framework/base/Module.php
 delete mode 100644 framework/base/NotSupportedException.php
 delete mode 100644 framework/base/Object.php
 delete mode 100644 framework/base/Request.php
 delete mode 100644 framework/base/Response.php
 delete mode 100644 framework/base/Theme.php
 delete mode 100644 framework/base/UnknownClassException.php
 delete mode 100644 framework/base/UnknownMethodException.php
 delete mode 100644 framework/base/UnknownPropertyException.php
 delete mode 100644 framework/base/UserException.php
 delete mode 100644 framework/base/Vector.php
 delete mode 100644 framework/base/VectorIterator.php
 delete mode 100644 framework/base/View.php
 delete mode 100644 framework/base/ViewEvent.php
 delete mode 100644 framework/base/ViewRenderer.php
 delete mode 100644 framework/base/Widget.php
 delete mode 100644 framework/caching/ApcCache.php
 delete mode 100644 framework/caching/Cache.php
 delete mode 100644 framework/caching/ChainedDependency.php
 delete mode 100644 framework/caching/DbCache.php
 delete mode 100644 framework/caching/DbDependency.php
 delete mode 100644 framework/caching/Dependency.php
 delete mode 100644 framework/caching/DummyCache.php
 delete mode 100644 framework/caching/ExpressionDependency.php
 delete mode 100644 framework/caching/FileCache.php
 delete mode 100644 framework/caching/FileDependency.php
 delete mode 100644 framework/caching/MemCache.php
 delete mode 100644 framework/caching/MemCacheServer.php
 delete mode 100644 framework/caching/WinCache.php
 delete mode 100644 framework/caching/XCache.php
 delete mode 100644 framework/caching/ZendDataCache.php
 delete mode 100644 framework/console/Application.php
 delete mode 100644 framework/console/Controller.php
 delete mode 100644 framework/console/Exception.php
 delete mode 100644 framework/console/Request.php
 delete mode 100644 framework/console/controllers/AppController.php
 delete mode 100644 framework/console/controllers/AssetController.php
 delete mode 100644 framework/console/controllers/CacheController.php
 delete mode 100644 framework/console/controllers/HelpController.php
 delete mode 100644 framework/console/controllers/MessageController.php
 delete mode 100644 framework/console/controllers/MigrateController.php
 delete mode 100644 framework/console/runtime/.gitignore
 delete mode 100644 framework/db/ActiveQuery.php
 delete mode 100644 framework/db/ActiveRecord.php
 delete mode 100644 framework/db/ActiveRelation.php
 delete mode 100644 framework/db/ColumnSchema.php
 delete mode 100644 framework/db/Command.php
 delete mode 100644 framework/db/Connection.php
 delete mode 100644 framework/db/DataReader.php
 delete mode 100644 framework/db/Exception.php
 delete mode 100644 framework/db/Expression.php
 delete mode 100644 framework/db/Migration.php
 delete mode 100644 framework/db/Query.php
 delete mode 100644 framework/db/QueryBuilder.php
 delete mode 100644 framework/db/Schema.php
 delete mode 100644 framework/db/StaleObjectException.php
 delete mode 100644 framework/db/TableSchema.php
 delete mode 100644 framework/db/Transaction.php
 delete mode 100644 framework/db/mysql/QueryBuilder.php
 delete mode 100644 framework/db/mysql/Schema.php
 delete mode 100644 framework/db/sqlite/QueryBuilder.php
 delete mode 100644 framework/db/sqlite/Schema.php
 delete mode 100644 framework/debug/Module.php
 delete mode 100644 framework/debug/Toolbar.php
 delete mode 100644 framework/debug/controllers/DefaultController.php
 delete mode 100644 framework/helpers/ArrayHelper.php
 delete mode 100644 framework/helpers/Console.php
 delete mode 100644 framework/helpers/FileHelper.php
 delete mode 100644 framework/helpers/Html.php
 delete mode 100644 framework/helpers/Json.php
 delete mode 100644 framework/helpers/Markdown.php
 delete mode 100644 framework/helpers/Purifier.php
 delete mode 100644 framework/helpers/SecurityHelper.php
 delete mode 100644 framework/helpers/StringHelper.php
 delete mode 100644 framework/helpers/VarDumper.php
 delete mode 100644 framework/helpers/base/ArrayHelper.php
 delete mode 100644 framework/helpers/base/Console.php
 delete mode 100644 framework/helpers/base/FileHelper.php
 delete mode 100644 framework/helpers/base/Html.php
 delete mode 100644 framework/helpers/base/Json.php
 delete mode 100644 framework/helpers/base/Markdown.php
 delete mode 100644 framework/helpers/base/Purifier.php
 delete mode 100644 framework/helpers/base/SecurityHelper.php
 delete mode 100644 framework/helpers/base/StringHelper.php
 delete mode 100644 framework/helpers/base/VarDumper.php
 delete mode 100644 framework/helpers/base/mimeTypes.php
 delete mode 100644 framework/i18n/I18N.php
 delete mode 100644 framework/i18n/MessageSource.php
 delete mode 100644 framework/i18n/MissingTranslationEvent.php
 delete mode 100644 framework/i18n/PhpMessageSource.php
 delete mode 100644 framework/i18n/data/plurals.php
 delete mode 100644 framework/i18n/data/plurals.xml
 delete mode 100644 framework/logging/DbTarget.php
 delete mode 100644 framework/logging/EmailTarget.php
 delete mode 100644 framework/logging/FileTarget.php
 delete mode 100644 framework/logging/Logger.php
 delete mode 100644 framework/logging/ProfileTarget.php
 delete mode 100644 framework/logging/Router.php
 delete mode 100644 framework/logging/Target.php
 delete mode 100644 framework/logging/WebTarget.php
 delete mode 100644 framework/renderers/SmartyViewRenderer.php
 delete mode 100644 framework/renderers/TwigViewRenderer.php
 delete mode 100644 framework/test/TestCase.php
 delete mode 100644 framework/test/WebTestCase.php
 delete mode 100644 framework/validators/BooleanValidator.php
 delete mode 100644 framework/validators/CaptchaValidator.php
 delete mode 100644 framework/validators/CompareValidator.php
 delete mode 100644 framework/validators/DateValidator.php
 delete mode 100644 framework/validators/DefaultValueValidator.php
 delete mode 100644 framework/validators/EmailValidator.php
 delete mode 100644 framework/validators/ExistValidator.php
 delete mode 100644 framework/validators/FileValidator.php
 delete mode 100644 framework/validators/FilterValidator.php
 delete mode 100644 framework/validators/InlineValidator.php
 delete mode 100644 framework/validators/NumberValidator.php
 delete mode 100644 framework/validators/RangeValidator.php
 delete mode 100644 framework/validators/RegularExpressionValidator.php
 delete mode 100644 framework/validators/RequiredValidator.php
 delete mode 100644 framework/validators/StringValidator.php
 delete mode 100644 framework/validators/UniqueValidator.php
 delete mode 100644 framework/validators/UrlValidator.php
 delete mode 100644 framework/validators/Validator.php
 delete mode 100644 framework/views/error.php
 delete mode 100644 framework/views/exception.php
 delete mode 100644 framework/views/migration.php
 delete mode 100644 framework/web/AccessControl.php
 delete mode 100644 framework/web/AccessRule.php
 delete mode 100644 framework/web/Application.php
 delete mode 100644 framework/web/AssetBundle.php
 delete mode 100644 framework/web/AssetConverter.php
 delete mode 100644 framework/web/AssetManager.php
 delete mode 100644 framework/web/CacheSession.php
 delete mode 100644 framework/web/CaptchaAction.php
 delete mode 100644 framework/web/Controller.php
 delete mode 100644 framework/web/Cookie.php
 delete mode 100644 framework/web/CookieCollection.php
 delete mode 100644 framework/web/DbSession.php
 delete mode 100644 framework/web/HttpCache.php
 delete mode 100644 framework/web/IAssetConverter.php
 delete mode 100644 framework/web/Identity.php
 delete mode 100644 framework/web/JsExpression.php
 delete mode 100644 framework/web/PageCache.php
 delete mode 100644 framework/web/Pagination.php
 delete mode 100644 framework/web/Request.php
 delete mode 100644 framework/web/Response.php
 delete mode 100644 framework/web/Session.php
 delete mode 100644 framework/web/SessionIterator.php
 delete mode 100644 framework/web/Sort.php
 delete mode 100644 framework/web/SpicyRice.md
 delete mode 100644 framework/web/SpicyRice.ttf
 delete mode 100644 framework/web/UploadedFile.php
 delete mode 100644 framework/web/UrlManager.php
 delete mode 100644 framework/web/UrlRule.php
 delete mode 100644 framework/web/User.php
 delete mode 100644 framework/web/UserEvent.php
 delete mode 100644 framework/widgets/ActiveField.php
 delete mode 100644 framework/widgets/ActiveForm.php
 delete mode 100644 framework/widgets/Block.php
 delete mode 100644 framework/widgets/Breadcrumbs.php
 delete mode 100644 framework/widgets/Captcha.php
 delete mode 100644 framework/widgets/ContentDecorator.php
 delete mode 100644 framework/widgets/FragmentCache.php
 delete mode 100644 framework/widgets/Menu.php
 delete mode 100755 framework/yiic
 delete mode 100644 framework/yiic.bat
 delete mode 100644 framework/yiic.php
 create mode 100644 yii/.htaccess
 create mode 100644 yii/Yii.php
 create mode 100644 yii/YiiBase.php
 create mode 100644 yii/assets.php
 create mode 100644 yii/assets/jquery.min.js
 create mode 100644 yii/assets/yii.activeForm.js
 create mode 100644 yii/assets/yii.captcha.js
 create mode 100644 yii/assets/yii.debug.js
 create mode 100644 yii/assets/yii.js
 create mode 100644 yii/assets/yii.validation.js
 create mode 100644 yii/base/Action.php
 create mode 100644 yii/base/ActionEvent.php
 create mode 100644 yii/base/ActionFilter.php
 create mode 100644 yii/base/Application.php
 create mode 100644 yii/base/Behavior.php
 create mode 100644 yii/base/Component.php
 create mode 100644 yii/base/Controller.php
 create mode 100644 yii/base/Dictionary.php
 create mode 100644 yii/base/DictionaryIterator.php
 create mode 100644 yii/base/ErrorException.php
 create mode 100644 yii/base/ErrorHandler.php
 create mode 100644 yii/base/Event.php
 create mode 100644 yii/base/Exception.php
 create mode 100644 yii/base/HttpException.php
 create mode 100644 yii/base/InlineAction.php
 create mode 100644 yii/base/InvalidCallException.php
 create mode 100644 yii/base/InvalidConfigException.php
 create mode 100644 yii/base/InvalidParamException.php
 create mode 100644 yii/base/InvalidRequestException.php
 create mode 100644 yii/base/InvalidRouteException.php
 create mode 100644 yii/base/Model.php
 create mode 100644 yii/base/ModelEvent.php
 create mode 100644 yii/base/Module.php
 create mode 100644 yii/base/NotSupportedException.php
 create mode 100644 yii/base/Object.php
 create mode 100644 yii/base/Request.php
 create mode 100644 yii/base/Response.php
 create mode 100644 yii/base/Theme.php
 create mode 100644 yii/base/UnknownClassException.php
 create mode 100644 yii/base/UnknownMethodException.php
 create mode 100644 yii/base/UnknownPropertyException.php
 create mode 100644 yii/base/UserException.php
 create mode 100644 yii/base/Vector.php
 create mode 100644 yii/base/VectorIterator.php
 create mode 100644 yii/base/View.php
 create mode 100644 yii/base/ViewEvent.php
 create mode 100644 yii/base/ViewRenderer.php
 create mode 100644 yii/base/Widget.php
 create mode 100644 yii/caching/ApcCache.php
 create mode 100644 yii/caching/Cache.php
 create mode 100644 yii/caching/ChainedDependency.php
 create mode 100644 yii/caching/DbCache.php
 create mode 100644 yii/caching/DbDependency.php
 create mode 100644 yii/caching/Dependency.php
 create mode 100644 yii/caching/DummyCache.php
 create mode 100644 yii/caching/ExpressionDependency.php
 create mode 100644 yii/caching/FileCache.php
 create mode 100644 yii/caching/FileDependency.php
 create mode 100644 yii/caching/MemCache.php
 create mode 100644 yii/caching/MemCacheServer.php
 create mode 100644 yii/caching/WinCache.php
 create mode 100644 yii/caching/XCache.php
 create mode 100644 yii/caching/ZendDataCache.php
 create mode 100644 yii/console/Application.php
 create mode 100644 yii/console/Controller.php
 create mode 100644 yii/console/Exception.php
 create mode 100644 yii/console/Request.php
 create mode 100644 yii/console/controllers/AppController.php
 create mode 100644 yii/console/controllers/AssetController.php
 create mode 100644 yii/console/controllers/CacheController.php
 create mode 100644 yii/console/controllers/HelpController.php
 create mode 100644 yii/console/controllers/MessageController.php
 create mode 100644 yii/console/controllers/MigrateController.php
 create mode 100644 yii/console/runtime/.gitignore
 create mode 100644 yii/db/ActiveQuery.php
 create mode 100644 yii/db/ActiveRecord.php
 create mode 100644 yii/db/ActiveRelation.php
 create mode 100644 yii/db/ColumnSchema.php
 create mode 100644 yii/db/Command.php
 create mode 100644 yii/db/Connection.php
 create mode 100644 yii/db/DataReader.php
 create mode 100644 yii/db/Exception.php
 create mode 100644 yii/db/Expression.php
 create mode 100644 yii/db/Migration.php
 create mode 100644 yii/db/Query.php
 create mode 100644 yii/db/QueryBuilder.php
 create mode 100644 yii/db/Schema.php
 create mode 100644 yii/db/StaleObjectException.php
 create mode 100644 yii/db/TableSchema.php
 create mode 100644 yii/db/Transaction.php
 create mode 100644 yii/db/mysql/QueryBuilder.php
 create mode 100644 yii/db/mysql/Schema.php
 create mode 100644 yii/db/sqlite/QueryBuilder.php
 create mode 100644 yii/db/sqlite/Schema.php
 create mode 100644 yii/debug/Module.php
 create mode 100644 yii/debug/Toolbar.php
 create mode 100644 yii/debug/controllers/DefaultController.php
 create mode 100644 yii/helpers/ArrayHelper.php
 create mode 100644 yii/helpers/Console.php
 create mode 100644 yii/helpers/FileHelper.php
 create mode 100644 yii/helpers/Html.php
 create mode 100644 yii/helpers/Json.php
 create mode 100644 yii/helpers/Markdown.php
 create mode 100644 yii/helpers/Purifier.php
 create mode 100644 yii/helpers/SecurityHelper.php
 create mode 100644 yii/helpers/StringHelper.php
 create mode 100644 yii/helpers/VarDumper.php
 create mode 100644 yii/helpers/base/ArrayHelper.php
 create mode 100644 yii/helpers/base/Console.php
 create mode 100644 yii/helpers/base/FileHelper.php
 create mode 100644 yii/helpers/base/Html.php
 create mode 100644 yii/helpers/base/Json.php
 create mode 100644 yii/helpers/base/Markdown.php
 create mode 100644 yii/helpers/base/Purifier.php
 create mode 100644 yii/helpers/base/SecurityHelper.php
 create mode 100644 yii/helpers/base/StringHelper.php
 create mode 100644 yii/helpers/base/VarDumper.php
 create mode 100644 yii/helpers/base/mimeTypes.php
 create mode 100644 yii/i18n/I18N.php
 create mode 100644 yii/i18n/MessageSource.php
 create mode 100644 yii/i18n/MissingTranslationEvent.php
 create mode 100644 yii/i18n/PhpMessageSource.php
 create mode 100644 yii/i18n/data/plurals.php
 create mode 100644 yii/i18n/data/plurals.xml
 create mode 100644 yii/logging/DbTarget.php
 create mode 100644 yii/logging/EmailTarget.php
 create mode 100644 yii/logging/FileTarget.php
 create mode 100644 yii/logging/Logger.php
 create mode 100644 yii/logging/ProfileTarget.php
 create mode 100644 yii/logging/Router.php
 create mode 100644 yii/logging/Target.php
 create mode 100644 yii/logging/WebTarget.php
 create mode 100644 yii/renderers/SmartyViewRenderer.php
 create mode 100644 yii/renderers/TwigViewRenderer.php
 create mode 100644 yii/test/TestCase.php
 create mode 100644 yii/test/WebTestCase.php
 create mode 100644 yii/validators/BooleanValidator.php
 create mode 100644 yii/validators/CaptchaValidator.php
 create mode 100644 yii/validators/CompareValidator.php
 create mode 100644 yii/validators/DateValidator.php
 create mode 100644 yii/validators/DefaultValueValidator.php
 create mode 100644 yii/validators/EmailValidator.php
 create mode 100644 yii/validators/ExistValidator.php
 create mode 100644 yii/validators/FileValidator.php
 create mode 100644 yii/validators/FilterValidator.php
 create mode 100644 yii/validators/InlineValidator.php
 create mode 100644 yii/validators/NumberValidator.php
 create mode 100644 yii/validators/RangeValidator.php
 create mode 100644 yii/validators/RegularExpressionValidator.php
 create mode 100644 yii/validators/RequiredValidator.php
 create mode 100644 yii/validators/StringValidator.php
 create mode 100644 yii/validators/UniqueValidator.php
 create mode 100644 yii/validators/UrlValidator.php
 create mode 100644 yii/validators/Validator.php
 create mode 100644 yii/views/error.php
 create mode 100644 yii/views/exception.php
 create mode 100644 yii/views/migration.php
 create mode 100644 yii/web/AccessControl.php
 create mode 100644 yii/web/AccessRule.php
 create mode 100644 yii/web/Application.php
 create mode 100644 yii/web/AssetBundle.php
 create mode 100644 yii/web/AssetConverter.php
 create mode 100644 yii/web/AssetManager.php
 create mode 100644 yii/web/CacheSession.php
 create mode 100644 yii/web/CaptchaAction.php
 create mode 100644 yii/web/Controller.php
 create mode 100644 yii/web/Cookie.php
 create mode 100644 yii/web/CookieCollection.php
 create mode 100644 yii/web/DbSession.php
 create mode 100644 yii/web/HttpCache.php
 create mode 100644 yii/web/IAssetConverter.php
 create mode 100644 yii/web/Identity.php
 create mode 100644 yii/web/JsExpression.php
 create mode 100644 yii/web/PageCache.php
 create mode 100644 yii/web/Pagination.php
 create mode 100644 yii/web/Request.php
 create mode 100644 yii/web/Response.php
 create mode 100644 yii/web/Session.php
 create mode 100644 yii/web/SessionIterator.php
 create mode 100644 yii/web/Sort.php
 create mode 100644 yii/web/SpicyRice.md
 create mode 100644 yii/web/SpicyRice.ttf
 create mode 100644 yii/web/UploadedFile.php
 create mode 100644 yii/web/UrlManager.php
 create mode 100644 yii/web/UrlRule.php
 create mode 100644 yii/web/User.php
 create mode 100644 yii/web/UserEvent.php
 create mode 100644 yii/widgets/ActiveField.php
 create mode 100644 yii/widgets/ActiveForm.php
 create mode 100644 yii/widgets/Block.php
 create mode 100644 yii/widgets/Breadcrumbs.php
 create mode 100644 yii/widgets/Captcha.php
 create mode 100644 yii/widgets/ContentDecorator.php
 create mode 100644 yii/widgets/FragmentCache.php
 create mode 100644 yii/widgets/Menu.php
 create mode 100755 yii/yiic
 create mode 100644 yii/yiic.bat
 create mode 100644 yii/yiic.php

diff --git a/.gitignore b/.gitignore
index d8b54c0..832a890 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,4 @@ nbproject
 Thumbs.db
 
 # composer vendor dir
-/framework/vendor
\ No newline at end of file
+/yii/vendor
\ No newline at end of file
diff --git a/apps/bootstrap/index.php b/apps/bootstrap/index.php
index a9bf4b6..c046b69 100644
--- a/apps/bootstrap/index.php
+++ b/apps/bootstrap/index.php
@@ -2,7 +2,7 @@
 // comment out the following line to disable debug mode
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 
-$frameworkPath = __DIR__ . '/../../framework';
+$frameworkPath = __DIR__ . '/../../yii';
 
 require($frameworkPath . '/Yii.php');
 // Register Composer autoloader
diff --git a/framework/.htaccess b/framework/.htaccess
deleted file mode 100644
index e019832..0000000
--- a/framework/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-deny from all
diff --git a/framework/Yii.php b/framework/Yii.php
deleted file mode 100644
index 109e2fd..0000000
--- a/framework/Yii.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Yii bootstrap file.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-require(__DIR__ . '/YiiBase.php');
-
-/**
- * Yii is a helper class serving common framework functionalities.
- *
- * It extends from [[YiiBase]] which provides the actual implementation.
- * By writing your own Yii class, you can customize some functionalities of [[YiiBase]].
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Yii extends \yii\YiiBase
-{
-}
-
-spl_autoload_register(array('Yii', 'autoload'));
diff --git a/framework/YiiBase.php b/framework/YiiBase.php
deleted file mode 100644
index 1a3f50c..0000000
--- a/framework/YiiBase.php
+++ /dev/null
@@ -1,615 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-namespace yii;
-
-use yii\base\Exception;
-use yii\base\InvalidConfigException;
-use yii\base\InvalidParamException;
-use yii\base\UnknownClassException;
-use yii\logging\Logger;
-
-/**
- * Gets the application start timestamp.
- */
-defined('YII_BEGIN_TIME') or define('YII_BEGIN_TIME', microtime(true));
-/**
- * This constant defines whether the application should be in debug mode or not. Defaults to false.
- */
-defined('YII_DEBUG') or define('YII_DEBUG', false);
-/**
- * This constant defines how much call stack information (file name and line number) should be logged by Yii::trace().
- * Defaults to 0, meaning no backtrace information. If it is greater than 0,
- * at most that number of call stacks will be logged. Note, only user application call stacks are considered.
- */
-defined('YII_TRACE_LEVEL') or define('YII_TRACE_LEVEL', 0);
-/**
- * This constant defines the framework installation directory.
- */
-defined('YII_PATH') or define('YII_PATH', __DIR__);
-/**
- * This constant defines whether error handling should be enabled. Defaults to true.
- */
-defined('YII_ENABLE_ERROR_HANDLER') or define('YII_ENABLE_ERROR_HANDLER', true);
-
-
-/**
- * YiiBase is the core helper class for the Yii framework.
- *
- * Do not use YiiBase directly. Instead, use its child class [[Yii]] where
- * you can customize methods of YiiBase.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class YiiBase
-{
-	/**
-	 * @var array class map used by the Yii autoloading mechanism.
-	 * The array keys are the class names (without leading backslashes), and the array values
-	 * are the corresponding class file paths (or path aliases). This property mainly affects
-	 * how [[autoload()]] works.
-	 * @see import
-	 * @see autoload
-	 */
-	public static $classMap = array();
-	/**
-	 * @var boolean whether to search PHP include_path when autoloading unknown classes.
-	 * You may want to turn this off if you are also using autoloaders from other libraries.
-	 */
-	public static $enableIncludePath = true;
-	/**
-	 * @var \yii\console\Application|\yii\web\Application the application instance
-	 */
-	public static $app;
-	/**
-	 * @var array registered path aliases
-	 * @see getAlias
-	 * @see setAlias
-	 */
-	public static $aliases = array(
-		'@yii' => __DIR__,
-	);
-	/**
-	 * @var array initial property values that will be applied to objects newly created via [[createObject]].
-	 * The array keys are class names without leading backslashes "\", and the array values are the corresponding
-	 * name-value pairs for initializing the created class instances. For example,
-	 *
-	 * ~~~
-	 * array(
-	 *     'Bar' => array(
-	 *         'prop1' => 'value1',
-	 *         'prop2' => 'value2',
-	 *     ),
-	 *     'mycompany\foo\Car' => array(
-	 *         'prop1' => 'value1',
-	 *         'prop2' => 'value2',
-	 *     ),
-	 * )
-	 * ~~~
-	 *
-	 * @see createObject
-	 */
-	public static $objectConfig = array();
-
-	private static $_imported = array(); // alias => class name or directory
-	private static $_logger;
-
-	/**
-	 * @return string the version of Yii framework
-	 */
-	public static function getVersion()
-	{
-		return '2.0-dev';
-	}
-
-	/**
-	 * Imports a class by its alias.
-	 *
-	 * This method is provided to support autoloading of non-namespaced classes.
-	 * Such a class can be specified in terms of an alias. For example, the alias `@old/code/Sample`
-	 * may represent the `Sample` class under the directory `@old/code` (a path alias).
-	 *
-	 * By importing a class, the class is put in an internal storage such that when
-	 * the class is used for the first time, the class autoloader will be able to
-	 * find the corresponding class file and include it. For this reason, this method
-	 * is much lighter than `include()`.
-	 *
-	 * You may import the same class multiple times. Only the first importing will count.
-	 *
-	 * @param string $alias the class to be imported. This may be either a class alias or a fully-qualified class name.
-	 * If the latter, it will be returned back without change.
-	 * @return string the actual class name that `$alias` refers to
-	 * @throws Exception if the alias is invalid
-	 */
-	public static function import($alias)
-	{
-		if (strncmp($alias, '@', 1)) {
-			return $alias;
-		} else {
-			$alias = static::getAlias($alias);
-			if (!isset(self::$_imported[$alias])) {
-				$className = basename($alias);
-				self::$_imported[$alias] = $className;
-				self::$classMap[$className] = $alias . '.php';
-			}
-			return self::$_imported[$alias];
-		}
-	}
-
-	/**
-	 * Imports a set of namespaces.
-	 *
-	 * By importing a namespace, the method will create an alias for the directory corresponding
-	 * to the namespace. For example, if "foo\bar" is a namespace associated with the directory
-	 * "path/to/foo/bar", then an alias "@foo/bar" will be created for this directory.
-	 *
-	 * This method is typically invoked in the bootstrap file to import the namespaces of
-	 * the installed extensions. By default, Composer, when installing new extensions, will
-	 * generate such a mapping file which can be loaded and passed to this method.
-	 *
-	 * @param array $namespaces the namespaces to be imported. The keys are the namespaces,
-	 * and the values are the corresponding directories.
-	 */
-	public static function importNamespaces($namespaces)
-	{
-		foreach ($namespaces as $name => $path) {
-			if ($name !== '') {
-				$name = trim(strtr($name, array('\\' => '/', '_' => '/')), '/');
-				static::setAlias('@' . $name, rtrim($path, '/\\') . '/' . $name);
-			}
-		}
-	}
-
-	/**
-	 * Translates a path alias into an actual path.
-	 *
-	 * The translation is done according to the following procedure:
-	 *
-	 * 1. If the given alias does not start with '@', it is returned back without change;
-	 * 2. Otherwise, look for the longest registered alias that matches the beginning part
-	 *    of the given alias. If it exists, replace the matching part of the given alias with
-	 *    the corresponding registered path.
-	 * 3. Throw an exception or return false, depending on the `$throwException` parameter.
-	 *
-	 * For example, by default '@yii' is registered as the alias to the Yii framework directory,
-	 * say '/path/to/yii'. The alias '@yii/web' would then be translated into '/path/to/yii/web'.
-	 *
-	 * If you have registered two aliases '@foo' and '@foo/bar'. Then translating '@foo/bar/config'
-	 * would replace the part '@foo/bar' (instead of '@foo') with the corresponding registered path.
-	 * This is because the longest alias takes precedence.
-	 *
-	 * However, if the alias to be translated is '@foo/barbar/config', then '@foo' will be replaced
-	 * instead of '@foo/bar', because '/' serves as the boundary character.
-	 *
-	 * Note, this method does not check if the returned path exists or not.
-	 *
-	 * @param string $alias the alias to be translated.
-	 * @param boolean $throwException whether to throw an exception if the given alias is invalid.
-	 * If this is false and an invalid alias is given, false will be returned by this method.
-	 * @return string|boolean the path corresponding to the alias, false if the root alias is not previously registered.
-	 * @throws InvalidParamException if the alias is invalid while $throwException is true.
-	 * @see setAlias
-	 */
-	public static function getAlias($alias, $throwException = true)
-	{
-		if (strncmp($alias, '@', 1)) {
-			// not an alias
-			return $alias;
-		}
-
-		$pos = strpos($alias, '/');
-		$root = $pos === false ? $alias : substr($alias, 0, $pos);
-
-		if (isset(self::$aliases[$root])) {
-			if (is_string(self::$aliases[$root])) {
-				return $pos === false ? self::$aliases[$root] : self::$aliases[$root] . substr($alias, $pos);
-			} else {
-				foreach (self::$aliases[$root] as $name => $path) {
-					if (strpos($alias . '/', $name . '/') === 0) {
-						return $path . substr($alias, strlen($name));
-					}
-				}
-			}
-		}
-
-		if ($throwException) {
-			throw new InvalidParamException("Invalid path alias: $alias");
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Returns the root alias part of a given alias.
-	 * A root alias is an alias that has been registered via [[setAlias()]] previously.
-	 * If a given alias matches multiple root aliases, the longest one will be returned.
-	 * @param string $alias the alias
-	 * @return string|boolean the root alias, or false if no root alias is found
-	 */
-	public static function getRootAlias($alias)
-	{
-		$pos = strpos($alias, '/');
-		$root = $pos === false ? $alias : substr($alias, 0, $pos);
-
-		if (isset(self::$aliases[$root])) {
-			if (is_string(self::$aliases[$root])) {
-				return $root;
-			} else {
-				foreach (self::$aliases[$root] as $name => $path) {
-					if (strpos($alias . '/', $name . '/') === 0) {
-						return $name;
-					}
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Registers a path alias.
-	 *
-	 * A path alias is a short name representing a long path (a file path, a URL, etc.)
-	 * For example, we use '@yii' as the alias of the path to the Yii framework directory.
-	 *
-	 * A path alias must start with the character '@' so that it can be easily differentiated
-	 * from non-alias paths.
-	 *
-	 * Note that this method does not check if the given path exists or not. All it does is
-	 * to associate the alias with the path.
-	 *
-	 * Any trailing '/' and '\' characters in the given path will be trimmed.
-	 *
-	 * @param string $alias the alias name (e.g. "@yii"). It must start with a '@' character.
-	 * It may contain the forward slash '/' which serves as boundary character when performing
-	 * alias translation by [[getAlias()]].
-	 * @param string $path the path corresponding to the alias. Trailing '/' and '\' characters
-	 * will be trimmed. This can be
-	 *
-	 * - a directory or a file path (e.g. `/tmp`, `/tmp/main.txt`)
-	 * - a URL (e.g. `http://www.yiiframework.com`)
-	 * - a path alias (e.g. `@yii/base`). In this case, the path alias will be converted into the
-	 *   actual path first by calling [[getAlias()]].
-	 *
-	 * @throws InvalidParamException if $path is an invalid alias.
-	 * @see getAlias
-	 */
-	public static function setAlias($alias, $path)
-	{
-		if (strncmp($alias, '@', 1)) {
-			$alias = '@' . $alias;
-		}
-		$pos = strpos($alias, '/');
-		$root = $pos === false ? $alias : substr($alias, 0, $pos);
-		if ($path !== null) {
-			$path = strncmp($path, '@', 1) ? rtrim($path, '\\/') : static::getAlias($path);
-			if (!isset(self::$aliases[$root])) {
-				self::$aliases[$root] = $path;
-			} elseif (is_string(self::$aliases[$root])) {
-				if ($pos === false) {
-					self::$aliases[$root] = $path;
-				} else {
-					self::$aliases[$root] = array(
-						$alias => $path,
-						$root => self::$aliases[$root],
-					);
-				}
-			} else {
-				self::$aliases[$root][$alias] = $path;
-				krsort(self::$aliases[$root]);
-			}
-		} elseif (isset(self::$aliases[$root])) {
-			if (is_array(self::$aliases[$root])) {
-				unset(self::$aliases[$root][$alias]);
-			} elseif ($pos === false) {
-				unset(self::$aliases[$root]);
-			}
-		}
-	}
-
-	/**
-	 * Class autoload loader.
-	 * This method is invoked automatically when PHP sees an unknown class.
-	 * The method will attempt to include the class file according to the following procedure:
-	 *
-	 * 1. Search in [[classMap]];
-	 * 2. If the class is namespaced (e.g. `yii\base\Component`), it will attempt
-	 *    to include the file associated with the corresponding path alias
-	 *    (e.g. `@yii/base/Component.php`);
-	 * 3. If the class is named in PEAR style (e.g. `PHPUnit_Framework_TestCase`),
-	 *    it will attempt to include the file associated with the corresponding path alias
-	 *    (e.g. `@PHPUnit/Framework/TestCase.php`);
-	 * 4. Search PHP include_path for the actual class file if [[enableIncludePath]] is true;
-	 * 5. Return false so that other autoloaders have chance to include the class file.
-	 *
-	 * @param string $className class name
-	 * @return boolean whether the class has been loaded successfully
-	 * @throws InvalidConfigException if the class file does not exist
-	 * @throws UnknownClassException if the class does not exist in the class file
-	 */
-	public static function autoload($className)
-	{
-		$className = ltrim($className, '\\');
-
-		if (isset(self::$classMap[$className])) {
-			$classFile = static::getAlias(self::$classMap[$className]);
-			if (!is_file($classFile)) {
-				throw new InvalidConfigException("Class file does not exist: $classFile");
-			}
-		} else {
-			// follow PSR-0 to determine the class file
-			if (($pos = strrpos($className, '\\')) !== false) {
-				// namespaced class, e.g. yii\base\Component
-				$path = str_replace('\\', '/', substr($className, 0, $pos + 1))
-					. str_replace('_', '/', substr($className, $pos + 1)) . '.php';
-			} else {
-				$path = str_replace('_', '/', $className) . '.php';
-			}
-
-			// try via path alias first
-			if (strpos($path, '/') !== false) {
-				$fullPath = static::getAlias('@' . $path, false);
-				if ($fullPath !== false && is_file($fullPath)) {
-					$classFile = $fullPath;
-				}
-			}
-
-			// search include_path
-			if (!isset($classFile) && self::$enableIncludePath && ($fullPath = stream_resolve_include_path($path)) !== false) {
-				$classFile = $fullPath;
-			}
-
-			if (!isset($classFile)) {
-				// return false to let other autoloaders to try loading the class
-				return false;
-			}
-		}
-
-		include($classFile);
-
-		if (class_exists($className, false) || interface_exists($className, false) ||
-			function_exists('trait_exists') && trait_exists($className, false)) {
-			return true;
-		} else {
-			throw new UnknownClassException("Unable to find '$className' in file: $classFile");
-		}
-	}
-
-	/**
-	 * Creates a new object using the given configuration.
-	 *
-	 * The configuration can be either a string or an array.
-	 * If a string, it is treated as the *object class*; if an array,
-	 * it must contain a `class` element specifying the *object class*, and
-	 * the rest of the name-value pairs in the array will be used to initialize
-	 * the corresponding object properties.
-	 *
-	 * The object type can be either a class name or the [[getAlias()|alias]] of
-	 * the class. For example,
-	 *
-	 * - `app\components\GoogleMap`: fully-qualified namespaced class.
-	 * - `@app/components/GoogleMap`: an alias, used for non-namespaced class.
-	 *
-	 * Below are some usage examples:
-	 *
-	 * ~~~
-	 * $object = \Yii::createObject('@app/components/GoogleMap');
-	 * $object = \Yii::createObject(array(
-	 *     'class' => '\app\components\GoogleMap',
-	 *     'apiKey' => 'xyz',
-	 * ));
-	 * ~~~
-	 *
-	 * This method can be used to create any object as long as the object's constructor is
-	 * defined like the following:
-	 *
-	 * ~~~
-	 * public function __construct(..., $config = array()) {
-	 * }
-	 * ~~~
-	 *
-	 * The method will pass the given configuration as the last parameter of the constructor,
-	 * and any additional parameters to this method will be passed as the rest of the constructor parameters.
-	 *
-	 * @param string|array $config the configuration. It can be either a string representing the class name
-	 * or an array representing the object configuration.
-	 * @return mixed the created object
-	 * @throws InvalidConfigException if the configuration is invalid.
-	 */
-	public static function createObject($config)
-	{
-		static $reflections = array();
-
-		if (is_string($config)) {
-			$class = $config;
-			$config = array();
-		} elseif (isset($config['class'])) {
-			$class = $config['class'];
-			unset($config['class']);
-		} else {
-			throw new InvalidConfigException('Object configuration must be an array containing a "class" element.');
-		}
-
-		if (!class_exists($class, false)) {
-			$class = static::import($class);
-		}
-
-		$class = ltrim($class, '\\');
-
-		if (isset(self::$objectConfig[$class])) {
-			$config = array_merge(self::$objectConfig[$class], $config);
-		}
-
-		if (($n = func_num_args()) > 1) {
-			/** @var $reflection \ReflectionClass */
-			if (isset($reflections[$class])) {
-				$reflection = $reflections[$class];
-			} else {
-				$reflection = $reflections[$class] = new \ReflectionClass($class);
-			}
-			$args = func_get_args();
-			array_shift($args); // remove $config
-			if (!empty($config)) {
-				$args[] = $config;
-			}
-			return $reflection->newInstanceArgs($args);
-		} else {
-			return empty($config) ? new $class : new $class($config);
-		}
-	}
-
-	/**
-	 * Logs a trace message.
-	 * Trace messages are logged mainly for development purpose to see
-	 * the execution work flow of some code.
-	 * @param string $message the message to be logged.
-	 * @param string $category the category of the message.
-	 */
-	public static function trace($message, $category = 'application')
-	{
-		if (YII_DEBUG) {
-			self::getLogger()->log($message, Logger::LEVEL_TRACE, $category);
-		}
-	}
-
-	/**
-	 * Logs an error message.
-	 * An error message is typically logged when an unrecoverable error occurs
-	 * during the execution of an application.
-	 * @param string $message the message to be logged.
-	 * @param string $category the category of the message.
-	 */
-	public static function error($message, $category = 'application')
-	{
-		self::getLogger()->log($message, Logger::LEVEL_ERROR, $category);
-	}
-
-	/**
-	 * Logs a warning message.
-	 * A warning message is typically logged when an error occurs while the execution
-	 * can still continue.
-	 * @param string $message the message to be logged.
-	 * @param string $category the category of the message.
-	 */
-	public static function warning($message, $category = 'application')
-	{
-		self::getLogger()->log($message, Logger::LEVEL_WARNING, $category);
-	}
-
-	/**
-	 * Logs an informative message.
-	 * An informative message is typically logged by an application to keep record of
-	 * something important (e.g. an administrator logs in).
-	 * @param string $message the message to be logged.
-	 * @param string $category the category of the message.
-	 */
-	public static function info($message, $category = 'application')
-	{
-		self::getLogger()->log($message, Logger::LEVEL_INFO, $category);
-	}
-
-	/**
-	 * Marks the beginning of a code block for profiling.
-	 * This has to be matched with a call to [[endProfile]] with the same category name.
-	 * The begin- and end- calls must also be properly nested. For example,
-	 *
-	 * ~~~
-	 * \Yii::beginProfile('block1');
-	 * // some code to be profiled
-	 *     \Yii::beginProfile('block2');
-	 *     // some other code to be profiled
-	 *     \Yii::endProfile('block2');
-	 * \Yii::endProfile('block1');
-	 * ~~~
-	 * @param string $token token for the code block
-	 * @param string $category the category of this log message
-	 * @see endProfile
-	 */
-	public static function beginProfile($token, $category = 'application')
-	{
-		self::getLogger()->log($token, Logger::LEVEL_PROFILE_BEGIN, $category);
-	}
-
-	/**
-	 * Marks the end of a code block for profiling.
-	 * This has to be matched with a previous call to [[beginProfile]] with the same category name.
-	 * @param string $token token for the code block
-	 * @param string $category the category of this log message
-	 * @see beginProfile
-	 */
-	public static function endProfile($token, $category = 'application')
-	{
-		self::getLogger()->log($token, Logger::LEVEL_PROFILE_END, $category);
-	}
-
-	/**
-	 * Returns the message logger object.
-	 * @return \yii\logging\Logger message logger
-	 */
-	public static function getLogger()
-	{
-		if (self::$_logger !== null) {
-			return self::$_logger;
-		} else {
-			return self::$_logger = new Logger;
-		}
-	}
-
-	/**
-	 * Sets the logger object.
-	 * @param Logger $logger the logger object.
-	 */
-	public static function setLogger($logger)
-	{
-		self::$_logger = $logger;
-	}
-
-	/**
-	 * Returns an HTML hyperlink that can be displayed on your Web page showing Powered by Yii" information.
-	 * @return string an HTML hyperlink that can be displayed on your Web page showing Powered by Yii" information
-	 */
-	public static function powered()
-	{
-		return 'Powered by <a href="http://www.yiiframework.com/" rel="external">Yii Framework</a>.';
-	}
-
-	/**
-	 * Translates a message to the specified language.
-	 *
-	 * The translation will be conducted according to the message category and the target language.
-	 * To specify the category of the message, prefix the message with the category name and separate it
-	 * with "|". For example, "app|hello world". If the category is not specified, the default category "app"
-	 * will be used. The actual message translation is done by a [[\yii\i18n\MessageSource|message source]].
-	 *
-	 * In case when a translated message has different plural forms (separated by "|"), this method
-	 * will also attempt to choose an appropriate one according to a given numeric value which is
-	 * specified as the first parameter (indexed by 0) in `$params`.
-	 *
-	 * For example, if a translated message is "I have an apple.|I have {n} apples.", and the first
-	 * parameter is 2, the message returned will be "I have 2 apples.". Note that the placeholder "{n}"
-	 * will be replaced with the given number.
-	 *
-	 * For more details on how plural rules are applied, please refer to:
-	 * [[http://www.unicode.org/cldr/charts/supplemental/language_plural_rules.html]]
-	 *
-	 * @param string $message the message to be translated.
-	 * @param array $params the parameters that will be used to replace the corresponding placeholders in the message.
-	 * @param string $language the language code (e.g. `en_US`, `en`). If this is null, the current
-	 * [[\yii\base\Application::language|application language]] will be used.
-	 * @return string the translated message.
-	 */
-	public static function t($message, $params = array(), $language = null)
-	{
-		if (self::$app !== null) {
-			return self::$app->getI18N()->translate($message, $params, $language);
-		} else {
-			if (strpos($message, '|') !== false && preg_match('/^([\w\-\\/\.\\\\]+)\|(.*)/', $message, $matches)) {
-				$message = $matches[2];
-			}
-			return is_array($params) ? strtr($message, $params) : $message;
-		}
-	}
-}
diff --git a/framework/assets.php b/framework/assets.php
deleted file mode 100644
index 7ee177d..0000000
--- a/framework/assets.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-return array(
-	'jquery' => array(
-		'sourcePath' => __DIR__ . '/assets',
-		'js' => array(
-			'jquery.min.js',
-		),
-	),
-	'yii' => array(
-		'sourcePath' => __DIR__ . '/assets',
-		'js' => array(
-			'yii.js',
-		),
-		'depends' => array('jquery'),
-	),
-	'yii/validation' => array(
-		'sourcePath' => __DIR__ . '/assets',
-		'js' => array(
-			'yii.validation.js',
-		),
-		'depends' => array('yii'),
-	),
-	'yii/form' => array(
-		'sourcePath' => __DIR__ . '/assets',
-		'js' => array(
-			'yii.activeForm.js',
-		),
-		'depends' => array('yii', 'yii/validation'),
-	),
-	'yii/captcha' => array(
-		'sourcePath' => __DIR__ . '/assets',
-		'js' => array(
-			'yii.captcha.js',
-		),
-		'depends' => array('yii'),
-	),
-	'yii/debug' => array(
-		'sourcePath' => __DIR__ . '/assets',
-		'js' => array(
-			'yii.debug.js',
-		),
-		'depends' => array('yii'),
-	),
-);
diff --git a/framework/assets/jquery.min.js b/framework/assets/jquery.min.js
deleted file mode 100644
index 006e953..0000000
--- a/framework/assets/jquery.min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*! jQuery v1.9.1 | (c) 2005, 2012 jQuery Foundation, Inc. | jquery.org/license
-//@ sourceMappingURL=jquery.min.map
-*/(function(e,t){var n,r,i=typeof t,o=e.document,a=e.location,s=e.jQuery,u=e.$,l={},c=[],p="1.9.1",f=c.concat,d=c.push,h=c.slice,g=c.indexOf,m=l.toString,y=l.hasOwnProperty,v=p.trim,b=function(e,t){return new b.fn.init(e,t,r)},x=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,w=/\S+/g,T=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,k=/^[\],:{}\s]*$/,E=/(?:^|:|,)(?:\s*\[)+/g,S=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,A=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,j=/^-ms-/,D=/-([\da-z])/gi,L=function(e,t){return t.toUpperCase()},H=function(e){(o.addEventListener||"load"===e.type||"complete"===o.readyState)&&(q(),b.ready())},q=function(){o.addEventListener?(o.removeEventListener("DOMContentLoaded",H,!1),e.removeEventListener("load",H,!1)):(o.detachEvent("onreadystatechange",H),e.detachEvent("onload",H))};b.fn=b.prototype={jquery:p,constructor:b,init:function(e,n,r){var i,a;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof b?n[0]:n,b.merge(this,b.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:o,!0)),C.test(i[1])&&b.isPlainObject(n))for(i in n)b.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(a=o.getElementById(i[2]),a&&a.parentNode){if(a.id!==i[2])return r.find(e);this.length=1,this[0]=a}return this.context=o,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):b.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),b.makeArray(e,this))},selector:"",length:0,size:function(){return this.length},toArray:function(){return h.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=b.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return b.each(this,e,t)},ready:function(e){return b.ready.promise().done(e),this},slice:function(){return this.pushStack(h.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(b.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:d,sort:[].sort,splice:[].splice},b.fn.init.prototype=b.fn,b.extend=b.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},u=1,l=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},u=2),"object"==typeof s||b.isFunction(s)||(s={}),l===u&&(s=this,--u);l>u;u++)if(null!=(o=arguments[u]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(b.isPlainObject(r)||(n=b.isArray(r)))?(n?(n=!1,a=e&&b.isArray(e)?e:[]):a=e&&b.isPlainObject(e)?e:{},s[i]=b.extend(c,a,r)):r!==t&&(s[i]=r));return s},b.extend({noConflict:function(t){return e.$===b&&(e.$=u),t&&e.jQuery===b&&(e.jQuery=s),b},isReady:!1,readyWait:1,holdReady:function(e){e?b.readyWait++:b.ready(!0)},ready:function(e){if(e===!0?!--b.readyWait:!b.isReady){if(!o.body)return setTimeout(b.ready);b.isReady=!0,e!==!0&&--b.readyWait>0||(n.resolveWith(o,[b]),b.fn.trigger&&b(o).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===b.type(e)},isArray:Array.isArray||function(e){return"array"===b.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[m.call(e)]||"object":typeof e},isPlainObject:function(e){if(!e||"object"!==b.type(e)||e.nodeType||b.isWindow(e))return!1;try{if(e.constructor&&!y.call(e,"constructor")&&!y.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||y.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||o;var r=C.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=b.buildFragment([e],t,i),i&&b(i).remove(),b.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=b.trim(n),n&&k.test(n.replace(S,"@").replace(A,"]").replace(E,"")))?Function("return "+n)():(b.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||b.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&b.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(j,"ms-").replace(D,L)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:v&&!v.call("\ufeff\u00a0")?function(e){return null==e?"":v.call(e)}:function(e){return null==e?"":(e+"").replace(T,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?b.merge(n,"string"==typeof e?[e]:e):d.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(g)return g.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return f.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),b.isFunction(e)?(r=h.call(arguments,2),i=function(){return e.apply(n||this,r.concat(h.call(arguments)))},i.guid=e.guid=e.guid||b.guid++,i):t},access:function(e,n,r,i,o,a,s){var u=0,l=e.length,c=null==r;if("object"===b.type(r)){o=!0;for(u in r)b.access(e,n,u,r[u],!0,a,s)}else if(i!==t&&(o=!0,b.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(b(e),n)})),n))for(;l>u;u++)n(e[u],r,s?i:i.call(e[u],u,n(e[u],r)));return o?e:c?n.call(e):l?n(e[0],r):a},now:function(){return(new Date).getTime()}}),b.ready.promise=function(t){if(!n)if(n=b.Deferred(),"complete"===o.readyState)setTimeout(b.ready);else if(o.addEventListener)o.addEventListener("DOMContentLoaded",H,!1),e.addEventListener("load",H,!1);else{o.attachEvent("onreadystatechange",H),e.attachEvent("onload",H);var r=!1;try{r=null==e.frameElement&&o.documentElement}catch(i){}r&&r.doScroll&&function a(){if(!b.isReady){try{r.doScroll("left")}catch(e){return setTimeout(a,50)}q(),b.ready()}}()}return n.promise(t)},b.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){l["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=b.type(e);return b.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=b(o);var _={};function F(e){var t=_[e]={};return b.each(e.match(w)||[],function(e,n){t[n]=!0}),t}b.Callbacks=function(e){e="string"==typeof e?_[e]||F(e):b.extend({},e);var n,r,i,o,a,s,u=[],l=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=u.length,n=!0;u&&o>a;a++)if(u[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,u&&(l?l.length&&c(l.shift()):r?u=[]:p.disable())},p={add:function(){if(u){var t=u.length;(function i(t){b.each(t,function(t,n){var r=b.type(n);"function"===r?e.unique&&p.has(n)||u.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=u.length:r&&(s=t,c(r))}return this},remove:function(){return u&&b.each(arguments,function(e,t){var r;while((r=b.inArray(t,u,r))>-1)u.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?b.inArray(e,u)>-1:!(!u||!u.length)},empty:function(){return u=[],this},disable:function(){return u=l=r=t,this},disabled:function(){return!u},lock:function(){return l=t,r||p.disable(),this},locked:function(){return!l},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],!u||i&&!l||(n?l.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},b.extend({Deferred:function(e){var t=[["resolve","done",b.Callbacks("once memory"),"resolved"],["reject","fail",b.Callbacks("once memory"),"rejected"],["notify","progress",b.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return b.Deferred(function(n){b.each(t,function(t,o){var a=o[0],s=b.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&b.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?b.extend(e,r):r}},i={};return r.pipe=r.then,b.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=h.call(arguments),r=n.length,i=1!==r||e&&b.isFunction(e.promise)?r:0,o=1===i?e:b.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?h.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,u,l;if(r>1)for(s=Array(r),u=Array(r),l=Array(r);r>t;t++)n[t]&&b.isFunction(n[t].promise)?n[t].promise().done(a(t,l,n)).fail(o.reject).progress(a(t,u,s)):--i;return i||o.resolveWith(l,n),o.promise()}}),b.support=function(){var t,n,r,a,s,u,l,c,p,f,d=o.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=d.getElementsByTagName("*"),r=d.getElementsByTagName("a")[0],!n||!r||!n.length)return{};s=o.createElement("select"),l=s.appendChild(o.createElement("option")),a=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t={getSetAttribute:"t"!==d.className,leadingWhitespace:3===d.firstChild.nodeType,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/top/.test(r.getAttribute("style")),hrefNormalized:"/a"===r.getAttribute("href"),opacity:/^0.5/.test(r.style.opacity),cssFloat:!!r.style.cssFloat,checkOn:!!a.value,optSelected:l.selected,enctype:!!o.createElement("form").enctype,html5Clone:"<:nav></:nav>"!==o.createElement("nav").cloneNode(!0).outerHTML,boxModel:"CSS1Compat"===o.compatMode,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},a.checked=!0,t.noCloneChecked=a.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!l.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}a=o.createElement("input"),a.setAttribute("value",""),t.input=""===a.getAttribute("value"),a.value="t",a.setAttribute("type","radio"),t.radioValue="t"===a.value,a.setAttribute("checked","t"),a.setAttribute("name","t"),u=o.createDocumentFragment(),u.appendChild(a),t.appendChecked=a.checked,t.checkClone=u.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;return d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip,b(function(){var n,r,a,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",u=o.getElementsByTagName("body")[0];u&&(n=o.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",u.appendChild(n).appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",a=d.getElementsByTagName("td"),a[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===a[0].offsetHeight,a[0].style.display="",a[1].style.display="none",t.reliableHiddenOffsets=p&&0===a[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",t.boxSizing=4===d.offsetWidth,t.doesNotIncludeMarginInBodyOffset=1!==u.offsetTop,e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(o.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="<div></div>",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(u.style.zoom=1)),u.removeChild(n),n=d=a=r=null)}),n=s=u=l=r=a=null,t}();var O=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,B=/([A-Z])/g;function P(e,n,r,i){if(b.acceptData(e)){var o,a,s=b.expando,u="string"==typeof n,l=e.nodeType,p=l?b.cache:e,f=l?e[s]:e[s]&&s;if(f&&p[f]&&(i||p[f].data)||!u||r!==t)return f||(l?e[s]=f=c.pop()||b.guid++:f=s),p[f]||(p[f]={},l||(p[f].toJSON=b.noop)),("object"==typeof n||"function"==typeof n)&&(i?p[f]=b.extend(p[f],n):p[f].data=b.extend(p[f].data,n)),o=p[f],i||(o.data||(o.data={}),o=o.data),r!==t&&(o[b.camelCase(n)]=r),u?(a=o[n],null==a&&(a=o[b.camelCase(n)])):a=o,a}}function R(e,t,n){if(b.acceptData(e)){var r,i,o,a=e.nodeType,s=a?b.cache:e,u=a?e[b.expando]:b.expando;if(s[u]){if(t&&(o=n?s[u]:s[u].data)){b.isArray(t)?t=t.concat(b.map(t,b.camelCase)):t in o?t=[t]:(t=b.camelCase(t),t=t in o?[t]:t.split(" "));for(r=0,i=t.length;i>r;r++)delete o[t[r]];if(!(n?$:b.isEmptyObject)(o))return}(n||(delete s[u].data,$(s[u])))&&(a?b.cleanData([e],!0):b.support.deleteExpando||s!=s.window?delete s[u]:s[u]=null)}}}b.extend({cache:{},expando:"jQuery"+(p+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?b.cache[e[b.expando]]:e[b.expando],!!e&&!$(e)},data:function(e,t,n){return P(e,t,n)},removeData:function(e,t){return R(e,t)},_data:function(e,t,n){return P(e,t,n,!0)},_removeData:function(e,t){return R(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&b.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),b.fn.extend({data:function(e,n){var r,i,o=this[0],a=0,s=null;if(e===t){if(this.length&&(s=b.data(o),1===o.nodeType&&!b._data(o,"parsedAttrs"))){for(r=o.attributes;r.length>a;a++)i=r[a].name,i.indexOf("data-")||(i=b.camelCase(i.slice(5)),W(o,i,s[i]));b._data(o,"parsedAttrs",!0)}return s}return"object"==typeof e?this.each(function(){b.data(this,e)}):b.access(this,function(n){return n===t?o?W(o,e,b.data(o,e)):null:(this.each(function(){b.data(this,e,n)}),t)},null,n,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){b.removeData(this,e)})}});function W(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(B,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:O.test(r)?b.parseJSON(r):r}catch(o){}b.data(e,n,r)}else r=t}return r}function $(e){var t;for(t in e)if(("data"!==t||!b.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}b.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=b._data(e,n),r&&(!i||b.isArray(r)?i=b._data(e,n,b.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=b.queue(e,t),r=n.length,i=n.shift(),o=b._queueHooks(e,t),a=function(){b.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),o.cur=i,i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return b._data(e,n)||b._data(e,n,{empty:b.Callbacks("once memory").add(function(){b._removeData(e,t+"queue"),b._removeData(e,n)})})}}),b.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?b.queue(this[0],e):n===t?this:this.each(function(){var t=b.queue(this,e,n);b._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&b.dequeue(this,e)})},dequeue:function(e){return this.each(function(){b.dequeue(this,e)})},delay:function(e,t){return e=b.fx?b.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=b.Deferred(),a=this,s=this.length,u=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=b._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(u));return u(),o.promise(n)}});var I,z,X=/[\t\r\n]/g,U=/\r/g,V=/^(?:input|select|textarea|button|object)$/i,Y=/^(?:a|area)$/i,J=/^(?:checked|selected|autofocus|autoplay|async|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped)$/i,G=/^(?:checked|selected)$/i,Q=b.support.getSetAttribute,K=b.support.input;b.fn.extend({attr:function(e,t){return b.access(this,b.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){b.removeAttr(this,e)})},prop:function(e,t){return b.access(this,b.prop,e,t,arguments.length>1)},removeProp:function(e){return e=b.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,u="string"==typeof e&&e;if(b.isFunction(e))return this.each(function(t){b(this).addClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(X," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=b.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,u=0===arguments.length||"string"==typeof e&&e;if(b.isFunction(e))return this.each(function(t){b(this).removeClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(X," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?b.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e,r="boolean"==typeof t;return b.isFunction(e)?this.each(function(n){b(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var o,a=0,s=b(this),u=t,l=e.match(w)||[];while(o=l[a++])u=r?u:!s.hasClass(o),s[u?"addClass":"removeClass"](o)}else(n===i||"boolean"===n)&&(this.className&&b._data(this,"__className__",this.className),this.className=this.className||e===!1?"":b._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(X," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=b.isFunction(e),this.each(function(n){var o,a=b(this);1===this.nodeType&&(o=i?e.call(this,n,a.val()):e,null==o?o="":"number"==typeof o?o+="":b.isArray(o)&&(o=b.map(o,function(e){return null==e?"":e+""})),r=b.valHooks[this.type]||b.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=b.valHooks[o.type]||b.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(U,""):null==n?"":n)}}}),b.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,u=0>i?s:o?i:0;for(;s>u;u++)if(n=r[u],!(!n.selected&&u!==i||(b.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&b.nodeName(n.parentNode,"optgroup"))){if(t=b(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n=b.makeArray(t);return b(e).find("option").each(function(){this.selected=b.inArray(b(this).val(),n)>=0}),n.length||(e.selectedIndex=-1),n}}},attr:function(e,n,r){var o,a,s,u=e.nodeType;if(e&&3!==u&&8!==u&&2!==u)return typeof e.getAttribute===i?b.prop(e,n,r):(a=1!==u||!b.isXMLDoc(e),a&&(n=n.toLowerCase(),o=b.attrHooks[n]||(J.test(n)?z:I)),r===t?o&&a&&"get"in o&&null!==(s=o.get(e,n))?s:(typeof e.getAttribute!==i&&(s=e.getAttribute(n)),null==s?t:s):null!==r?o&&a&&"set"in o&&(s=o.set(e,r,n))!==t?s:(e.setAttribute(n,r+""),r):(b.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(w);if(o&&1===e.nodeType)while(n=o[i++])r=b.propFix[n]||n,J.test(n)?!Q&&G.test(n)?e[b.camelCase("default-"+n)]=e[r]=!1:e[r]=!1:b.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!b.support.radioValue&&"radio"===t&&b.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!b.isXMLDoc(e),a&&(n=b.propFix[n]||n,o=b.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var n=e.getAttributeNode("tabindex");return n&&n.specified?parseInt(n.value,10):V.test(e.nodeName)||Y.test(e.nodeName)&&e.href?0:t}}}}),z={get:function(e,n){var r=b.prop(e,n),i="boolean"==typeof r&&e.getAttribute(n),o="boolean"==typeof r?K&&Q?null!=i:G.test(n)?e[b.camelCase("default-"+n)]:!!i:e.getAttributeNode(n);return o&&o.value!==!1?n.toLowerCase():t},set:function(e,t,n){return t===!1?b.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&b.propFix[n]||n,n):e[b.camelCase("default-"+n)]=e[n]=!0,n}},K&&Q||(b.attrHooks.value={get:function(e,n){var r=e.getAttributeNode(n);return b.nodeName(e,"input")?e.defaultValue:r&&r.specified?r.value:t},set:function(e,n,r){return b.nodeName(e,"input")?(e.defaultValue=n,t):I&&I.set(e,n,r)}}),Q||(I=b.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&("id"===n||"name"===n||"coords"===n?""!==r.value:r.specified)?r.value:t},set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},b.attrHooks.contenteditable={get:I.get,set:function(e,t,n){I.set(e,""===t?!1:t,n)}},b.each(["width","height"],function(e,n){b.attrHooks[n]=b.extend(b.attrHooks[n],{set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}})})),b.support.hrefNormalized||(b.each(["href","src","width","height"],function(e,n){b.attrHooks[n]=b.extend(b.attrHooks[n],{get:function(e){var r=e.getAttribute(n,2);return null==r?t:r}})}),b.each(["href","src"],function(e,t){b.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}})),b.support.style||(b.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),b.support.optSelected||(b.propHooks.selected=b.extend(b.propHooks.selected,{get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}})),b.support.enctype||(b.propFix.enctype="encoding"),b.support.checkOn||b.each(["radio","checkbox"],function(){b.valHooks[this]={get:function(e){return null===e.getAttribute("value")?"on":e.value}}}),b.each(["radio","checkbox"],function(){b.valHooks[this]=b.extend(b.valHooks[this],{set:function(e,n){return b.isArray(n)?e.checked=b.inArray(b(e).val(),n)>=0:t}})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}b.event={global:{},add:function(e,n,r,o,a){var s,u,l,c,p,f,d,h,g,m,y,v=b._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=b.guid++),(u=v.events)||(u=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof b===i||e&&b.event.triggered===e.type?t:b.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(w)||[""],l=n.length;while(l--)s=rt.exec(n[l])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),p=b.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=b.event.special[g]||{},d=b.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&b.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=u[g])||(h=u[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),b.event.global[g]=!0;e=null}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,p,f,d,h,g,m=b.hasData(e)&&b._data(e);if(m&&(c=m.events)){t=(t||"").match(w)||[""],l=t.length;while(l--)if(s=rt.exec(t[l])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=b.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),u=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));u&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||b.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)b.event.remove(e,d+t[l],n,r,!0);b.isEmptyObject(c)&&(delete m.handle,b._removeData(e,"events"))}},trigger:function(n,r,i,a){var s,u,l,c,p,f,d,h=[i||o],g=y.call(n,"type")?n.type:n,m=y.call(n,"namespace")?n.namespace.split("."):[];if(l=f=i=i||o,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+b.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),u=0>g.indexOf(":")&&"on"+g,n=n[b.expando]?n:new b.Event(g,"object"==typeof n&&n),n.isTrigger=!0,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:b.makeArray(r,[n]),p=b.event.special[g]||{},a||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!a&&!p.noBubble&&!b.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(l=l.parentNode);l;l=l.parentNode)h.push(l),f=l;f===(i.ownerDocument||o)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((l=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(b._data(l,"events")||{})[n.type]&&b._data(l,"handle"),s&&s.apply(l,r),s=u&&l[u],s&&b.acceptData(l)&&s.apply&&s.apply(l,r)===!1&&n.preventDefault();if(n.type=g,!(a||n.isDefaultPrevented()||p._default&&p._default.apply(i.ownerDocument,r)!==!1||"click"===g&&b.nodeName(i,"a")||!b.acceptData(i)||!u||!i[g]||b.isWindow(i))){f=i[u],f&&(i[u]=null),b.event.triggered=g;try{i[g]()}catch(v){}b.event.triggered=t,f&&(i[u]=f)}return n.result}},dispatch:function(e){e=b.event.fix(e);var n,r,i,o,a,s=[],u=h.call(arguments),l=(b._data(this,"events")||{})[e.type]||[],c=b.event.special[e.type]||{};if(u[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=b.event.handlers.call(this,e,l),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((b.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,u),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],u=n.delegateCount,l=e.target;if(u&&l.nodeType&&(!e.button||"click"!==e.type))for(;l!=this;l=l.parentNode||this)if(1===l.nodeType&&(l.disabled!==!0||"click"!==e.type)){for(o=[],a=0;u>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?b(r,this).index(l)>=0:b.find(r,this,null,[l]).length),o[r]&&o.push(i);o.length&&s.push({elem:l,handlers:o})}return n.length>u&&s.push({elem:this,handlers:n.slice(u)}),s},fix:function(e){if(e[b.expando])return e;var t,n,r,i=e.type,a=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new b.Event(a),t=r.length;while(t--)n=r[t],e[n]=a[n];return e.target||(e.target=a.srcElement||o),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,a):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,a,s=n.button,u=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||o,a=i.documentElement,r=i.body,e.pageX=n.clientX+(a&&a.scrollLeft||r&&r.scrollLeft||0)-(a&&a.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(a&&a.scrollTop||r&&r.scrollTop||0)-(a&&a.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&u&&(e.relatedTarget=u===e.target?n.toElement:u),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},click:{trigger:function(){return b.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t}},focus:{trigger:function(){if(this!==o.activeElement&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===o.activeElement&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=b.extend(new b.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?b.event.trigger(i,null,t):b.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},b.removeEvent=o.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},b.Event=function(e,n){return this instanceof b.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&b.extend(this,n),this.timeStamp=e&&e.timeStamp||b.now(),this[b.expando]=!0,t):new b.Event(e,n)},b.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},b.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){b.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;
-return(!i||i!==r&&!b.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),b.support.submitBubbles||(b.event.special.submit={setup:function(){return b.nodeName(this,"form")?!1:(b.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=b.nodeName(n,"input")||b.nodeName(n,"button")?n.form:t;r&&!b._data(r,"submitBubbles")&&(b.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),b._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&b.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return b.nodeName(this,"form")?!1:(b.event.remove(this,"._submit"),t)}}),b.support.changeBubbles||(b.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(b.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),b.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),b.event.simulate("change",this,e,!0)})),!1):(b.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!b._data(t,"changeBubbles")&&(b.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||b.event.simulate("change",this.parentNode,e,!0)}),b._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return b.event.remove(this,"._change"),!Z.test(this.nodeName)}}),b.support.focusinBubbles||b.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){b.event.simulate(t,e.target,b.event.fix(e),!0)};b.event.special[t]={setup:function(){0===n++&&o.addEventListener(e,r,!0)},teardown:function(){0===--n&&o.removeEventListener(e,r,!0)}}}),b.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return b().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=b.guid++)),this.each(function(){b.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,b(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){b.event.remove(this,e,r,n)})},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},trigger:function(e,t){return this.each(function(){b.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?b.event.trigger(e,n,r,!0):t}}),function(e,t){var n,r,i,o,a,s,u,l,c,p,f,d,h,g,m,y,v,x="sizzle"+-new Date,w=e.document,T={},N=0,C=0,k=it(),E=it(),S=it(),A=typeof t,j=1<<31,D=[],L=D.pop,H=D.push,q=D.slice,M=D.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},_="[\\x20\\t\\r\\n\\f]",F="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=F.replace("w","w#"),B="([*^$|!~]?=)",P="\\["+_+"*("+F+")"+_+"*(?:"+B+_+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+O+")|)|)"+_+"*\\]",R=":("+F+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+P.replace(3,8)+")*)|.*)\\)|)",W=RegExp("^"+_+"+|((?:^|[^\\\\])(?:\\\\.)*)"+_+"+$","g"),$=RegExp("^"+_+"*,"+_+"*"),I=RegExp("^"+_+"*([\\x20\\t\\r\\n\\f>+~])"+_+"*"),z=RegExp(R),X=RegExp("^"+O+"$"),U={ID:RegExp("^#("+F+")"),CLASS:RegExp("^\\.("+F+")"),NAME:RegExp("^\\[name=['\"]?("+F+")['\"]?\\]"),TAG:RegExp("^("+F.replace("w","w*")+")"),ATTR:RegExp("^"+P),PSEUDO:RegExp("^"+R),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+_+"*(even|odd|(([+-]|)(\\d*)n|)"+_+"*(?:([+-]|)"+_+"*(\\d+)|))"+_+"*\\)|)","i"),needsContext:RegExp("^"+_+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+_+"*((?:-\\d)?\\d*)"+_+"*\\)|)(?=[^-]|$)","i")},V=/[\x20\t\r\n\f]*[+~]/,Y=/^[^{]+\{\s*\[native code/,J=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,G=/^(?:input|select|textarea|button)$/i,Q=/^h\d$/i,K=/'|\\/g,Z=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,et=/\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?|.)/g,tt=function(e,t){var n="0x"+t-65536;return n!==n?t:0>n?String.fromCharCode(n+65536):String.fromCharCode(55296|n>>10,56320|1023&n)};try{q.call(w.documentElement.childNodes,0)[0].nodeType}catch(nt){q=function(e){var t,n=[];while(t=this[e++])n.push(t);return n}}function rt(e){return Y.test(e+"")}function it(){var e,t=[];return e=function(n,r){return t.push(n+=" ")>i.cacheLength&&delete e[t.shift()],e[n]=r}}function ot(e){return e[x]=!0,e}function at(e){var t=p.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}}function st(e,t,n,r){var i,o,a,s,u,l,f,g,m,v;if((t?t.ownerDocument||t:w)!==p&&c(t),t=t||p,n=n||[],!e||"string"!=typeof e)return n;if(1!==(s=t.nodeType)&&9!==s)return[];if(!d&&!r){if(i=J.exec(e))if(a=i[1]){if(9===s){if(o=t.getElementById(a),!o||!o.parentNode)return n;if(o.id===a)return n.push(o),n}else if(t.ownerDocument&&(o=t.ownerDocument.getElementById(a))&&y(t,o)&&o.id===a)return n.push(o),n}else{if(i[2])return H.apply(n,q.call(t.getElementsByTagName(e),0)),n;if((a=i[3])&&T.getByClassName&&t.getElementsByClassName)return H.apply(n,q.call(t.getElementsByClassName(a),0)),n}if(T.qsa&&!h.test(e)){if(f=!0,g=x,m=t,v=9===s&&e,1===s&&"object"!==t.nodeName.toLowerCase()){l=ft(e),(f=t.getAttribute("id"))?g=f.replace(K,"\\$&"):t.setAttribute("id",g),g="[id='"+g+"'] ",u=l.length;while(u--)l[u]=g+dt(l[u]);m=V.test(e)&&t.parentNode||t,v=l.join(",")}if(v)try{return H.apply(n,q.call(m.querySelectorAll(v),0)),n}catch(b){}finally{f||t.removeAttribute("id")}}}return wt(e.replace(W,"$1"),t,n,r)}a=st.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},c=st.setDocument=function(e){var n=e?e.ownerDocument||e:w;return n!==p&&9===n.nodeType&&n.documentElement?(p=n,f=n.documentElement,d=a(n),T.tagNameNoComments=at(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),T.attributes=at(function(e){e.innerHTML="<select></select>";var t=typeof e.lastChild.getAttribute("multiple");return"boolean"!==t&&"string"!==t}),T.getByClassName=at(function(e){return e.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",e.getElementsByClassName&&e.getElementsByClassName("e").length?(e.lastChild.className="e",2===e.getElementsByClassName("e").length):!1}),T.getByName=at(function(e){e.id=x+0,e.innerHTML="<a name='"+x+"'></a><div name='"+x+"'></div>",f.insertBefore(e,f.firstChild);var t=n.getElementsByName&&n.getElementsByName(x).length===2+n.getElementsByName(x+0).length;return T.getIdNotName=!n.getElementById(x),f.removeChild(e),t}),i.attrHandle=at(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild&&typeof e.firstChild.getAttribute!==A&&"#"===e.firstChild.getAttribute("href")})?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},T.getIdNotName?(i.find.ID=function(e,t){if(typeof t.getElementById!==A&&!d){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},i.filter.ID=function(e){var t=e.replace(et,tt);return function(e){return e.getAttribute("id")===t}}):(i.find.ID=function(e,n){if(typeof n.getElementById!==A&&!d){var r=n.getElementById(e);return r?r.id===e||typeof r.getAttributeNode!==A&&r.getAttributeNode("id").value===e?[r]:t:[]}},i.filter.ID=function(e){var t=e.replace(et,tt);return function(e){var n=typeof e.getAttributeNode!==A&&e.getAttributeNode("id");return n&&n.value===t}}),i.find.TAG=T.tagNameNoComments?function(e,n){return typeof n.getElementsByTagName!==A?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},i.find.NAME=T.getByName&&function(e,n){return typeof n.getElementsByName!==A?n.getElementsByName(name):t},i.find.CLASS=T.getByClassName&&function(e,n){return typeof n.getElementsByClassName===A||d?t:n.getElementsByClassName(e)},g=[],h=[":focus"],(T.qsa=rt(n.querySelectorAll))&&(at(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||h.push("\\["+_+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||h.push(":checked")}),at(function(e){e.innerHTML="<input type='hidden' i=''/>",e.querySelectorAll("[i^='']").length&&h.push("[*^$]="+_+"*(?:\"\"|'')"),e.querySelectorAll(":enabled").length||h.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),h.push(",.*:")})),(T.matchesSelector=rt(m=f.matchesSelector||f.mozMatchesSelector||f.webkitMatchesSelector||f.oMatchesSelector||f.msMatchesSelector))&&at(function(e){T.disconnectedMatch=m.call(e,"div"),m.call(e,"[s!='']:x"),g.push("!=",R)}),h=RegExp(h.join("|")),g=RegExp(g.join("|")),y=rt(f.contains)||f.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},v=f.compareDocumentPosition?function(e,t){var r;return e===t?(u=!0,0):(r=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t))?1&r||e.parentNode&&11===e.parentNode.nodeType?e===n||y(w,e)?-1:t===n||y(w,t)?1:0:4&r?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return u=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:0;if(o===a)return ut(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?ut(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},u=!1,[0,0].sort(v),T.detectDuplicates=u,p):p},st.matches=function(e,t){return st(e,null,null,t)},st.matchesSelector=function(e,t){if((e.ownerDocument||e)!==p&&c(e),t=t.replace(Z,"='$1']"),!(!T.matchesSelector||d||g&&g.test(t)||h.test(t)))try{var n=m.call(e,t);if(n||T.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(r){}return st(t,p,null,[e]).length>0},st.contains=function(e,t){return(e.ownerDocument||e)!==p&&c(e),y(e,t)},st.attr=function(e,t){var n;return(e.ownerDocument||e)!==p&&c(e),d||(t=t.toLowerCase()),(n=i.attrHandle[t])?n(e):d||T.attributes?e.getAttribute(t):((n=e.getAttributeNode(t))||e.getAttribute(t))&&e[t]===!0?t:n&&n.specified?n.value:null},st.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},st.uniqueSort=function(e){var t,n=[],r=1,i=0;if(u=!T.detectDuplicates,e.sort(v),u){for(;t=e[r];r++)t===e[r-1]&&(i=n.push(r));while(i--)e.splice(n[i],1)}return e};function ut(e,t){var n=t&&e,r=n&&(~t.sourceIndex||j)-(~e.sourceIndex||j);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function lt(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function ct(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function pt(e){return ot(function(t){return t=+t,ot(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}o=st.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=o(t);return n},i=st.selectors={cacheLength:50,createPseudo:ot,match:U,find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(et,tt),e[3]=(e[4]||e[5]||"").replace(et,tt),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||st.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&st.error(e[0]),e},PSEUDO:function(e){var t,n=!e[5]&&e[2];return U.CHILD.test(e[0])?null:(e[4]?e[2]=e[4]:n&&z.test(n)&&(t=ft(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){return"*"===e?function(){return!0}:(e=e.replace(et,tt).toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=k[e+" "];return t||(t=RegExp("(^|"+_+")"+e+"("+_+"|$)"))&&k(e,function(e){return t.test(e.className||typeof e.getAttribute!==A&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=st.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!u&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[x]||(m[x]={}),l=c[e]||[],d=l[0]===N&&l[1],f=l[0]===N&&l[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[N,d,f];break}}else if(v&&(l=(t[x]||(t[x]={}))[e])&&l[0]===N)f=l[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[x]||(p[x]={}))[e]=[N,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||st.error("unsupported pseudo: "+e);return r[x]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?ot(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=M.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:ot(function(e){var t=[],n=[],r=s(e.replace(W,"$1"));return r[x]?ot(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:ot(function(e){return function(t){return st(e,t).length>0}}),contains:ot(function(e){return function(t){return(t.textContent||t.innerText||o(t)).indexOf(e)>-1}}),lang:ot(function(e){return X.test(e||"")||st.error("unsupported lang: "+e),e=e.replace(et,tt).toLowerCase(),function(t){var n;do if(n=d?t.getAttribute("xml:lang")||t.getAttribute("lang"):t.lang)return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===f},focus:function(e){return e===p.activeElement&&(!p.hasFocus||p.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!i.pseudos.empty(e)},header:function(e){return Q.test(e.nodeName)},input:function(e){return G.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:pt(function(){return[0]}),last:pt(function(e,t){return[t-1]}),eq:pt(function(e,t,n){return[0>n?n+t:n]}),even:pt(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:pt(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:pt(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:pt(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}};for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})i.pseudos[n]=lt(n);for(n in{submit:!0,reset:!0})i.pseudos[n]=ct(n);function ft(e,t){var n,r,o,a,s,u,l,c=E[e+" "];if(c)return t?0:c.slice(0);s=e,u=[],l=i.preFilter;while(s){(!n||(r=$.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),u.push(o=[])),n=!1,(r=I.exec(s))&&(n=r.shift(),o.push({value:n,type:r[0].replace(W," ")}),s=s.slice(n.length));for(a in i.filter)!(r=U[a].exec(s))||l[a]&&!(r=l[a](r))||(n=r.shift(),o.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?st.error(e):E(e,u).slice(0)}function dt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function ht(e,t,n){var i=t.dir,o=n&&"parentNode"===i,a=C++;return t.first?function(t,n,r){while(t=t[i])if(1===t.nodeType||o)return e(t,n,r)}:function(t,n,s){var u,l,c,p=N+" "+a;if(s){while(t=t[i])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[i])if(1===t.nodeType||o)if(c=t[x]||(t[x]={}),(l=c[i])&&l[0]===p){if((u=l[1])===!0||u===r)return u===!0}else if(l=c[i]=[p],l[1]=e(t,n,s)||r,l[1]===!0)return!0}}function gt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function mt(e,t,n,r,i){var o,a=[],s=0,u=e.length,l=null!=t;for(;u>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),l&&t.push(s));return a}function yt(e,t,n,r,i,o){return r&&!r[x]&&(r=yt(r)),i&&!i[x]&&(i=yt(i,o)),ot(function(o,a,s,u){var l,c,p,f=[],d=[],h=a.length,g=o||xt(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:mt(g,f,e,s,u),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,u),r){l=mt(y,d),r(l,[],s,u),c=l.length;while(c--)(p=l[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){l=[],c=y.length;while(c--)(p=y[c])&&l.push(m[c]=p);i(null,y=[],l,u)}c=y.length;while(c--)(p=y[c])&&(l=i?M.call(o,p):f[c])>-1&&(o[l]=!(a[l]=p))}}else y=mt(y===a?y.splice(h,y.length):y),i?i(null,a,y,u):H.apply(a,y)})}function vt(e){var t,n,r,o=e.length,a=i.relative[e[0].type],s=a||i.relative[" "],u=a?1:0,c=ht(function(e){return e===t},s,!0),p=ht(function(e){return M.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==l)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;o>u;u++)if(n=i.relative[e[u].type])f=[ht(gt(f),n)];else{if(n=i.filter[e[u].type].apply(null,e[u].matches),n[x]){for(r=++u;o>r;r++)if(i.relative[e[r].type])break;return yt(u>1&&gt(f),u>1&&dt(e.slice(0,u-1)).replace(W,"$1"),n,r>u&&vt(e.slice(u,r)),o>r&&vt(e=e.slice(r)),o>r&&dt(e))}f.push(n)}return gt(f)}function bt(e,t){var n=0,o=t.length>0,a=e.length>0,s=function(s,u,c,f,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,T=l,C=s||a&&i.find.TAG("*",d&&u.parentNode||u),k=N+=null==T?1:Math.random()||.1;for(w&&(l=u!==p&&u,r=n);null!=(h=C[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,u,c)){f.push(h);break}w&&(N=k,r=++n)}o&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,o&&b!==v){g=0;while(m=t[g++])m(x,y,u,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=L.call(f));y=mt(y)}H.apply(f,y),w&&!s&&y.length>0&&v+t.length>1&&st.uniqueSort(f)}return w&&(N=k,l=T),x};return o?ot(s):s}s=st.compile=function(e,t){var n,r=[],i=[],o=S[e+" "];if(!o){t||(t=ft(e)),n=t.length;while(n--)o=vt(t[n]),o[x]?r.push(o):i.push(o);o=S(e,bt(i,r))}return o};function xt(e,t,n){var r=0,i=t.length;for(;i>r;r++)st(e,t[r],n);return n}function wt(e,t,n,r){var o,a,u,l,c,p=ft(e);if(!r&&1===p.length){if(a=p[0]=p[0].slice(0),a.length>2&&"ID"===(u=a[0]).type&&9===t.nodeType&&!d&&i.relative[a[1].type]){if(t=i.find.ID(u.matches[0].replace(et,tt),t)[0],!t)return n;e=e.slice(a.shift().value.length)}o=U.needsContext.test(e)?0:a.length;while(o--){if(u=a[o],i.relative[l=u.type])break;if((c=i.find[l])&&(r=c(u.matches[0].replace(et,tt),V.test(a[0].type)&&t.parentNode||t))){if(a.splice(o,1),e=r.length&&dt(a),!e)return H.apply(n,q.call(r,0)),n;break}}}return s(e,p)(r,t,d,n,V.test(e)),n}i.pseudos.nth=i.pseudos.eq;function Tt(){}i.filters=Tt.prototype=i.pseudos,i.setFilters=new Tt,c(),st.attr=b.attr,b.find=st,b.expr=st.selectors,b.expr[":"]=b.expr.pseudos,b.unique=st.uniqueSort,b.text=st.getText,b.isXMLDoc=st.isXML,b.contains=st.contains}(e);var at=/Until$/,st=/^(?:parents|prev(?:Until|All))/,ut=/^.[^:#\[\.,]*$/,lt=b.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};b.fn.extend({find:function(e){var t,n,r,i=this.length;if("string"!=typeof e)return r=this,this.pushStack(b(e).filter(function(){for(t=0;i>t;t++)if(b.contains(r[t],this))return!0}));for(n=[],t=0;i>t;t++)b.find(e,this[t],n);return n=this.pushStack(i>1?b.unique(n):n),n.selector=(this.selector?this.selector+" ":"")+e,n},has:function(e){var t,n=b(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(b.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e,!1))},filter:function(e){return this.pushStack(ft(this,e,!0))},is:function(e){return!!e&&("string"==typeof e?lt.test(e)?b(e,this.context).index(this[0])>=0:b.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){var n,r=0,i=this.length,o=[],a=lt.test(e)||"string"!=typeof e?b(e,t||this.context):0;for(;i>r;r++){n=this[r];while(n&&n.ownerDocument&&n!==t&&11!==n.nodeType){if(a?a.index(n)>-1:b.find.matchesSelector(n,e)){o.push(n);break}n=n.parentNode}}return this.pushStack(o.length>1?b.unique(o):o)},index:function(e){return e?"string"==typeof e?b.inArray(this[0],b(e)):b.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?b(e,t):b.makeArray(e&&e.nodeType?[e]:e),r=b.merge(this.get(),n);return this.pushStack(b.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),b.fn.andSelf=b.fn.addBack;function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}b.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return b.dir(e,"parentNode")},parentsUntil:function(e,t,n){return b.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return b.dir(e,"nextSibling")},prevAll:function(e){return b.dir(e,"previousSibling")},nextUntil:function(e,t,n){return b.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return b.dir(e,"previousSibling",n)},siblings:function(e){return b.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return b.sibling(e.firstChild)},contents:function(e){return b.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:b.merge([],e.childNodes)}},function(e,t){b.fn[e]=function(n,r){var i=b.map(this,t,n);return at.test(e)||(r=n),r&&"string"==typeof r&&(i=b.filter(r,i)),i=this.length>1&&!ct[e]?b.unique(i):i,this.length>1&&st.test(e)&&(i=i.reverse()),this.pushStack(i)}}),b.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),1===t.length?b.find.matchesSelector(t[0],e)?[t[0]]:[]:b.find.matches(e,t)},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!b(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(t=t||0,b.isFunction(t))return b.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return b.grep(e,function(e){return e===t===n});if("string"==typeof t){var r=b.grep(e,function(e){return 1===e.nodeType});if(ut.test(t))return b.filter(t,r,!n);t=b.filter(t,r)}return b.grep(e,function(e){return b.inArray(e,t)>=0===n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/<tbody/i,wt=/<|&#?\w+;/,Tt=/<(?:script|style|link)/i,Nt=/^(?:checkbox|radio)$/i,Ct=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^$|\/(?:java|ecma)script/i,Et=/^true\/(.*)/,St=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,At={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:b.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},jt=dt(o),Dt=jt.appendChild(o.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,b.fn.extend({text:function(e){return b.access(this,function(e){return e===t?b.text(this):this.empty().append((this[0]&&this[0].ownerDocument||o).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(b.isFunction(e))return this.each(function(t){b(this).wrapAll(e.call(this,t))});if(this[0]){var t=b(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return b.isFunction(e)?this.each(function(t){b(this).wrapInner(e.call(this,t))}):this.each(function(){var t=b(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=b.isFunction(e);return this.each(function(n){b(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){b.nodeName(this,"body")||b(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.insertBefore(e,this.firstChild)})},before:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=0;for(;null!=(n=this[r]);r++)(!e||b.filter(e,[n]).length>0)&&(t||1!==n.nodeType||b.cleanData(Ot(n)),n.parentNode&&(t&&b.contains(n.ownerDocument,n)&&Mt(Ot(n,"script")),n.parentNode.removeChild(n)));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&b.cleanData(Ot(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&b.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return b.clone(this,e,t)})},html:function(e){return b.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!b.support.htmlSerialize&&mt.test(e)||!b.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(b.cleanData(Ot(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(e){var t=b.isFunction(e);return t||"string"==typeof e||(e=b(e).not(this).detach()),this.domManip([e],!0,function(e){var t=this.nextSibling,n=this.parentNode;n&&(b(this).remove(),n.insertBefore(e,t))})},detach:function(e){return this.remove(e,!0)},domManip:function(e,n,r){e=f.apply([],e);var i,o,a,s,u,l,c=0,p=this.length,d=this,h=p-1,g=e[0],m=b.isFunction(g);if(m||!(1>=p||"string"!=typeof g||b.support.checkClone)&&Ct.test(g))return this.each(function(i){var o=d.eq(i);m&&(e[0]=g.call(this,i,n?o.html():t)),o.domManip(e,n,r)});if(p&&(l=b.buildFragment(e,this[0].ownerDocument,!1,this),i=l.firstChild,1===l.childNodes.length&&(l=i),i)){for(n=n&&b.nodeName(i,"tr"),s=b.map(Ot(l,"script"),Ht),a=s.length;p>c;c++)o=l,c!==h&&(o=b.clone(o,!0,!0),a&&b.merge(s,Ot(o,"script"))),r.call(n&&b.nodeName(this[c],"table")?Lt(this[c],"tbody"):this[c],o,c);if(a)for(u=s[s.length-1].ownerDocument,b.map(s,qt),c=0;a>c;c++)o=s[c],kt.test(o.type||"")&&!b._data(o,"globalEval")&&b.contains(u,o)&&(o.src?b.ajax({url:o.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):b.globalEval((o.text||o.textContent||o.innerHTML||"").replace(St,"")));l=i=null}return this}});function Lt(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function Ht(e){var t=e.getAttributeNode("type");return e.type=(t&&t.specified)+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function Mt(e,t){var n,r=0;for(;null!=(n=e[r]);r++)b._data(n,"globalEval",!t||b._data(t[r],"globalEval"))}function _t(e,t){if(1===t.nodeType&&b.hasData(e)){var n,r,i,o=b._data(e),a=b._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)b.event.add(t,n,s[n][r])}a.data&&(a.data=b.extend({},a.data))}}function Ft(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!b.support.noCloneEvent&&t[b.expando]){i=b._data(t);for(r in i.events)b.removeEvent(t,r,i.handle);t.removeAttribute(b.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),b.support.html5Clone&&e.innerHTML&&!b.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Nt.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}b.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){b.fn[e]=function(e){var n,r=0,i=[],o=b(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),b(o[r])[t](n),d.apply(i,n.get());return this.pushStack(i)}});function Ot(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||b.nodeName(o,n)?s.push(o):b.merge(s,Ot(o,n));return n===t||n&&b.nodeName(e,n)?b.merge([e],s):s}function Bt(e){Nt.test(e.type)&&(e.defaultChecked=e.checked)}b.extend({clone:function(e,t,n){var r,i,o,a,s,u=b.contains(e.ownerDocument,e);if(b.support.html5Clone||b.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(b.support.noCloneEvent&&b.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||b.isXMLDoc(e)))for(r=Ot(o),s=Ot(e),a=0;null!=(i=s[a]);++a)r[a]&&Ft(i,r[a]);if(t)if(n)for(s=s||Ot(e),r=r||Ot(o),a=0;null!=(i=s[a]);a++)_t(i,r[a]);else _t(e,o);return r=Ot(o,"script"),r.length>0&&Mt(r,!u&&Ot(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,u,l,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===b.type(o))b.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),u=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[u]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1></$2>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!b.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!b.support.tbody){o="table"!==u||xt.test(o)?"<table>"!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)b.nodeName(l=o.childNodes[i],"tbody")&&!l.childNodes.length&&o.removeChild(l)
-}b.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),b.support.appendChecked||b.grep(Ot(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===b.inArray(o,r))&&(a=b.contains(o.ownerDocument,o),s=Ot(f.appendChild(o),"script"),a&&Mt(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,u=b.expando,l=b.cache,p=b.support.deleteExpando,f=b.event.special;for(;null!=(n=e[s]);s++)if((t||b.acceptData(n))&&(o=n[u],a=o&&l[o])){if(a.events)for(r in a.events)f[r]?b.event.remove(n,r):b.removeEvent(n,r,a.handle);l[o]&&(delete l[o],p?delete n[u]:typeof n.removeAttribute!==i?n.removeAttribute(u):n[u]=null,c.push(o))}}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+x+")(.*)$","i"),Yt=RegExp("^("+x+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+x+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===b.css(e,"display")||!b.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=b._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=b._data(r,"olddisplay",un(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&b._data(r,"olddisplay",i?n:b.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}b.fn.extend({css:function(e,n){return b.access(this,function(e,n,r){var i,o,a={},s=0;if(b.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=b.css(e,n[s],!1,o);return a}return r!==t?b.style(e,n,r):b.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){var t="boolean"==typeof e;return this.each(function(){(t?e:nn(this))?b(this).show():b(this).hide()})}}),b.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":b.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,u=b.camelCase(n),l=e.style;if(n=b.cssProps[u]||(b.cssProps[u]=tn(l,u)),s=b.cssHooks[n]||b.cssHooks[u],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:l[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(b.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||b.cssNumber[u]||(r+="px"),b.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(l[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{l[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,u=b.camelCase(n);return n=b.cssProps[u]||(b.cssProps[u]=tn(e.style,u)),s=b.cssHooks[n]||b.cssHooks[u],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||b.isNumeric(o)?o||0:a):a},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),u=s?s.getPropertyValue(n)||s[n]:t,l=e.style;return s&&(""!==u||b.contains(e.ownerDocument,e)||(u=b.style(e,n)),Yt.test(u)&&Ut.test(n)&&(i=l.width,o=l.minWidth,a=l.maxWidth,l.minWidth=l.maxWidth=l.width=u,u=s.width,l.width=i,l.minWidth=o,l.maxWidth=a)),u}):o.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),u=s?s[n]:t,l=e.style;return null==u&&l&&l[n]&&(u=l[n]),Yt.test(u)&&!zt.test(n)&&(i=l.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),l.left="fontSize"===n?"1em":u,u=l.pixelLeft+"px",l.left=i,a&&(o.left=a)),""===u?"auto":u});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=b.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=b.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=b.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=b.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=b.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=b.support.boxSizing&&"border-box"===b.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(b.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function un(e){var t=o,n=Gt[e];return n||(n=ln(e,t),"none"!==n&&n||(Pt=(Pt||b("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(Pt[0].contentWindow||Pt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=ln(e,t),Pt.detach()),Gt[e]=n),n}function ln(e,t){var n=b(t.createElement(e)).appendTo(t.body),r=b.css(n[0],"display");return n.remove(),r}b.each(["height","width"],function(e,n){b.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&Xt.test(b.css(e,"display"))?b.swap(e,Qt,function(){return sn(e,n,i)}):sn(e,n,i):t},set:function(e,t,r){var i=r&&Rt(e);return on(e,t,r?an(e,n,r,b.support.boxSizing&&"border-box"===b.css(e,"boxSizing",!1,i),i):0)}}}),b.support.opacity||(b.cssHooks.opacity={get:function(e,t){return It.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=b.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===b.trim(o.replace($t,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=$t.test(o)?o.replace($t,i):o+" "+i)}}),b(function(){b.support.reliableMarginRight||(b.cssHooks.marginRight={get:function(e,n){return n?b.swap(e,{display:"inline-block"},Wt,[e,"marginRight"]):t}}),!b.support.pixelPosition&&b.fn.position&&b.each(["top","left"],function(e,n){b.cssHooks[n]={get:function(e,r){return r?(r=Wt(e,n),Yt.test(r)?b(e).position()[n]+"px":r):t}}})}),b.expr&&b.expr.filters&&(b.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight||!b.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||b.css(e,"display"))},b.expr.filters.visible=function(e){return!b.expr.filters.hidden(e)}),b.each({margin:"",padding:"",border:"Width"},function(e,t){b.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+Zt[r]+t]=o[r]||o[r-2]||o[0];return i}},Ut.test(e)||(b.cssHooks[e+t].set=on)});var cn=/%20/g,pn=/\[\]$/,fn=/\r?\n/g,dn=/^(?:submit|button|image|reset|file)$/i,hn=/^(?:input|select|textarea|keygen)/i;b.fn.extend({serialize:function(){return b.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=b.prop(this,"elements");return e?b.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!b(this).is(":disabled")&&hn.test(this.nodeName)&&!dn.test(e)&&(this.checked||!Nt.test(e))}).map(function(e,t){var n=b(this).val();return null==n?null:b.isArray(n)?b.map(n,function(e){return{name:t.name,value:e.replace(fn,"\r\n")}}):{name:t.name,value:n.replace(fn,"\r\n")}}).get()}}),b.param=function(e,n){var r,i=[],o=function(e,t){t=b.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=b.ajaxSettings&&b.ajaxSettings.traditional),b.isArray(e)||e.jquery&&!b.isPlainObject(e))b.each(e,function(){o(this.name,this.value)});else for(r in e)gn(r,e[r],n,o);return i.join("&").replace(cn,"+")};function gn(e,t,n,r){var i;if(b.isArray(t))b.each(t,function(t,i){n||pn.test(e)?r(e,i):gn(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==b.type(t))r(e,t);else for(i in t)gn(e+"["+i+"]",t[i],n,r)}b.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){b.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),b.fn.hover=function(e,t){return this.mouseenter(e).mouseleave(t||e)};var mn,yn,vn=b.now(),bn=/\?/,xn=/#.*$/,wn=/([?&])_=[^&]*/,Tn=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Nn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Cn=/^(?:GET|HEAD)$/,kn=/^\/\//,En=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Sn=b.fn.load,An={},jn={},Dn="*/".concat("*");try{yn=a.href}catch(Ln){yn=o.createElement("a"),yn.href="",yn=yn.href}mn=En.exec(yn.toLowerCase())||[];function Hn(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(w)||[];if(b.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function qn(e,n,r,i){var o={},a=e===jn;function s(u){var l;return o[u]=!0,b.each(e[u]||[],function(e,u){var c=u(n,r,i);return"string"!=typeof c||a||o[c]?a?!(l=c):t:(n.dataTypes.unshift(c),s(c),!1)}),l}return s(n.dataTypes[0])||!o["*"]&&s("*")}function Mn(e,n){var r,i,o=b.ajaxSettings.flatOptions||{};for(i in n)n[i]!==t&&((o[i]?e:r||(r={}))[i]=n[i]);return r&&b.extend(!0,e,r),e}b.fn.load=function(e,n,r){if("string"!=typeof e&&Sn)return Sn.apply(this,arguments);var i,o,a,s=this,u=e.indexOf(" ");return u>=0&&(i=e.slice(u,e.length),e=e.slice(0,u)),b.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(a="POST"),s.length>0&&b.ajax({url:e,type:a,dataType:"html",data:n}).done(function(e){o=arguments,s.html(i?b("<div>").append(b.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},b.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){b.fn[t]=function(e){return this.on(t,e)}}),b.each(["get","post"],function(e,n){b[n]=function(e,r,i,o){return b.isFunction(r)&&(o=o||i,i=r,r=t),b.ajax({url:e,type:n,dataType:o,data:r,success:i})}}),b.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Nn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":b.parseJSON,"text xml":b.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Mn(Mn(e,b.ajaxSettings),t):Mn(b.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,u,l,c,p=b.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?b(f):b.event,h=b.Deferred(),g=b.Callbacks("once memory"),m=p.statusCode||{},y={},v={},x=0,T="canceled",N={readyState:0,getResponseHeader:function(e){var t;if(2===x){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===x?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return x||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return x||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>x)for(t in e)m[t]=[m[t],e[t]];else N.always(e[N.status]);return this},abort:function(e){var t=e||T;return l&&l.abort(t),k(0,t),this}};if(h.promise(N).complete=g.add,N.success=N.done,N.error=N.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=b.trim(p.dataType||"*").toLowerCase().match(w)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?80:443))==(mn[3]||("http:"===mn[1]?80:443)))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=b.param(p.data,p.traditional)),qn(An,p,n,N),2===x)return N;u=p.global,u&&0===b.active++&&b.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Cn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(b.lastModified[o]&&N.setRequestHeader("If-Modified-Since",b.lastModified[o]),b.etag[o]&&N.setRequestHeader("If-None-Match",b.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&N.setRequestHeader("Content-Type",p.contentType),N.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)N.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,N,p)===!1||2===x))return N.abort();T="abort";for(i in{success:1,error:1,complete:1})N[i](p[i]);if(l=qn(jn,p,n,N)){N.readyState=1,u&&d.trigger("ajaxSend",[N,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){N.abort("timeout")},p.timeout));try{x=1,l.send(y,k)}catch(C){if(!(2>x))throw C;k(-1,C)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,C=n;2!==x&&(x=2,s&&clearTimeout(s),l=t,a=i||"",N.readyState=e>0?4:0,r&&(w=_n(p,N,r)),e>=200&&300>e||304===e?(p.ifModified&&(T=N.getResponseHeader("Last-Modified"),T&&(b.lastModified[o]=T),T=N.getResponseHeader("etag"),T&&(b.etag[o]=T)),204===e?(c=!0,C="nocontent"):304===e?(c=!0,C="notmodified"):(c=Fn(p,w),C=c.state,y=c.data,v=c.error,c=!v)):(v=C,(e||!C)&&(C="error",0>e&&(e=0))),N.status=e,N.statusText=(n||C)+"",c?h.resolveWith(f,[y,C,N]):h.rejectWith(f,[N,C,v]),N.statusCode(m),m=t,u&&d.trigger(c?"ajaxSuccess":"ajaxError",[N,p,c?y:v]),g.fireWith(f,[N,C]),u&&(d.trigger("ajaxComplete",[N,p]),--b.active||b.event.trigger("ajaxStop")))}return N},getScript:function(e,n){return b.get(e,t,n,"script")},getJSON:function(e,t,n){return b.get(e,t,n,"json")}});function _n(e,n,r){var i,o,a,s,u=e.contents,l=e.dataTypes,c=e.responseFields;for(s in c)s in r&&(n[c[s]]=r[s]);while("*"===l[0])l.shift(),o===t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in u)if(u[s]&&u[s].test(o)){l.unshift(s);break}if(l[0]in r)a=l[0];else{for(s in r){if(!l[0]||e.converters[s+" "+l[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==l[0]&&l.unshift(a),r[a]):t}function Fn(e,t){var n,r,i,o,a={},s=0,u=e.dataTypes.slice(),l=u[0];if(e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u[1])for(i in e.converters)a[i.toLowerCase()]=e.converters[i];for(;r=u[++s];)if("*"!==r){if("*"!==l&&l!==r){if(i=a[l+" "+r]||a["* "+r],!i)for(n in a)if(o=n.split(" "),o[1]===r&&(i=a[l+" "+o[0]]||a["* "+o[0]])){i===!0?i=a[n]:a[n]!==!0&&(r=o[0],u.splice(s--,0,r));break}if(i!==!0)if(i&&e["throws"])t=i(t);else try{t=i(t)}catch(c){return{state:"parsererror",error:i?c:"No conversion from "+l+" to "+r}}}l=r}return{state:"success",data:t}}b.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return b.globalEval(e),e}}}),b.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),b.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=o.head||b("head")[0]||o.documentElement;return{send:function(t,i){n=o.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var On=[],Bn=/(=)\?(?=&|$)|\?\?/;b.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=On.pop()||b.expando+"_"+vn++;return this[e]=!0,e}}),b.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,u=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return u||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=b.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,u?n[u]=n[u].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||b.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,On.push(o)),s&&b.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}b.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=b.ajaxSettings.xhr(),b.support.cors=!!Rn&&"withCredentials"in Rn,Rn=b.support.ajax=!!Rn,Rn&&b.ajaxTransport(function(n){if(!n.crossDomain||b.support.cors){var r;return{send:function(i,o){var a,s,u=n.xhr();if(n.username?u.open(n.type,n.url,n.async,n.username,n.password):u.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)u[s]=n.xhrFields[s];n.mimeType&&u.overrideMimeType&&u.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)u.setRequestHeader(s,i[s])}catch(l){}u.send(n.hasContent&&n.data||null),r=function(e,i){var s,l,c,p;try{if(r&&(i||4===u.readyState))if(r=t,a&&(u.onreadystatechange=b.noop,$n&&delete Pn[a]),i)4!==u.readyState&&u.abort();else{p={},s=u.status,l=u.getAllResponseHeaders(),"string"==typeof u.responseText&&(p.text=u.responseText);try{c=u.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,l)},n.async?4===u.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},b(e).unload($n)),Pn[a]=r),u.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+x+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n,r,i=this.createTween(e,t),o=Yn.exec(t),a=i.cur(),s=+a||0,u=1,l=20;if(o){if(n=+o[2],r=o[3]||(b.cssNumber[e]?"":"px"),"px"!==r&&s){s=b.css(i.elem,e,!0)||n||1;do u=u||".5",s/=u,b.style(i.elem,e,s+r);while(u!==(u=i.cur()/a)&&1!==u&&--l)}i.unit=r,i.start=s,i.end=o[1]?s+(o[1]+1)*n:n}return i}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=b.now()}function Zn(e,t){b.each(t,function(t,n){var r=(Qn[t]||[]).concat(Qn["*"]),i=0,o=r.length;for(;o>i;i++)if(r[i].call(e,t,n))return})}function er(e,t,n){var r,i,o=0,a=Gn.length,s=b.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,a=0,u=l.tweens.length;for(;u>a;a++)l.tweens[a].run(o);return s.notifyWith(e,[l,o,n]),1>o&&u?n:(s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:b.extend({},t),opts:b.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=b.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)l.tweens[n].run(1);return t?s.resolveWith(e,[l,t]):s.rejectWith(e,[l,t]),this}}),c=l.props;for(tr(c,l.opts.specialEasing);a>o;o++)if(r=Gn[o].call(l,e,c,l.opts))return r;return Zn(l,c),b.isFunction(l.opts.start)&&l.opts.start.call(e,l),b.fx.timer(b.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function tr(e,t){var n,r,i,o,a;for(i in e)if(r=b.camelCase(i),o=t[r],n=e[i],b.isArray(n)&&(o=n[1],n=e[i]=n[0]),i!==r&&(e[r]=n,delete e[i]),a=b.cssHooks[r],a&&"expand"in a){n=a.expand(n),delete e[r];for(i in n)i in e||(e[i]=n[i],t[i]=o)}else t[r]=o}b.Animation=b.extend(er,{tweener:function(e,t){b.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,u,l,c,p,f=this,d=e.style,h={},g=[],m=e.nodeType&&nn(e);n.queue||(c=b._queueHooks(e,"fx"),null==c.unqueued&&(c.unqueued=0,p=c.empty.fire,c.empty.fire=function(){c.unqueued||p()}),c.unqueued++,f.always(function(){f.always(function(){c.unqueued--,b.queue(e,"fx").length||c.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[d.overflow,d.overflowX,d.overflowY],"inline"===b.css(e,"display")&&"none"===b.css(e,"float")&&(b.support.inlineBlockNeedsLayout&&"inline"!==un(e.nodeName)?d.zoom=1:d.display="inline-block")),n.overflow&&(d.overflow="hidden",b.support.shrinkWrapBlocks||f.always(function(){d.overflow=n.overflow[0],d.overflowX=n.overflow[1],d.overflowY=n.overflow[2]}));for(i in t)if(a=t[i],Vn.exec(a)){if(delete t[i],u=u||"toggle"===a,a===(m?"hide":"show"))continue;g.push(i)}if(o=g.length){s=b._data(e,"fxshow")||b._data(e,"fxshow",{}),"hidden"in s&&(m=s.hidden),u&&(s.hidden=!m),m?b(e).show():f.done(function(){b(e).hide()}),f.done(function(){var t;b._removeData(e,"fxshow");for(t in h)b.style(e,t,h[t])});for(i=0;o>i;i++)r=g[i],l=f.createTween(r,m?s[r]:0),h[r]=s[r]||b.style(e,r),r in s||(s[r]=l.start,m&&(l.end=l.start,l.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}b.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(b.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?b.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=b.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){b.fx.step[e.prop]?b.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[b.cssProps[e.prop]]||b.cssHooks[e.prop])?b.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scrollTop=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},b.each(["toggle","show","hide"],function(e,t){var n=b.fn[t];b.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),b.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=b.isEmptyObject(e),o=b.speed(t,n,r),a=function(){var t=er(this,b.extend({},e),o);a.finish=function(){t.stop(!0)},(i||b._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=b.timers,a=b._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&b.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=b._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=b.timers,a=r?r.length:0;for(n.finish=!0,b.queue(this,e,[]),i&&i.cur&&i.cur.finish&&i.cur.finish.call(this),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}b.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){b.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),b.speed=function(e,t,n){var r=e&&"object"==typeof e?b.extend({},e):{complete:n||!n&&t||b.isFunction(e)&&e,duration:e,easing:n&&t||t&&!b.isFunction(t)&&t};return r.duration=b.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in b.fx.speeds?b.fx.speeds[r.duration]:b.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){b.isFunction(r.old)&&r.old.call(this),r.queue&&b.dequeue(this,r.queue)},r},b.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},b.timers=[],b.fx=rr.prototype.init,b.fx.tick=function(){var e,n=b.timers,r=0;for(Xn=b.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||b.fx.stop(),Xn=t},b.fx.timer=function(e){e()&&b.timers.push(e)&&b.fx.start()},b.fx.interval=13,b.fx.start=function(){Un||(Un=setInterval(b.fx.tick,b.fx.interval))},b.fx.stop=function(){clearInterval(Un),Un=null},b.fx.speeds={slow:600,fast:200,_default:400},b.fx.step={},b.expr&&b.expr.filters&&(b.expr.filters.animated=function(e){return b.grep(b.timers,function(t){return e===t.elem}).length}),b.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){b.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,b.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},b.offset={setOffset:function(e,t,n){var r=b.css(e,"position");"static"===r&&(e.style.position="relative");var i=b(e),o=i.offset(),a=b.css(e,"top"),s=b.css(e,"left"),u=("absolute"===r||"fixed"===r)&&b.inArray("auto",[a,s])>-1,l={},c={},p,f;u?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),b.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(l.top=t.top-o.top+p),null!=t.left&&(l.left=t.left-o.left+f),"using"in t?t.using.call(e,l):i.css(l)}},b.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===b.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),b.nodeName(e[0],"html")||(n=e.offset()),n.top+=b.css(e[0],"borderTopWidth",!0),n.left+=b.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-b.css(r,"marginTop",!0),left:t.left-n.left-b.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||o.documentElement;while(e&&!b.nodeName(e,"html")&&"static"===b.css(e,"position"))e=e.offsetParent;return e||o.documentElement})}}),b.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);b.fn[e]=function(i){return b.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?b(a).scrollLeft():o,r?o:b(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return b.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}b.each({Height:"height",Width:"width"},function(e,n){b.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){b.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return b.access(this,function(n,r,i){var o;return b.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?b.css(n,r,s):b.style(n,r,i,s)},n,a?i:t,a,null)}})}),e.jQuery=e.$=b,"function"==typeof define&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return b})})(window);
\ No newline at end of file
diff --git a/framework/assets/yii.activeForm.js b/framework/assets/yii.activeForm.js
deleted file mode 100644
index d987879..0000000
--- a/framework/assets/yii.activeForm.js
+++ /dev/null
@@ -1,387 +0,0 @@
-/**
- * Yii form widget.
- *
- * This is the JavaScript widget used by the yii\widgets\ActiveForm widget.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-(function ($) {
-	
-	$.fn.yiiActiveForm = function (method) {
-		if (methods[method]) {
-			return methods[method].apply(this, Array.prototype.slice.call(arguments, 1));
-		} else if (typeof method === 'object' || !method) {
-			return methods.init.apply(this, arguments);
-		} else {
-			$.error('Method ' + method + ' does not exist on jQuery.yiiActiveForm');
-			return false;
-		}
-	};
-
-	var defaults = {
-		// the jQuery selector for the error summary
-		errorSummary: undefined,
-		// whether to perform validation before submitting the form.
-		validateOnSubmit: true,
-		// the container CSS class representing the corresponding attribute has validation error
-		errorCssClass: 'error',
-		// the container CSS class representing the corresponding attribute passes validation
-		successCssClass: 'success',
-		// the container CSS class representing the corresponding attribute is being validated
-		validatingCssClass: 'validating',
-		// the URL for performing AJAX-based validation. If not set, it will use the the form's action
-		validationUrl: undefined,
-		// a callback that is called before submitting the form. The signature of the callback should be:
-		// function ($form) { ...return false to cancel submission...}
-		beforeSubmit: undefined,
-		// a callback that is called before validating each attribute. The signature of the callback should be:
-		// function ($form, attribute, messages) { ...return false to cancel the validation...}
-		beforeValidate: undefined,
-		// the GET parameter name indicating an AJAX-based validation
-		ajaxVar: 'ajax'
-	};
-
-	var attributeDefaults = {
-		// attribute name or expression (e.g. "[0]content" for tabular input)
-		name: undefined,
-		// the jQuery selector of the container of the input field
-		container: undefined,
-		// the jQuery selector of the input field
-		input: undefined,
-		// the jQuery selector of the error tag
-		error: undefined,
-		// whether to perform validation when a change is detected on the input
-		validateOnChange: false,
-		// whether to perform validation when the user is typing.
-   		validateOnType: false,
-		// number of milliseconds that the validation should be delayed when a user is typing in the input field.
-		validationDelay: 200,
-		// whether to enable AJAX-based validation.
-		enableAjaxValidation: false,
-		// function (attribute, value, messages), the client-side validation function.
-		validate: undefined,
-		// status of the input field, 0: empty, not entered before, 1: validated, 2: pending validation, 3: validating
-		status: 0,
-		// the value of the input
-		value: undefined
-	};
-
-	var methods = {
-		init: function (attributes, options) {
-			return this.each(function () {
-				var $form = $(this);
-				if ($form.data('yiiActiveForm')) {
-					return;
-				}
-
-				var settings = $.extend({}, defaults, options || {});
-				if (settings.validationUrl === undefined) {
-					settings.validationUrl = $form.attr('action');
-				}
-				$.each(attributes, function (i) {
-					attributes[i] = $.extend({value: getValue($form, this)}, attributeDefaults, this);
-				});
-				$form.data('yiiActiveForm', {
-					settings: settings,
-					attributes: attributes,
-					submitting: false,
-					validated: false
-				});
-
-				watchAttributes($form, attributes);
-
-				/**
-				 * Clean up error status when the form is reset.
-				 * Note that $form.on('reset', ...) does work because the "reset" event does not bubble on IE.
-				 */
-				$form.bind('reset.yiiActiveForm', methods.resetForm);
-
-				if (settings.validateOnSubmit) {
-					$form.on('mouseup.yiiActiveForm keyup.yiiActiveForm', ':submit', function () {
-						$form.data('yiiActiveForm').submitObject = $(this);
-					});
-					$form.on('submit', methods.submitForm);
-				}
-			});
-		},
-
-		destroy: function () {
-			return this.each(function () {
-				$(window).unbind('.yiiActiveForm');
-				$(this).removeData('yiiActiveForm');
-			});
-		},
-
-		data: function() {
-			return this.data('yiiActiveForm');
-		},
-
-		submitForm: function () {
-			var $form = $(this),
-				data = $form.data('yiiActiveForm');
-			if (data.validated) {
-				// continue submitting the form since validation passes
-				data.validated = false;
-				return true;
-			}
-
-			if (data.settings.timer !== undefined) {
-				clearTimeout(data.settings.timer);
-			}
-			data.submitting = true;
-			if (!data.settings.beforeSubmit || data.settings.beforeSubmit($form)) {
-				validate($form, function (messages) {
-					var hasError = false;
-					$.each(data.attributes, function () {
-						hasError = updateInput($form, this, messages) || hasError;
-					});
-					updateSummary($form, messages);
-					if (!hasError) {
-						data.validated = true;
-						var $button = data.submitObject || $form.find(':submit:first');
-						// TODO: if the submission is caused by "change" event, it will not work
-						if ($button.length) {
-							$button.click();
-						} else {
-							// no submit button in the form
-							$form.submit();
-						}
-						return;
-					}
-					data.submitting = false;
-				}, function () {
-					data.submitting = false;
-				});
-			} else {
-				data.submitting = false;
-			}
-			return false;
-		},
-
-		resetForm: function () {
-			var $form = $(this);
-			var data = $form.data('yiiActiveForm');
-			// Because we bind directly to a form reset event instead of a reset button (that may not exist),
-			// when this function is executed form input values have not been reset yet.
-			// Therefore we do the actual reset work through setTimeout.
-			setTimeout(function () {
-				$.each(data.attributes, function () {
-					// Without setTimeout() we would get the input values that are not reset yet.
-					this.value = getValue($form, this);
-					this.status = 0;
-					var $container = $form.find(this.container);
-					$container.removeClass(
-						data.settings.validatingCssClass + ' ' +
-							data.settings.errorCssClass + ' ' +
-							data.settings.successCssClass
-					);
-					$container.find(this.error).html('');
-				});
-				$form.find(data.settings.summary).hide().find('ul').html('');
-			}, 1);
-		}
-	};
-
-	var watchAttributes = function ($form, attributes) {
-		$.each(attributes, function (i, attribute) {
-			var $input = findInput($form, attribute);
-			if (attribute.validateOnChange) {
-				$input.on('change.yiiActiveForm', function () {
-					validateAttribute($form, attribute, false);
-				}).on('blur.yiiActiveForm', function () {
-					if (attribute.status == 0 || attribute.status == 1) {
-						validateAttribute($form, attribute, !attribute.status);
-					}
-				});
-			}
-			if (attribute.validateOnType) {
-				$input.on('keyup.yiiActiveForm', function () {
-					if (attribute.value !== getValue($form, attribute)) {
-						validateAttribute($form, attribute, false);
-					}
-				});
-			}
-		});
-	};
-
-	var validateAttribute = function ($form, attribute, forceValidate) {
-		var data = $form.data('yiiActiveForm');
-
-		if (forceValidate) {
-			attribute.status = 2;
-		}
-		$.each(data.attributes, function () {
-			if (this.value !== getValue($form, this)) {
-				this.status = 2;
-				forceValidate = true;
-			}
-		});
-		if (!forceValidate) {
-			return;
-		}
-
-		if (data.settings.timer !== undefined) {
-			clearTimeout(data.settings.timer);
-		}
-		data.settings.timer = setTimeout(function () {
-			if (data.submitting || $form.is(':hidden')) {
-				return;
-			}
-			$.each(data.attributes, function () {
-				if (this.status === 2) {
-					this.status = 3;
-					$form.find(this.container).addClass(data.settings.validatingCssClass);
-				}
-			});
-			validate($form, function (messages) {
-				var hasError = false;
-				$.each(data.attributes, function () {
-					if (this.status === 2 || this.status === 3) {
-						hasError = updateInput($form, this, messages) || hasError;
-					}
-				});
-			});
-		}, data.settings.validationDelay);
-	};
-	
-	/**
-	 * Performs validation.
-	 * @param $form jQuery the jquery representation of the form
-	 * @param successCallback function the function to be invoked if the validation completes
-	 * @param errorCallback function the function to be invoked if the ajax validation request fails
-	 */
-	var validate = function ($form, successCallback, errorCallback) {
-		var data = $form.data('yiiActiveForm'),
-			needAjaxValidation = false,
-			messages = {};
-
-		$.each(data.attributes, function () {
-			if (data.submitting || this.status === 2 || this.status === 3) {
-				var msg = [];
-				if (!data.settings.beforeValidate || data.settings.beforeValidate($form, this, msg)) {
-					if (this.validate) {
-						this.validate(this, getValue($form, this), msg);
-					}
-					if (msg.length) {
-						messages[this.name] = msg;
-					} else if (this.enableAjaxValidation) {
-						needAjaxValidation = true;
-					}
-				}
-			}
-		});
-
-		if (needAjaxValidation && (!data.submitting || $.isEmptyObject(messages))) {
-			// Perform ajax validation when at least one input needs it.
-			// If the validation is triggered by form submission, ajax validation
-			// should be done only when all inputs pass client validation
-			var $button = data.submitObject,
-				extData = '&' + data.settings.ajaxVar + '=' + $form.attr('id');
-			if ($button && $button.length && $button.attr('name')) {
-				extData += '&' + $button.attr('name') + '=' + $button.attr('value');
-			}
-			$.ajax({
-				url: data.settings.validationUrl,
-				type: $form.attr('method'),
-				data: $form.serialize() + extData,
-				dataType: 'json',
-				success: function (msgs) {
-					if (msgs !== null && typeof msgs === 'object') {
-						$.each(data.attributes, function () {
-							if (!this.enableAjaxValidation) {
-								delete msgs[this.name];
-							}
-						});
-						successCallback($.extend({}, messages, msgs));
-					} else {
-						successCallback(messages);
-					}
-				},
-				error: errorCallback
-			});
-		} else if (data.submitting) {
-			// delay callback so that the form can be submitted without problem
-			setTimeout(function () {
-				successCallback(messages);
-			}, 200);
-		} else {
-			successCallback(messages);
-		}
-	};
-
-	/**
-	 * Updates the error message and the input container for a particular attribute.
-	 * @param $form the form jQuery object
-	 * @param attribute object the configuration for a particular attribute.
-	 * @param messages array the validation error messages
-	 * @return boolean whether there is a validation error for the specified attribute
-	 */
-	var updateInput = function ($form, attribute, messages) {
-		var data = $form.data('yiiActiveForm'),
-			$input = findInput($form, attribute),
-			hasError = false;
-
-		attribute.status = 1;
-		if ($input.length) {
-			hasError = messages && $.isArray(messages[attribute.name]) && messages[attribute.name].length;
-			var $container = $form.find(attribute.container);
-			var $error = $container.find(attribute.error);
-			if (hasError) {
-				$error.html(messages[attribute.name][0]);
-				$container.removeClass(data.settings.validatingCssClass + ' ' + data.settings.successCssClass)
-					.addClass(data.settings.errorCssClass);
-			} else {
-				$error.html('');
-				$container.removeClass(data.settings.validatingCssClass + ' ' + data.settings.errorCssClass + ' ')
-					.addClass(data.settings.successCssClass);
-			}
-			attribute.value = getValue($form, attribute);
-		}
-		return hasError;
-	};
-
-	/**
-	 * Updates the error summary.
-	 * @param $form the form jQuery object
-	 * @param messages array the validation error messages
-	 */
-	var updateSummary = function ($form, messages) {
-		var data = $form.data('yiiActiveForm'),
-			$summary = $form.find(data.settings.errorSummary),
-			content = '';
-
-		if ($summary.length && messages) {
-			$.each(data.attributes, function () {
-				if ($.isArray(messages[this.name]) && messages[this.name].length) {
-					content += '<li>' + messages[this.name][0] + '</li>';
-				}
-			});
-			$summary.toggle(content !== '').find('ul').html(content);
-		}
-	};
-
-	var getValue = function ($form, attribute) {
-		var $input = findInput($form, attribute);
-		var type = $input.attr('type');
-		if (type === 'checkbox' || type === 'radio') {
-			return $input.filter(':checked').val();
-		} else {
-			return $input.val();
-		}
-	};
-
-	var findInput = function ($form, attribute) {
-		var $input = $form.find(attribute.input);
-		if ($input.length && $input[0].tagName.toLowerCase() === 'div') {
-			// checkbox list or radio list
-			return $input.find('input');
-		} else {
-			return $input;
-		}
-	};
-
-})(window.jQuery);
diff --git a/framework/assets/yii.captcha.js b/framework/assets/yii.captcha.js
deleted file mode 100644
index 9211edb..0000000
--- a/framework/assets/yii.captcha.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * Yii Captcha widget.
- *
- * This is the JavaScript widget used by the yii\widgets\Captcha widget.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-(function ($) {
-	$.fn.yiiCaptcha = function (method) {
-		if (methods[method]) {
-			return methods[method].apply(this, Array.prototype.slice.call(arguments, 1));
-		} else if (typeof method === 'object' || !method) {
-			return methods.init.apply(this, arguments);
-		} else {
-			$.error('Method ' + method + ' does not exist on jQuery.yiiCaptcha');
-			return false;
-		}
-	};
-
-	var defaults = {
-		refreshUrl: undefined,
-		hashKey: undefined
-	};
-
-	var methods = {
-		init: function (options) {
-			return this.each(function () {
-				var $e = $(this);
-				var settings = $.extend({}, defaults, options || {});
-				$e.data('yiiCaptcha', {
-					settings: settings
-				});
-
-				$e.on('click.yiiCaptcha', function() {
-					methods.refresh.apply($e);
-					return false;
-				});
-
-			});
-		},
-
-		refresh: function () {
-			var $e = this,
-				settings = this.data('yiiCaptcha').settings;
-			$.ajax({
-				url: $e.data('yiiCaptcha').settings.refreshUrl,
-				dataType: 'json',
-				cache: false,
-				success: function(data) {
-					$e.attr('src', data['url']);
-					$('body').data(settings.hashKey, [data['hash1'], data['hash2']]);
-				}
-			});
-		},
-
-		destroy: function () {
-			return this.each(function () {
-				$(window).unbind('.yiiCaptcha');
-				$(this).removeData('yiiCaptcha');
-			});
-		},
-
-		data: function() {
-			return this.data('yiiCaptcha');
-		}
-	};
-})(window.jQuery);
-
diff --git a/framework/assets/yii.debug.js b/framework/assets/yii.debug.js
deleted file mode 100644
index 4e32d89..0000000
--- a/framework/assets/yii.debug.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Yii debug module.
- *
- * This JavaScript module provides the functions needed by the Yii debug toolbar.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-
-yii.debug = (function ($) {
-	return {
-		load: function (id, url) {
-			$.ajax({
-				url: url,
-				//dataType: 'json',
-				success: function(data) {
-					var $e = $('#' + id);
-					$e.html(data);
-				}
-			});
-		}
-	};
-})(jQuery);
diff --git a/framework/assets/yii.js b/framework/assets/yii.js
deleted file mode 100644
index 1e847c4..0000000
--- a/framework/assets/yii.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * Yii JavaScript module.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-
-/**
- * yii is the root module for all Yii JavaScript modules.
- * It implements a mechanism of organizing JavaScript code in modules through the function "yii.initModule()".
- *
- * Each module should be named as "x.y.z", where "x" stands for the root module (for the Yii core code, this is "yii").
- *
- * A module may be structured as follows:
- *
- * ~~~
- * yii.sample = (function($) {
- *     var pub = {
- *         // whether this module is currently active. If false, init() will not be called for this module
- *         // it will also not be called for all its child modules. If this property is undefined, it means true.
- *         isActive: true,
- *         init: function() {
- *             // ... module initialization code go here ...
- *         },
- *
- *         // ... other public functions and properties go here ...
- *     };
- *
- *     // ... private functions and properties go here ...
- *
- *     return pub;
- * });
- * ~~~
- *
- * Using this structure, you can define public and private functions/properties for a module.
- * Private functions/properties are only visible within the module, while public functions/properties
- * may be accessed outside of the module. For example, you can access "yii.sample.init()".
- *
- * You must call "yii.initModule()" once for the root module of all your modules.
- */
-yii = (function ($) {
-	var pub = {
-		version: '2.0',
-		initModule: function (module) {
-			if (module.isActive === undefined || module.isActive) {
-				if ($.isFunction(module.init)) {
-					module.init();
-				}
-				$.each(module, function () {
-					if ($.isPlainObject(this)) {
-						pub.initModule(this);
-					}
-				});
-			}
-		}
-	};
-	return pub;
-})(jQuery);
-
-jQuery(document).ready(function () {
-	yii.initModule(yii);
-});
diff --git a/framework/assets/yii.validation.js b/framework/assets/yii.validation.js
deleted file mode 100644
index 5fa8492..0000000
--- a/framework/assets/yii.validation.js
+++ /dev/null
@@ -1,198 +0,0 @@
-/**
- * Yii validation module.
- *
- * This JavaScript module provides the validation methods for the built-in validators.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-
-yii.validation = (function ($) {
-	var isEmpty = function (value, trim) {
-		return value === null || value === undefined || value == []
-			|| value === '' || trim && $.trim(value) === '';
-	};
-
-	return {
-		required: function (value, messages, options) {
-			var valid = false;
-			if (options.requiredValue === undefined) {
-				if (options.strict && value !== undefined || !options.strict && !isEmpty(value, true)) {
-					valid = true;
-				}
-			} else if (!options.strict && value == options.requiredValue || options.strict && value === options.requiredValue) {
-				valid = true;
-			}
-
-			if (!valid) {
-				messages.push(options.message);
-			}
-		},
-
-		boolean: function (value, messages, options) {
-			if (options.skipOnEmpty && isEmpty(value)) {
-				return;
-			}
-			var valid = !options.strict && (value == options.trueValue || value == options.falseValue)
-				|| options.strict && (value === options.trueValue || value === options.falseValue);
-
-			if (!valid) {
-				messages.push(options.message);
-			}
-		},
-
-		string: function (value, messages, options) {
-			if (options.skipOnEmpty && isEmpty(value)) {
-				return;
-			}
-
-			if (typeof value !== 'string') {
-				messages.push(options.message);
-				return;
-			}
-
-			if (options.min !== undefined && value.length < options.min) {
-				messages.push(options.tooShort);
-			}
-			if (options.max !== undefined && value.length > options.max) {
-				messages.push(options.tooLong);
-			}
-			if (options.is !== undefined && value.length != options.is) {
-				messages.push(options.is);
-			}
-		},
-
-		number: function (value, messages, options) {
-			if (options.skipOnEmpty && isEmpty(value)) {
-				return;
-			}
-
-			if (typeof value === 'string' && !value.match(options.pattern)) {
-				messages.push(options.message);
-				return;
-			}
-
-			if (options.min !== undefined && value < options.min) {
-				messages.push(options.tooSmall);
-			}
-			if (options.max !== undefined && value > options.max) {
-				messages.push(options.tooBig);
-			}
-		},
-
-		range: function (value, messages, options) {
-			if (options.skipOnEmpty && isEmpty(value)) {
-				return;
-			}
-			var valid = !options.not && $.inArray(value, options.range)
-				|| options.not && !$.inArray(value, options.range);
-
-			if (!valid) {
-				messages.push(options.message);
-			}
-		},
-
-		regularExpression: function (value, messages, options) {
-			if (options.skipOnEmpty && isEmpty(value)) {
-				return;
-			}
-
-			if (!options.not && !value.match(options.pattern) || options.not && value.match(options.pattern)) {
-				messages.push(options.message)
-			}
-		},
-
-		email: function (value, messages, options) {
-			if (options.skipOnEmpty && isEmpty(value)) {
-				return;
-			}
-
-			var valid = value.match(options.pattern) && (!options.allowName || value.match(options.fullPattern));
-
-			if (!valid) {
-				messages.push(options.message);
-			}
-		},
-
-		url: function (value, messages, options) {
-			if (options.skipOnEmpty && isEmpty(value)) {
-				return;
-			}
-
-			if (options.defaultScheme && !value.match(/:\/\//)) {
-				value = options.defaultScheme + '://' + value;
-			}
-
-			if (!value.match(options.pattern)) {
-				messages.push(options.message);
-			}
-		},
-
-		captcha: function (value, messages, options) {
-			if (options.skipOnEmpty && isEmpty(value)) {
-				return;
-			}
-
-			// CAPTCHA may be updated via AJAX and the updated hash is stored in body data
-			var hash = $('body').data(options.hashKey);
-			if (hash == null) {
-				hash = options.hash;
-			} else {
-				hash = hash[options.caseSensitive ? 0 : 1];
-			}
-			var v = options.caseSensitive ? value : value.toLowerCase();
-			for (var i = v.length - 1, h = 0; i >= 0; --i) {
-				h += v.charCodeAt(i);
-			}
-			if (h != hash) {
-				messages.push(options.message);
-			}
-		},
-
-		compare: function (value, messages, options) {
-			if (options.skipOnEmpty && isEmpty(value)) {
-				return;
-			}
-
-			var compareValue, valid = true;
-			if (options.compareAttribute === undefined) {
-				compareValue = options.compareValue;
-			} else {
-				compareValue = $('#' + options.compareAttribute).val();
-			}
-			switch (options.operator) {
-				case '==':
-					valid = value == compareValue;
-					break;
-				case '===':
-					valid = value === compareValue;
-					break;
-				case '!=':
-					valid = value != compareValue;
-					break;
-				case '!==':
-					valid = value !== compareValue;
-					break;
-				case '>':
-					valid = value > compareValue;
-					break;
-				case '>=':
-					valid = value >= compareValue;
-					break;
-				case '<':
-					valid = value < compareValue;
-					break;
-				case '<=':
-					valid = value <= compareValue;
-					break;
-			}
-
-			if (!valid) {
-				messages.push(options.message);
-			}
-		}
-	};
-})(jQuery);
diff --git a/framework/base/Action.php b/framework/base/Action.php
deleted file mode 100644
index 7142539..0000000
--- a/framework/base/Action.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-/**
- * Action is the base class for all controller action classes.
- *
- * Action provides a way to divide a complex controller into
- * smaller actions in separate class files.
- *
- * Derived classes must implement a method named `run()`. This method
- * will be invoked by the controller when the action is requested.
- * The `run()` method can have parameters which will be filled up
- * with user input values automatically according to their names.
- * For example, if the `run()` method is declared as follows:
- *
- * ~~~
- * public function run($id, $type = 'book') { ... }
- * ~~~
- *
- * And the parameters provided for the action are: `array('id' => 1)`.
- * Then the `run()` method will be invoked as `run(1)` automatically.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Action extends Component
-{
-	/**
-	 * @var string ID of the action
-	 */
-	public $id;
-	/**
-	 * @var Controller the controller that owns this action
-	 */
-	public $controller;
-
-	/**
-	 * Constructor.
-	 * @param string $id the ID of this action
-	 * @param Controller $controller the controller that owns this action
-	 * @param array $config name-value pairs that will be used to initialize the object properties
-	 */
-	public function __construct($id, $controller, $config = array())
-	{
-		$this->id = $id;
-		$this->controller = $controller;
-		parent::__construct($config);
-	}
-
-	/**
-	 * Returns the unique ID of this action among the whole application.
-	 * @return string the unique ID of this action among the whole application.
-	 */
-	public function getUniqueId()
-	{
-		return $this->controller->getUniqueId() . '/' . $this->id;
-	}
-
-	/**
-	 * Runs this action with the specified parameters.
-	 * This method is mainly invoked by the controller.
-	 * @param array $params the parameters to be bound to the action's run() method.
-	 * @return integer the exit status (0 means normal, non-zero means abnormal).
-	 * @throws InvalidConfigException if the action class does not have a run() method
-	 */
-	public function runWithParams($params)
-	{
-		if (!method_exists($this, 'run')) {
-			throw new InvalidConfigException(get_class($this) . ' must define a "run()" method.');
-		}
-		$args = $this->controller->bindActionParams($this, $params);
-		return (int)call_user_func_array(array($this, 'run'), $args);
-	}
-}
diff --git a/framework/base/ActionEvent.php b/framework/base/ActionEvent.php
deleted file mode 100644
index 9507b12..0000000
--- a/framework/base/ActionEvent.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-/**
- * ActionEvent represents the event parameter used for an action event.
- *
- * By setting the [[isValid]] property, one may control whether to continue running the action.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class ActionEvent extends Event
-{
-	/**
-	 * @var Action the action currently being executed
-	 */
-	public $action;
-	/**
-	 * @var boolean whether to continue running the action. Event handlers of
-	 * [[Controller::EVENT_BEFORE_ACTION]] may set this property to decide whether
-	 * to continue running the current action.
-	 */
-	public $isValid = true;
-
-	/**
-	 * Constructor.
-	 * @param Action $action the action associated with this action event.
-	 * @param array $config name-value pairs that will be used to initialize the object properties
-	 */
-	public function __construct($action, $config = array())
-	{
-		$this->action = $action;
-		parent::__construct($config);
-	}
-}
diff --git a/framework/base/ActionFilter.php b/framework/base/ActionFilter.php
deleted file mode 100644
index d69c0fe..0000000
--- a/framework/base/ActionFilter.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-/**
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class ActionFilter extends Behavior
-{
-	/**
-	 * @var array list of action IDs that this filter should apply to. If this property is not set,
-	 * then the filter applies to all actions, unless they are listed in [[except]].
-	 */
-	public $only;
-	/**
-	 * @var array list of action IDs that this filter should not apply to.
-	 */
-	public $except = array();
-
-	/**
-	 * Declares event handlers for the [[owner]]'s events.
-	 * @return array events (array keys) and the corresponding event handler methods (array values).
-	 */
-	public function events()
-	{
-		return array(
-			'beforeAction' => 'beforeFilter',
-			'afterAction' => 'afterFilter',
-		);
-	}
-
-	/**
-	 * @param ActionEvent $event
-	 * @return boolean
-	 */
-	public function beforeFilter($event)
-	{
-		if ($this->isActive($event->action)) {
-			$event->isValid = $this->beforeAction($event->action);
-		}
-		return $event->isValid;
-	}
-
-	/**
-	 * @param ActionEvent $event
-	 * @return boolean
-	 */
-	public function afterFilter($event)
-	{
-		if ($this->isActive($event->action)) {
-			$this->afterAction($event->action);
-		}
-	}
-
-	/**
-	 * This method is invoked right before an action is to be executed (after all possible filters.)
-	 * You may override this method to do last-minute preparation for the action.
-	 * @param Action $action the action to be executed.
-	 * @return boolean whether the action should continue to be executed.
-	 */
-	public function beforeAction($action)
-	{
-		return true;
-	}
-
-	/**
-	 * This method is invoked right after an action is executed.
-	 * You may override this method to do some postprocessing for the action.
-	 * @param Action $action the action just executed.
-	 */
-	public function afterAction($action)
-	{
-	}
-
-	/**
-	 * Returns a value indicating whether the filer is active for the given action.
-	 * @param Action $action the action being filtered
-	 * @return boolean whether the filer is active for the given action.
-	 */
-	protected function isActive($action)
-	{
-		return !in_array($action->id, $this->except, true) && (empty($this->only) || in_array($action->id, $this->only, true));
-	}
-}
diff --git a/framework/base/Application.php b/framework/base/Application.php
deleted file mode 100644
index ac7cc6a..0000000
--- a/framework/base/Application.php
+++ /dev/null
@@ -1,463 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-use Yii;
-
-/**
- * Application is the base class for all application classes.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Application extends Module
-{
-	const EVENT_BEFORE_REQUEST = 'beforeRequest';
-	const EVENT_AFTER_REQUEST = 'afterRequest';
-	/**
-	 * @var string the application name.
-	 */
-	public $name = 'My Application';
-	/**
-	 * @var string the version of this application.
-	 */
-	public $version = '1.0';
-	/**
-	 * @var string the charset currently used for the application.
-	 */
-	public $charset = 'UTF-8';
-	/**
-	 * @var string the language that is meant to be used for end users.
-	 * @see sourceLanguage
-	 */
-	public $language = 'en_US';
-	/**
-	 * @var string the language that the application is written in. This mainly refers to
-	 * the language that the messages and view files are written in.
-	 * @see language
-	 */
-	public $sourceLanguage = 'en_US';
-	/**
-	 * @var array IDs of the components that need to be loaded when the application starts.
-	 */
-	public $preload = array();
-	/**
-	 * @var \yii\web\Controller|\yii\console\Controller the currently active controller instance
-	 */
-	public $controller;
-	/**
-	 * @var mixed the layout that should be applied for views in this application. Defaults to 'main'.
-	 * If this is false, layout will be disabled.
-	 */
-	public $layout = 'main';
-
-	private $_ended = false;
-
-	/**
-	 * @var string Used to reserve memory for fatal error handler.
-	 */
-	private $_memoryReserve;
-
-	/**
-	 * Constructor.
-	 * @param array $config name-value pairs that will be used to initialize the object properties.
-	 * Note that the configuration must contain both [[id]] and [[basePath]].
-	 * @throws InvalidConfigException if either [[id]] or [[basePath]] configuration is missing.
-	 */
-	public function __construct($config = array())
-	{
-		Yii::$app = $this;
-
-		if (!isset($config['id'])) {
-			throw new InvalidConfigException('The "id" configuration is required.');
-		}
-
-		if (isset($config['basePath'])) {
-			$this->setBasePath($config['basePath']);
-			Yii::setAlias('@app', $this->getBasePath());
-			unset($config['basePath']);
-		} else {
-			throw new InvalidConfigException('The "basePath" configuration is required.');
-		}
-
-		$this->registerErrorHandlers();
-		$this->registerCoreComponents();
-
-		Component::__construct($config);
-	}
-
-	/**
-	 * Registers error handlers.
-	 */
-	public function registerErrorHandlers()
-	{
-		if (YII_ENABLE_ERROR_HANDLER) {
-			ini_set('display_errors', 0);
-			set_exception_handler(array($this, 'handleException'));
-			set_error_handler(array($this, 'handleError'), error_reporting());
-		}
-	}
-
-	/**
-	 * Terminates the application.
-	 * This method replaces PHP's exit() function by calling [[afterRequest()]] before exiting.
-	 * @param integer $status exit status (value 0 means normal exit while other values mean abnormal exit).
-	 * @param boolean $exit whether to exit the current request.
-	 * It defaults to true, meaning the PHP's exit() function will be called at the end of this method.
-	 */
-	public function end($status = 0, $exit = true)
-	{
-		if (!$this->_ended) {
-			$this->_ended = true;
-			$this->afterRequest();
-		}
-
-		$this->handleFatalError();
-
-		if ($exit) {
-			exit($status);
-		}
-	}
-
-	/**
-	 * Runs the application.
-	 * This is the main entrance of an application.
-	 * @return integer the exit status (0 means normal, non-zero values mean abnormal)
-	 */
-	public function run()
-	{
-		$this->beforeRequest();
-		// Allocating twice more than required to display memory exhausted error
-		// in case of trying to allocate last 1 byte while all memory is taken.
-		$this->_memoryReserve = str_repeat('x', 1024 * 256);
-		register_shutdown_function(array($this, 'end'), 0, false);
-		$status = $this->processRequest();
-		$this->afterRequest();
-		return $status;
-	}
-
-	/**
-	 * Raises the [[EVENT_BEFORE_REQUEST]] event right BEFORE the application processes the request.
-	 */
-	public function beforeRequest()
-	{
-		$this->trigger(self::EVENT_BEFORE_REQUEST);
-	}
-
-	/**
-	 * Raises the [[EVENT_AFTER_REQUEST]] event right AFTER the application processes the request.
-	 */
-	public function afterRequest()
-	{
-		$this->trigger(self::EVENT_AFTER_REQUEST);
-	}
-
-	/**
-	 * Processes the request.
-	 * Child classes should override this method with actual request processing logic.
-	 * @return integer the exit status of the controller action (0 means normal, non-zero values mean abnormal)
-	 */
-	public function processRequest()
-	{
-		return 0;
-	}
-
-	private $_runtimePath;
-
-	/**
-	 * Returns the directory that stores runtime files.
-	 * @return string the directory that stores runtime files. Defaults to 'protected/runtime'.
-	 */
-	public function getRuntimePath()
-	{
-		if ($this->_runtimePath === null) {
-			$this->setRuntimePath($this->getBasePath() . DIRECTORY_SEPARATOR . 'runtime');
-		}
-		return $this->_runtimePath;
-	}
-
-	/**
-	 * Sets the directory that stores runtime files.
-	 * @param string $path the directory that stores runtime files.
-	 * @throws InvalidConfigException if the directory does not exist or is not writable
-	 */
-	public function setRuntimePath($path)
-	{
-		$path = Yii::getAlias($path);
-		if (is_dir($path) && is_writable($path)) {
-			$this->_runtimePath = $path;
-		} else {
-			throw new InvalidConfigException("Runtime path must be a directory writable by the Web server process: $path");
-		}
-	}
-
-	private $_vendorPath;
-
-	/**
-	 * Returns the directory that stores vendor files.
-	 * @return string the directory that stores vendor files. Defaults to 'protected/vendor'.
-	 */
-	public function getVendorPath()
-	{
-		if ($this->_vendorPath === null) {
-			$this->setVendorPath($this->getBasePath() . DIRECTORY_SEPARATOR . 'vendor');
-		}
-		return $this->_vendorPath;
-	}
-
-	/**
-	 * Sets the directory that stores vendor files.
-	 * @param string $path the directory that stores vendor files.
-	 */
-	public function setVendorPath($path)
-	{
-		$this->_vendorPath = Yii::getAlias($path);
-	}
-
-	/**
-	 * Returns the time zone used by this application.
-	 * This is a simple wrapper of PHP function date_default_timezone_get().
-	 * @return string the time zone used by this application.
-	 * @see http://php.net/manual/en/function.date-default-timezone-get.php
-	 */
-	public function getTimeZone()
-	{
-		return date_default_timezone_get();
-	}
-
-	/**
-	 * Sets the time zone used by this application.
-	 * This is a simple wrapper of PHP function date_default_timezone_set().
-	 * @param string $value the time zone used by this application.
-	 * @see http://php.net/manual/en/function.date-default-timezone-set.php
-	 */
-	public function setTimeZone($value)
-	{
-		date_default_timezone_set($value);
-	}
-
-	/**
-	 * Returns the database connection component.
-	 * @return \yii\db\Connection the database connection
-	 */
-	public function getDb()
-	{
-		return $this->getComponent('db');
-	}
-
-	/**
-	 * Returns the error handler component.
-	 * @return ErrorHandler the error handler application component.
-	 */
-	public function getErrorHandler()
-	{
-		return $this->getComponent('errorHandler');
-	}
-
-	/**
-	 * Returns the cache component.
-	 * @return \yii\caching\Cache the cache application component. Null if the component is not enabled.
-	 */
-	public function getCache()
-	{
-		return $this->getComponent('cache');
-	}
-
-	/**
-	 * Returns the request component.
-	 * @return \yii\web\Request|\yii\console\Request the request component
-	 */
-	public function getRequest()
-	{
-		return $this->getComponent('request');
-	}
-
-	/**
-	 * Returns the view object.
-	 * @return View the view object that is used to render various view files.
-	 */
-	public function getView()
-	{
-		return $this->getComponent('view');
-	}
-
-	/**
-	 * Returns the URL manager for this application.
-	 * @return \yii\web\UrlManager the URL manager for this application.
-	 */
-	public function getUrlManager()
-	{
-		return $this->getComponent('urlManager');
-	}
-
-	/**
-	 * Returns the internationalization (i18n) component
-	 * @return \yii\i18n\I18N the internationalization component
-	 */
-	public function getI18N()
-	{
-		return $this->getComponent('i18n');
-	}
-
-	/**
-	 * @return null|Component
-	 * @todo
-	 */
-	public function getAuthManager()
-	{
-		return $this->getComponent('auth');
-	}
-
-	/**
-	 * Registers the core application components.
-	 * @see setComponents
-	 */
-	public function registerCoreComponents()
-	{
-		$this->setComponents(array(
-			'errorHandler' => array(
-				'class' => 'yii\base\ErrorHandler',
-			),
-			'i18n' => array(
-				'class' => 'yii\i18n\I18N',
-			),
-			'urlManager' => array(
-				'class' => 'yii\web\UrlManager',
-			),
-			'view' => array(
-				'class' => 'yii\base\View',
-			),
-		));
-	}
-
-	/**
-	 * Handles uncaught PHP exceptions.
-	 *
-	 * This method is implemented as a PHP exception handler. It requires
-	 * that constant YII_ENABLE_ERROR_HANDLER be defined true.
-	 *
-	 * @param \Exception $exception exception that is not caught
-	 */
-	public function handleException($exception)
-	{
-		// disable error capturing to avoid recursive errors while handling exceptions
-		restore_error_handler();
-		restore_exception_handler();
-
-		try {
-			$this->logException($exception);
-
-			if (($handler = $this->getErrorHandler()) !== null) {
-				$handler->handle($exception);
-			} else {
-				$this->renderException($exception);
-			}
-
-			$this->end(1);
-
-		} catch (\Exception $e) {
-			// exception could be thrown in end() or ErrorHandler::handle()
-			$msg = (string)$e;
-			$msg .= "\nPrevious exception:\n";
-			$msg .= (string)$exception;
-			if (YII_DEBUG) {
-				echo $msg;
-			}
-			$msg .= "\n\$_SERVER = " . var_export($_SERVER, true);
-			error_log($msg);
-			exit(1);
-		}
-	}
-
-	/**
-	 * Handles PHP execution errors such as warnings, notices.
-	 *
-	 * This method is used as a PHP error handler. It will simply raise an `ErrorException`.
-	 *
-	 * @param integer $code the level of the error raised
-	 * @param string $message the error message
-	 * @param string $file the filename that the error was raised in
-	 * @param integer $line the line number the error was raised at
-	 *
-	 * @throws ErrorException
-	 */
-	public function handleError($code, $message, $file, $line)
-	{
-		if (error_reporting() !== 0) {
-			$exception = new ErrorException($message, $code, $code, $file, $line);
-
-			// in case error appeared in __toString method we can't throw any exception
-			$trace = debug_backtrace(false);
-			array_shift($trace);
-			foreach ($trace as $frame) {
-				if ($frame['function'] == '__toString') {
-					$this->handleException($exception);
-				}
-			}
-
-			throw $exception;
-		}
-	}
-
-	/**
-	 * Handles fatal PHP errors
-	 */
-	public function handleFatalError()
-	{
-		if (YII_ENABLE_ERROR_HANDLER) {
-			$error = error_get_last();
-
-			if (ErrorException::isFatalError($error)) {
-				unset($this->_memoryReserve);
-				$exception = new ErrorException($error['message'], $error['type'], $error['type'], $error['file'], $error['line']);
-				// use error_log because it's too late to use Yii log
-				error_log($exception);
-
-				if (($handler = $this->getErrorHandler()) !== null) {
-					$handler->handle($exception);
-				} else {
-					$this->renderException($exception);
-				}
-
-				exit(1);
-			}
-		}
-	}
-
-	/**
-	 * Renders an exception without using rich format.
-	 * @param \Exception $exception the exception to be rendered.
-	 */
-	public function renderException($exception)
-	{
-		if ($exception instanceof Exception && ($exception instanceof UserException || !YII_DEBUG)) {
-			$message = $exception->getName() . ': ' . $exception->getMessage();
-		} else {
-			$message = YII_DEBUG ? (string)$exception : 'Error: ' . $exception->getMessage();
-		}
-		if (PHP_SAPI) {
-			echo $message . "\n";
-		} else {
-			echo '<pre>' . htmlspecialchars($message, ENT_QUOTES, $this->charset) . '</pre>';
-		}
-	}
-
-	// todo: to be polished
-	protected function logException($exception)
-	{
-		$category = get_class($exception);
-		if ($exception instanceof HttpException) {
-			/** @var $exception HttpException */
-			$category .= '\\' . $exception->statusCode;
-		} elseif ($exception instanceof \ErrorException) {
-			/** @var $exception \ErrorException */
-			$category .= '\\' . $exception->getSeverity();
-		}
-		Yii::error((string)$exception, $category);
-	}
-}
diff --git a/framework/base/Behavior.php b/framework/base/Behavior.php
deleted file mode 100644
index abe08bb..0000000
--- a/framework/base/Behavior.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-/**
- * Behavior is the base class for all behavior classes.
- *
- * A behavior can be used to enhance the functionality of an existing component without modifying its code.
- * In particular, it can "inject" its own methods and properties into the component
- * and make them directly accessible via the component. It can also respond to the events triggered in the component
- * and thus intercept the normal code execution.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Behavior extends \yii\base\Object
-{
-	/**
-	 * @var Component the owner of this behavior
-	 */
-	public $owner;
-
-	/**
-	 * Declares event handlers for the [[owner]]'s events.
-	 *
-	 * Child classes may override this method to declare what PHP callbacks should
-	 * be attached to the events of the [[owner]] component.
-	 *
-	 * The callbacks will be attached to the [[owner]]'s events when the behavior is
-	 * attached to the owner; and they will be detached from the events when
-	 * the behavior is detached from the component.
-	 *
-	 * The callbacks can be any of the followings:
-	 *
-	 * - method in this behavior: `'handleClick'`, equivalent to `array($this, 'handleClick')`
-	 * - object method: `array($object, 'handleClick')`
-	 * - static method: `array('Page', 'handleClick')`
-	 * - anonymous function: `function($event) { ... }`
-	 *
-	 * The following is an example:
-	 *
-	 * ~~~
-	 * array(
-	 *	 'beforeValidate' => 'myBeforeValidate',
-	 *	 'afterValidate' => 'myAfterValidate',
-	 * )
-	 * ~~~
-	 *
-	 * @return array events (array keys) and the corresponding event handler methods (array values).
-	 */
-	public function events()
-	{
-		return array();
-	}
-
-	/**
-	 * Attaches the behavior object to the component.
-	 * The default implementation will set the [[owner]] property
-	 * and attach event handlers as declared in [[events]].
-	 * Make sure you call the parent implementation if you override this method.
-	 * @param Component $owner the component that this behavior is to be attached to.
-	 */
-	public function attach($owner)
-	{
-		$this->owner = $owner;
-		foreach ($this->events() as $event => $handler) {
-			$owner->on($event, is_string($handler) ? array($this, $handler) : $handler);
-		}
-	}
-
-	/**
-	 * Detaches the behavior object from the component.
-	 * The default implementation will unset the [[owner]] property
-	 * and detach event handlers declared in [[events]].
-	 * Make sure you call the parent implementation if you override this method.
-	 */
-	public function detach()
-	{
-		if ($this->owner) {
-			foreach ($this->events() as $event => $handler) {
-				$this->owner->off($event, is_string($handler) ? array($this, $handler) : $handler);
-			}
-			$this->owner = null;
-		}
-	}
-}
diff --git a/framework/base/Component.php b/framework/base/Component.php
deleted file mode 100644
index 8e75835..0000000
--- a/framework/base/Component.php
+++ /dev/null
@@ -1,555 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-use Yii;
-
-/**
- * @include @yii/base/Component.md
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Component extends Object
-{
-	/**
-	 * @var array the attached event handlers (event name => handlers)
-	 */
-	private $_events;
-	/**
-	 * @var Behavior[] the attached behaviors (behavior name => behavior)
-	 */
-	private $_behaviors;
-
-	/**
-	 * Returns the value of a component property.
-	 * This method will check in the following order and act accordingly:
-	 *
-	 *  - a property defined by a getter: return the getter result
-	 *  - a property of a behavior: return the behavior property value
-	 *
-	 * Do not call this method directly as it is a PHP magic method that
-	 * will be implicitly called when executing `$value = $component->property;`.
-	 * @param string $name the property name
-	 * @return mixed the property value, event handlers attached to the event,
-	 * the behavior, or the value of a behavior's property
-	 * @throws UnknownPropertyException if the property is not defined
-	 * @see __set
-	 */
-	public function __get($name)
-	{
-		$getter = 'get' . $name;
-		if (method_exists($this, $getter)) {
-			// read property, e.g. getName()
-			return $this->$getter();
-		} else {
-			// behavior property
-			$this->ensureBehaviors();
-			foreach ($this->_behaviors as $behavior) {
-				if ($behavior->canGetProperty($name)) {
-					return $behavior->$name;
-				}
-			}
-		}
-		throw new UnknownPropertyException('Getting unknown property: ' . get_class($this) . '::' . $name);
-	}
-
-	/**
-	 * Sets the value of a component property.
-	 * This method will check in the following order and act accordingly:
-	 *
-	 *  - a property defined by a setter: set the property value
-	 *  - an event in the format of "on xyz": attach the handler to the event "xyz"
-	 *  - a behavior in the format of "as xyz": attach the behavior named as "xyz"
-	 *  - a property of a behavior: set the behavior property value
-	 *
-	 * Do not call this method directly as it is a PHP magic method that
-	 * will be implicitly called when executing `$component->property = $value;`.
-	 * @param string $name the property name or the event name
-	 * @param mixed $value the property value
-	 * @throws UnknownPropertyException if the property is not defined
-	 * @throws InvalidCallException if the property is read-only.
-	 * @see __get
-	 */
-	public function __set($name, $value)
-	{
-		$setter = 'set' . $name;
-		if (method_exists($this, $setter)) {
-			// set property
-			$this->$setter($value);
-			return;
-		} elseif (strncmp($name, 'on ', 3) === 0) {
-			// on event: attach event handler
-			$this->on(trim(substr($name, 3)), $value);
-			return;
-		} elseif (strncmp($name, 'as ', 3) === 0) {
-			// as behavior: attach behavior
-			$name = trim(substr($name, 3));
-			$this->attachBehavior($name, $value instanceof Behavior ? $value : Yii::createObject($value));
-			return;
-		} else {
-			// behavior property
-			$this->ensureBehaviors();
-			foreach ($this->_behaviors as $behavior) {
-				if ($behavior->canSetProperty($name)) {
-					$behavior->$name = $value;
-					return;
-				}
-			}
-		}
-		if (method_exists($this, 'get' . $name)) {
-			throw new InvalidCallException('Setting read-only property: ' . get_class($this) . '::' . $name);
-		} else {
-			throw new UnknownPropertyException('Setting unknown property: ' . get_class($this) . '::' . $name);
-		}
-	}
-
-	/**
-	 * Checks if a property value is null.
-	 * This method will check in the following order and act accordingly:
-	 *
-	 *  - a property defined by a setter: return whether the property value is null
-	 *  - a property of a behavior: return whether the property value is null
-	 *
-	 * Do not call this method directly as it is a PHP magic method that
-	 * will be implicitly called when executing `isset($component->property)`.
-	 * @param string $name the property name or the event name
-	 * @return boolean whether the named property is null
-	 */
-	public function __isset($name)
-	{
-		$getter = 'get' . $name;
-		if (method_exists($this, $getter)) {
-			return $this->$getter() !== null;
-		} else {
-			// behavior property
-			$this->ensureBehaviors();
-			foreach ($this->_behaviors as $behavior) {
-				if ($behavior->canGetProperty($name)) {
-					return $behavior->$name !== null;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Sets a component property to be null.
-	 * This method will check in the following order and act accordingly:
-	 *
-	 *  - a property defined by a setter: set the property value to be null
-	 *  - a property of a behavior: set the property value to be null
-	 *
-	 * Do not call this method directly as it is a PHP magic method that
-	 * will be implicitly called when executing `unset($component->property)`.
-	 * @param string $name the property name
-	 * @throws InvalidCallException if the property is read only.
-	 */
-	public function __unset($name)
-	{
-		$setter = 'set' . $name;
-		if (method_exists($this, $setter)) {
-			$this->$setter(null);
-			return;
-		} else {
-			// behavior property
-			$this->ensureBehaviors();
-			foreach ($this->_behaviors as $behavior) {
-				if ($behavior->canSetProperty($name)) {
-					$behavior->$name = null;
-					return;
-				}
-			}
-		}
-		if (method_exists($this, 'get' . $name)) {
-			throw new InvalidCallException('Unsetting read-only property: ' . get_class($this) . '.' . $name);
-		}
-	}
-
-	/**
-	 * Calls the named method which is not a class method.
-	 * If the name refers to a component property whose value is
-	 * an anonymous function, the method will execute the function.
-	 * Otherwise, it will check if any attached behavior has
-	 * the named method and will execute it if available.
-	 *
-	 * Do not call this method directly as it is a PHP magic method that
-	 * will be implicitly called when an unknown method is being invoked.
-	 * @param string $name the method name
-	 * @param array $params method parameters
-	 * @return mixed the method return value
-	 * @throws UnknownMethodException when calling unknown method
-	 */
-	public function __call($name, $params)
-	{
-		$getter = 'get' . $name;
-		if (method_exists($this, $getter)) {
-			$func = $this->$getter();
-			if ($func instanceof \Closure) {
-				return call_user_func_array($func, $params);
-			}
-		}
-
-		$this->ensureBehaviors();
-		foreach ($this->_behaviors as $object) {
-			if (method_exists($object, $name)) {
-				return call_user_func_array(array($object, $name), $params);
-			}
-		}
-
-		throw new UnknownMethodException('Calling unknown method: ' . get_class($this) . "::$name()");
-	}
-
-	/**
-	 * This method is called after the object is created by cloning an existing one.
-	 * It removes all behaviors because they are attached to the old object.
-	 */
-	public function __clone()
-	{
-		$this->_events = null;
-		$this->_behaviors = null;
-	}
-
-	/**
-	 * Returns a value indicating whether a property is defined for this component.
-	 * A property is defined if:
-	 *
-	 * - the class has a getter or setter method associated with the specified name
-	 *   (in this case, property name is case-insensitive);
-	 * - the class has a member variable with the specified name (when `$checkVar` is true);
-	 * - an attached behavior has a property of the given name (when `$checkBehavior` is true).
-	 *
-	 * @param string $name the property name
-	 * @param boolean $checkVar whether to treat member variables as properties
-	 * @param boolean $checkBehavior whether to treat behaviors' properties as properties of this component
-	 * @return boolean whether the property is defined
-	 * @see canGetProperty
-	 * @see canSetProperty
-	 */
-	public function hasProperty($name, $checkVar = true, $checkBehavior = true)
-	{
-		return $this->canGetProperty($name, $checkVar, $checkBehavior) || $this->canSetProperty($name, $checkVar, $checkBehavior);
-	}
-
-	/**
-	 * Returns a value indicating whether a property can be read.
-	 * A property can be read if:
-	 *
-	 * - the class has a getter method associated with the specified name
-	 *   (in this case, property name is case-insensitive);
-	 * - the class has a member variable with the specified name (when `$checkVar` is true);
-	 * - an attached behavior has a readable property of the given name (when `$checkBehavior` is true).
-	 *
-	 * @param string $name the property name
-	 * @param boolean $checkVar whether to treat member variables as properties
-	 * @param boolean $checkBehavior whether to treat behaviors' properties as properties of this component
-	 * @return boolean whether the property can be read
-	 * @see canSetProperty
-	 */
-	public function canGetProperty($name, $checkVar = true, $checkBehavior = true)
-	{
-		if (method_exists($this, 'get' . $name) || $checkVar && property_exists($this, $name)) {
-			return true;
-		} else {
-			$this->ensureBehaviors();
-			foreach ($this->_behaviors as $behavior) {
-				if ($behavior->canGetProperty($name, $checkVar)) {
-					return true;
-				}
-			}
-			return false;
-		}
-	}
-
-	/**
-	 * Returns a value indicating whether a property can be set.
-	 * A property can be written if:
-	 *
-	 * - the class has a setter method associated with the specified name
-	 *   (in this case, property name is case-insensitive);
-	 * - the class has a member variable with the specified name (when `$checkVar` is true);
-	 * - an attached behavior has a writable property of the given name (when `$checkBehavior` is true).
-	 *
-	 * @param string $name the property name
-	 * @param boolean $checkVar whether to treat member variables as properties
-	 * @param boolean $checkBehavior whether to treat behaviors' properties as properties of this component
-	 * @return boolean whether the property can be written
-	 * @see canGetProperty
-	 */
-	public function canSetProperty($name, $checkVar = true, $checkBehavior = true)
-	{
-		if (method_exists($this, 'set' . $name) || $checkVar && property_exists($this, $name)) {
-			return true;
-		} else {
-			$this->ensureBehaviors();
-			foreach ($this->_behaviors as $behavior) {
-				if ($behavior->canSetProperty($name, $checkVar)) {
-					return true;
-				}
-			}
-			return false;
-		}
-	}
-
-	/**
-	 * Returns a list of behaviors that this component should behave as.
-	 *
-	 * Child classes may override this method to specify the behaviors they want to behave as.
-	 *
-	 * The return value of this method should be an array of behavior objects or configurations
-	 * indexed by behavior names. A behavior configuration can be either a string specifying
-	 * the behavior class or an array of the following structure:
-	 *
-	 * ~~~
-	 * 'behaviorName' => array(
-	 *     'class' => 'BehaviorClass',
-	 *     'property1' => 'value1',
-	 *     'property2' => 'value2',
-	 * )
-	 * ~~~
-	 *
-	 * Note that a behavior class must extend from [[Behavior]]. Behavior names can be strings
-	 * or integers. If the former, they uniquely identify the behaviors. If the latter, the corresponding
-	 * behaviors are anonymous and their properties and methods will NOT be made available via the component
-	 * (however, the behaviors can still respond to the component's events).
-	 *
-	 * Behaviors declared in this method will be attached to the component automatically (on demand).
-	 *
-	 * @return array the behavior configurations.
-	 */
-	public function behaviors()
-	{
-		return array();
-	}
-
-	/**
-	 * Returns a value indicating whether there is any handler attached to the named event.
-	 * @param string $name the event name
-	 * @return boolean whether there is any handler attached to the event.
-	 */
-	public function hasEventHandlers($name)
-	{
-		$this->ensureBehaviors();
-		return !empty($this->_events[$name]);
-	}
-
-	/**
-	 * Attaches an event handler to an event.
-	 *
-	 * An event handler must be a valid PHP callback. The followings are
-	 * some examples:
-	 *
-	 * ~~~
-	 * function ($event) { ... }         // anonymous function
-	 * array($object, 'handleClick')    // $object->handleClick()
-	 * array('Page', 'handleClick')     // Page::handleClick()
-	 * 'handleClick'                    // global function handleClick()
-	 * ~~~
-	 *
-	 * An event handler must be defined with the following signature,
-	 *
-	 * ~~~
-	 * function ($event)
-	 * ~~~
-	 *
-	 * where `$event` is an [[Event]] object which includes parameters associated with the event.
-	 *
-	 * @param string $name the event name
-	 * @param callback $handler the event handler
-	 * @param mixed $data the data to be passed to the event handler when the event is triggered.
-	 * When the event handler is invoked, this data can be accessed via [[Event::data]].
-	 * @see off()
-	 */
-	public function on($name, $handler, $data = null)
-	{
-		$this->ensureBehaviors();
-		$this->_events[$name][] = array($handler, $data);
-	}
-
-	/**
-	 * Detaches an existing event handler from this component.
-	 * This method is the opposite of [[on()]].
-	 * @param string $name event name
-	 * @param callback $handler the event handler to be removed.
-	 * If it is null, all handlers attached to the named event will be removed.
-	 * @return boolean if a handler is found and detached
-	 * @see on()
-	 */
-	public function off($name, $handler = null)
-	{
-		$this->ensureBehaviors();
-		if (isset($this->_events[$name])) {
-			if ($handler === null) {
-				$this->_events[$name] = array();
-			} else {
-				$removed = false;
-				foreach ($this->_events[$name] as $i => $event) {
-					if ($event[0] === $handler) {
-						unset($this->_events[$name][$i]);
-						$removed = true;
-					}
-				}
-				if ($removed) {
-					$this->_events[$name] = array_values($this->_events[$name]);
-				}
-				return $removed;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Triggers an event.
-	 * This method represents the happening of an event. It invokes
-	 * all attached handlers for the event.
-	 * @param string $name the event name
-	 * @param Event $event the event parameter. If not set, a default [[Event]] object will be created.
-	 */
-	public function trigger($name, $event = null)
-	{
-		$this->ensureBehaviors();
-		if (!empty($this->_events[$name])) {
-			if ($event === null) {
-				$event = new Event;
-			}
-			if ($event->sender === null) {
-				$event->sender = $this;
-			}
-			$event->handled = false;
-			$event->name = $name;
-			foreach ($this->_events[$name] as $handler) {
-				$event->data = $handler[1];
-				call_user_func($handler[0], $event);
-				// stop further handling if the event is handled
-				if ($event instanceof Event && $event->handled) {
-					return;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Returns the named behavior object.
-	 * @param string $name the behavior name
-	 * @return Behavior the behavior object, or null if the behavior does not exist
-	 */
-	public function getBehavior($name)
-	{
-		$this->ensureBehaviors();
-		return isset($this->_behaviors[$name]) ? $this->_behaviors[$name] : null;
-	}
-
-	/**
-	 * Returns all behaviors attached to this component.
-	 * @return Behavior[] list of behaviors attached to this component
-	 */
-	public function getBehaviors()
-	{
-		$this->ensureBehaviors();
-		return $this->_behaviors;
-	}
-
-	/**
-	 * Attaches a behavior to this component.
-	 * This method will create the behavior object based on the given
-	 * configuration. After that, the behavior object will be attached to
-	 * this component by calling the [[Behavior::attach()]] method.
-	 * @param string $name the name of the behavior.
-	 * @param string|array|Behavior $behavior the behavior configuration. This can be one of the following:
-	 *
-	 *  - a [[Behavior]] object
-	 *  - a string specifying the behavior class
-	 *  - an object configuration array that will be passed to [[Yii::createObject()]] to create the behavior object.
-	 *
-	 * @return Behavior the behavior object
-	 * @see detachBehavior
-	 */
-	public function attachBehavior($name, $behavior)
-	{
-		$this->ensureBehaviors();
-		return $this->attachBehaviorInternal($name, $behavior);
-	}
-
-	/**
-	 * Attaches a list of behaviors to the component.
-	 * Each behavior is indexed by its name and should be a [[Behavior]] object,
-	 * a string specifying the behavior class, or an configuration array for creating the behavior.
-	 * @param array $behaviors list of behaviors to be attached to the component
-	 * @see attachBehavior
-	 */
-	public function attachBehaviors($behaviors)
-	{
-		$this->ensureBehaviors();
-		foreach ($behaviors as $name => $behavior) {
-			$this->attachBehaviorInternal($name, $behavior);
-		}
-	}
-
-	/**
-	 * Detaches a behavior from the component.
-	 * The behavior's [[Behavior::detach()]] method will be invoked.
-	 * @param string $name the behavior's name.
-	 * @return Behavior the detached behavior. Null if the behavior does not exist.
-	 */
-	public function detachBehavior($name)
-	{
-		$this->ensureBehaviors();
-		if (isset($this->_behaviors[$name])) {
-			$behavior = $this->_behaviors[$name];
-			unset($this->_behaviors[$name]);
-			$behavior->detach();
-			return $behavior;
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Detaches all behaviors from the component.
-	 */
-	public function detachBehaviors()
-	{
-		$this->ensureBehaviors();
-		if ($this->_behaviors !== null) {
-			foreach ($this->_behaviors as $name => $behavior) {
-				$this->detachBehavior($name);
-			}
-		}
-		$this->_behaviors = array();
-	}
-
-	/**
-	 * Makes sure that the behaviors declared in [[behaviors()]] are attached to this component.
-	 */
-	public function ensureBehaviors()
-	{
-		if ($this->_behaviors === null) {
-			$this->_behaviors = array();
-			foreach ($this->behaviors() as $name => $behavior) {
-				$this->attachBehaviorInternal($name, $behavior);
-			}
-		}
-	}
-
-	/**
-	 * Attaches a behavior to this component.
-	 * @param string $name the name of the behavior.
-	 * @param string|array|Behavior $behavior the behavior to be attached
-	 * @return Behavior the attached behavior.
-	 */
-	private function attachBehaviorInternal($name, $behavior)
-	{
-		if (!($behavior instanceof Behavior)) {
-			$behavior = Yii::createObject($behavior);
-		}
-		if (isset($this->_behaviors[$name])) {
-			$this->_behaviors[$name]->detach();
-		}
-		$behavior->attach($this);
-		return $this->_behaviors[$name] = $behavior;
-	}
-}
diff --git a/framework/base/Controller.php b/framework/base/Controller.php
deleted file mode 100644
index 9572636..0000000
--- a/framework/base/Controller.php
+++ /dev/null
@@ -1,504 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-use Yii;
-use yii\helpers\StringHelper;
-
-/**
- * Controller is the base class for classes containing controller logic.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Controller extends Component
-{
-	/**
-	 * @event ActionEvent an event raised right before executing a controller action.
-	 * You may set [[ActionEvent::isValid]] to be false to cancel the action execution.
-	 */
-	const EVENT_BEFORE_ACTION = 'beforeAction';
-	/**
-	 * @event ActionEvent an event raised right after executing a controller action.
-	 */
-	const EVENT_AFTER_ACTION = 'afterAction';
-
-	/**
-	 * @var string the ID of this controller
-	 */
-	public $id;
-	/**
-	 * @var Module $module the module that this controller belongs to.
-	 */
-	public $module;
-	/**
-	 * @var string the ID of the action that is used when the action ID is not specified
-	 * in the request. Defaults to 'index'.
-	 */
-	public $defaultAction = 'index';
-	/**
-	 * @var string|boolean the name of the layout to be applied to this controller's views.
-	 * This property mainly affects the behavior of [[render()]].
-	 * Defaults to null, meaning the actual layout value should inherit that from [[module]]'s layout value.
-	 * If false, no layout will be applied.
-	 */
-	public $layout;
-	/**
-	 * @var Action the action that is currently being executed. This property will be set
-	 * by [[run()]] when it is called by [[Application]] to run an action.
-	 */
-	public $action;
-	/**
-	 * @var View the view object that can be used to render views or view files.
-	 */
-	private $_view;
-
-
-	/**
-	 * @param string $id the ID of this controller
-	 * @param Module $module the module that this controller belongs to.
-	 * @param array $config name-value pairs that will be used to initialize the object properties
-	 */
-	public function __construct($id, $module, $config = array())
-	{
-		$this->id = $id;
-		$this->module = $module;
-		parent::__construct($config);
-	}
-
-	/**
-	 * Declares external actions for the controller.
-	 * This method is meant to be overwritten to declare external actions for the controller.
-	 * It should return an array, with array keys being action IDs, and array values the corresponding
-	 * action class names or action configuration arrays. For example,
-	 *
-	 * ~~~
-	 * return array(
-	 *     'action1' => '@app/components/Action1',
-	 *     'action2' => array(
-	 *         'class' => '@app/components/Action2',
-	 *         'property1' => 'value1',
-	 *         'property2' => 'value2',
-	 *     ),
-	 * );
-	 * ~~~
-	 *
-	 * [[\Yii::createObject()]] will be used later to create the requested action
-	 * using the configuration provided here.
-	 */
-	public function actions()
-	{
-		return array();
-	}
-
-	/**
-	 * Runs an action with the specified action ID and parameters.
-	 * If the action ID is empty, the method will use [[defaultAction]].
-	 * @param string $id the ID of the action to be executed.
-	 * @param array $params the parameters (name-value pairs) to be passed to the action.
-	 * @return integer the status of the action execution. 0 means normal, other values mean abnormal.
-	 * @throws InvalidRouteException if the requested action ID cannot be resolved into an action successfully.
-	 * @see createAction
-	 */
-	public function runAction($id, $params = array())
-	{
-		$action = $this->createAction($id);
-		if ($action !== null) {
-			$oldAction = $this->action;
-			$this->action = $action;
-			$status = 1;
-			if ($this->module->beforeAction($action)) {
-				if ($this->beforeAction($action)) {
-					$status = $action->runWithParams($params);
-					$this->afterAction($action);
-				}
-				$this->module->afterAction($action);
-			}
-			$this->action = $oldAction;
-			return $status;
-		} else {
-			throw new InvalidRouteException('Unable to resolve the request: ' . $this->getUniqueId() . '/' . $id);
-		}
-	}
-
-	/**
-	 * Runs a request specified in terms of a route.
-	 * The route can be either an ID of an action within this controller or a complete route consisting
-	 * of module IDs, controller ID and action ID. If the route starts with a slash '/', the parsing of
-	 * the route will start from the application; otherwise, it will start from the parent module of this controller.
-	 * @param string $route the route to be handled, e.g., 'view', 'comment/view', '/admin/comment/view'.
-	 * @param array $params the parameters to be passed to the action.
-	 * @return integer the status code returned by the action execution. 0 means normal, and other values mean abnormal.
-	 * @see runAction
-	 * @see forward
-	 */
-	public function run($route, $params = array())
-	{
-		$pos = strpos($route, '/');
-		if ($pos === false) {
-			return $this->runAction($route, $params);
-		} elseif ($pos > 0) {
-			return $this->module->runAction($route, $params);
-		} else {
-			return Yii::$app->runAction(ltrim($route, '/'), $params);
-		}
-	}
-
-	/**
-	 * Binds the parameters to the action.
-	 * This method is invoked by [[Action]] when it begins to run with the given parameters.
-	 * This method will check the parameter names that the action requires and return
-	 * the provided parameters according to the requirement. If there is any missing parameter,
-	 * an exception will be thrown.
-	 * @param Action $action the action to be bound with parameters
-	 * @param array $params the parameters to be bound to the action
-	 * @return array the valid parameters that the action can run with.
-	 * @throws InvalidRequestException if there are missing parameters.
-	 */
-	public function bindActionParams($action, $params)
-	{
-		if ($action instanceof InlineAction) {
-			$method = new \ReflectionMethod($this, $action->actionMethod);
-		} else {
-			$method = new \ReflectionMethod($action, 'run');
-		}
-
-		$args = array();
-		$missing = array();
-		foreach ($method->getParameters() as $param) {
-			$name = $param->getName();
-			if (array_key_exists($name, $params)) {
-				$args[] = $params[$name];
-				unset($params[$name]);
-			} elseif ($param->isDefaultValueAvailable()) {
-				$args[] = $param->getDefaultValue();
-			} else {
-				$missing[] = $name;
-			}
-		}
-
-		if (!empty($missing)) {
-			throw new InvalidRequestException(Yii::t('yii|Missing required parameters: {params}', array(
-				'{params}' => implode(', ', $missing),
-			)));
-		}
-
-		return $args;
-	}
-
-	/**
-	 * Forwards the current execution flow to handle a new request specified by a route.
-	 * The only difference between this method and [[run()]] is that after calling this method,
-	 * the application will exit.
-	 * @param string $route the route to be handled, e.g., 'view', 'comment/view', '/admin/comment/view'.
-	 * @param array $params the parameters to be passed to the action.
-	 * @return integer the status code returned by the action execution. 0 means normal, and other values mean abnormal.
-	 * @see run
-	 */
-	public function forward($route, $params = array())
-	{
-		$status = $this->run($route, $params);
-		exit($status);
-	}
-
-	/**
-	 * Creates an action based on the given action ID.
-	 * The method first checks if the action ID has been declared in [[actions()]]. If so,
-	 * it will use the configuration declared there to create the action object.
-	 * If not, it will look for a controller method whose name is in the format of `actionXyz`
-	 * where `Xyz` stands for the action ID. If found, an [[InlineAction]] representing that
-	 * method will be created and returned.
-	 * @param string $id the action ID
-	 * @return Action the newly created action instance. Null if the ID doesn't resolve into any action.
-	 */
-	public function createAction($id)
-	{
-		if ($id === '') {
-			$id = $this->defaultAction;
-		}
-
-		$actionMap = $this->actions();
-		if (isset($actionMap[$id])) {
-			return Yii::createObject($actionMap[$id], $id, $this);
-		} elseif (preg_match('/^[a-z0-9\\-_]+$/', $id)) {
-			$methodName = 'action' . StringHelper::id2camel($id);
-			if (method_exists($this, $methodName)) {
-				$method = new \ReflectionMethod($this, $methodName);
-				if ($method->getName() === $methodName) {
-					return new InlineAction($id, $this, $methodName);
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * This method is invoked right before an action is to be executed (after all possible filters.)
-	 * You may override this method to do last-minute preparation for the action.
-	 * @param Action $action the action to be executed.
-	 * @return boolean whether the action should continue to be executed.
-	 */
-	public function beforeAction($action)
-	{
-		$event = new ActionEvent($action);
-		$this->trigger(self::EVENT_BEFORE_ACTION, $event);
-		return $event->isValid;
-	}
-
-	/**
-	 * This method is invoked right after an action is executed.
-	 * You may override this method to do some postprocessing for the action.
-	 * @param Action $action the action just executed.
-	 */
-	public function afterAction($action)
-	{
-		$this->trigger(self::EVENT_AFTER_ACTION, new ActionEvent($action));
-	}
-
-	/**
-	 * Returns the request parameters that will be used for action parameter binding.
-	 * Default implementation simply returns an empty array.
-	 * Child classes may override this method to customize the parameters to be provided
-	 * for action parameter binding (e.g. `$_GET`).
-	 * @return array the request parameters (name-value pairs) to be used for action parameter binding
-	 */
-	public function getActionParams()
-	{
-		return array();
-	}
-
-	/**
-	 * Validates the parameter being bound to actions.
-	 * This method is invoked when parameters are being bound to the currently requested action.
-	 * Child classes may override this method to throw exceptions when there are missing and/or unknown parameters.
-	 * @param Action $action the currently requested action
-	 * @param array $missingParams the names of the missing parameters
-	 * @param array $unknownParams the unknown parameters (name=>value)
-	 */
-	public function validateActionParams($action, $missingParams, $unknownParams)
-	{
-	}
-
-	/**
-	 * @return string the controller ID that is prefixed with the module ID (if any).
-	 */
-	public function getUniqueId()
-	{
-		return $this->module instanceof Application ? $this->id : $this->module->getUniqueId() . '/' . $this->id;
-	}
-
-	/**
-	 * Returns the route of the current request.
-	 * @return string the route (module ID, controller ID and action ID) of the current request.
-	 */
-	public function getRoute()
-	{
-		return $this->action !== null ? $this->action->getUniqueId() : $this->getUniqueId();
-	}
-
-	/**
-	 * Populates one or multiple models from the given data array.
-	 * @param array $data the data array. This is usually `$_POST` or `$_GET`, but can also be any valid array.
-	 * @param Model $model the model to be populated. If there are more than one model to be populated,
-	 * you may supply them as additional parameters.
-	 * @return boolean whether at least one model is successfully populated with the data.
-	 */
-	public function populate($data, $model)
-	{
-		$success = false;
-		if (!empty($data) && is_array($data)) {
-			$models = func_get_args();
-			array_shift($models);
-			foreach ($models as $model) {
-				/** @var Model $model */
-				$scope = $model->formName();
-				if ($scope == '') {
-					$model->attributes = $data;
-					$success = true;
-				} elseif (isset($data[$scope])) {
-					$model->attributes = $data[$scope];
-					$success = true;
-				}
-			}
-		}
-		return $success;
-	}
-
-	/**
-	 * Renders a view and applies layout if available.
-	 *
-	 * The view to be rendered can be specified in one of the following formats:
-	 *
-	 * - path alias (e.g. "@app/views/site/index");
-	 * - absolute path within application (e.g. "//site/index"): the view name starts with double slashes.
-	 *   The actual view file will be looked for under the [[Application::viewPath|view path]] of the application.
-	 * - absolute path within module (e.g. "/site/index"): the view name starts with a single slash.
-	 *   The actual view file will be looked for under the [[Module::viewPath|view path]] of [[module]].
-	 * - relative path (e.g. "index"): the actual view file will be looked for under [[viewPath]].
-	 *
-	 * To determine which layout should be applied, the following two steps are conducted:
-	 *
-	 * 1. In the first step, it determines the layout name and the context module:
-	 *
-	 * - If [[layout]] is specified as a string, use it as the layout name and [[module]] as the context module;
-	 * - If [[layout]] is null, search through all ancestor modules of this controller and find the first
-	 *   module whose [[Module::layout|layout]] is not null. The layout and the corresponding module
-	 *   are used as the layout name and the context module, respectively. If such a module is not found
-	 *   or the corresponding layout is not a string, it will return false, meaning no applicable layout.
-	 *
-	 * 2. In the second step, it determines the actual layout file according to the previously found layout name
-	 *    and context module. The layout name can be
-	 *
-	 * - a path alias (e.g. "@app/views/layouts/main");
-	 * - an absolute path (e.g. "/main"): the layout name starts with a slash. The actual layout file will be
-	 *   looked for under the [[Application::layoutPath|layout path]] of the application;
-	 * - a relative path (e.g. "main"): the actual layout layout file will be looked for under the
-	 *   [[Module::viewPath|view path]] of the context module.
-	 *
-	 * If the layout name does not contain a file extension, it will use the default one `.php`.
-	 *
-	 * @param string $view the view name. Please refer to [[findViewFile()]] on how to specify a view name.
-	 * @param array $params the parameters (name-value pairs) that should be made available in the view.
-	 * These parameters will not be available in the layout.
-	 * @return string the rendering result.
-	 * @throws InvalidParamException if the view file or the layout file does not exist.
-	 */
-	public function render($view, $params = array())
-	{
-		$viewFile = $this->findViewFile($view);
-		$output = $this->getView()->renderFile($viewFile, $params, $this);
-		$layoutFile = $this->findLayoutFile();
-		if ($layoutFile !== false) {
-			return $this->getView()->renderFile($layoutFile, array('content' => $output), $this);
-		} else {
-			return $output;
-		}
-	}
-
-	/**
-	 * Renders a view.
-	 * This method differs from [[render()]] in that it does not apply any layout.
-	 * @param string $view the view name. Please refer to [[render()]] on how to specify a view name.
-	 * @param array $params the parameters (name-value pairs) that should be made available in the view.
-	 * @return string the rendering result.
-	 * @throws InvalidParamException if the view file does not exist.
-	 */
-	public function renderPartial($view, $params = array())
-	{
-		$viewFile = $this->findViewFile($view);
-		return $this->getView()->renderFile($viewFile, $params, $this);
-	}
-
-	/**
-	 * Renders a view file.
-	 * @param string $file the view file to be rendered. This can be either a file path or a path alias.
-	 * @param array $params the parameters (name-value pairs) that should be made available in the view.
-	 * @return string the rendering result.
-	 * @throws InvalidParamException if the view file does not exist.
-	 */
-	public function renderFile($file, $params = array())
-	{
-		return $this->getView()->renderFile($file, $params, $this);
-	}
-
-	/**
-	 * Returns the view object that can be used to render views or view files.
-	 * The [[render()]], [[renderPartial()]] and [[renderFile()]] methods will use
-	 * this view object to implement the actual view rendering.
-	 * @return View the view object that can be used to render views or view files.
-	 */
-	public function getView()
-	{
-		if ($this->_view === null) {
-			$this->_view = Yii::$app->getView();
-		}
-		return $this->_view;
-	}
-
-	/**
-	 * Sets the view object to be used by this controller.
-	 * @param View $view the view object that can be used to render views or view files.
-	 */
-	public function setView($view)
-	{
-		$this->_view = $view;
-	}
-
-	/**
-	 * Returns the directory containing view files for this controller.
-	 * The default implementation returns the directory named as controller [[id]] under the [[module]]'s
-	 * [[viewPath]] directory.
-	 * @return string the directory containing the view files for this controller.
-	 */
-	public function getViewPath()
-	{
-		return $this->module->getViewPath() . DIRECTORY_SEPARATOR . $this->id;
-	}
-
-	/**
-	 * Finds the view file based on the given view name.
-	 * @param string $view the view name or the path alias of the view file. Please refer to [[render()]]
-	 * on how to specify this parameter.
-	 * @return string the view file path. Note that the file may not exist.
-	 */
-	protected function findViewFile($view)
-	{
-		if (strncmp($view, '@', 1) === 0) {
-			// e.g. "@app/views/main"
-			$file = Yii::getAlias($view);
-		} elseif (strncmp($view, '//', 2) === 0) {
-			// e.g. "//layouts/main"
-			$file = Yii::$app->getViewPath() . DIRECTORY_SEPARATOR . ltrim($view, '/');
-		} elseif (strncmp($view, '/', 1) === 0) {
-			// e.g. "/site/index"
-			$file = $this->module->getViewPath() . DIRECTORY_SEPARATOR . ltrim($view, '/');
-		} else {
-			$file = $this->getViewPath() . DIRECTORY_SEPARATOR . $view;
-		}
-
-		return pathinfo($file, PATHINFO_EXTENSION) === '' ? $file . '.php' : $file;
-	}
-
-	/**
-	 * Finds the applicable layout file.
-	 * @return string|boolean the layout file path, or false if layout is not needed.
-	 * Please refer to [[render()]] on how to specify this parameter.
-	 * @throws InvalidParamException if an invalid path alias is used to specify the layout
-	 */
-	protected function findLayoutFile()
-	{
-		$module = $this->module;
-		if (is_string($this->layout)) {
-			$view = $this->layout;
-		} elseif ($this->layout === null) {
-			while ($module !== null && $module->layout === null) {
-				$module = $module->module;
-			}
-			if ($module !== null && is_string($module->layout)) {
-				$view = $module->layout;
-			}
-		}
-
-		if (!isset($view)) {
-			return false;
-		}
-
-		if (strncmp($view, '@', 1) === 0) {
-			$file = Yii::getAlias($view);
-		} elseif (strncmp($view, '/', 1) === 0) {
-			$file = Yii::$app->getLayoutPath() . DIRECTORY_SEPARATOR . $view;
-		} else {
-			$file = $module->getLayoutPath() . DIRECTORY_SEPARATOR . $view;
-		}
-
-		if (pathinfo($file, PATHINFO_EXTENSION) === '') {
-			$file .= '.php';
-		}
-		return $file;
-	}
-}
diff --git a/framework/base/Dictionary.php b/framework/base/Dictionary.php
deleted file mode 100644
index 5807d93..0000000
--- a/framework/base/Dictionary.php
+++ /dev/null
@@ -1,297 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-use yii\helpers\ArrayHelper;
-
-/**
- * Dictionary implements a collection that stores key-value pairs.
- *
- * You can access, add or remove an item with a key by using
- * [[itemAt()]], [[add()]], and [[remove()]].
- *
- * To get the number of the items in the dictionary, use [[getCount()]].
- *
- * Because Dictionary implements a set of SPL interfaces, it can be used
- * like a regular PHP array as follows,
- *
- * ~~~
- * $dictionary[$key] = $value;		   // add a key-value pair
- * unset($dictionary[$key]);			 // remove the value with the specified key
- * if (isset($dictionary[$key]))		 // if the dictionary contains the key
- * foreach ($dictionary as $key=>$value) // traverse the items in the dictionary
- * $n = count($dictionary);			  // returns the number of items in the dictionary
- * ~~~
- *
- * @property integer $count the number of items in the dictionary
- * @property array $keys The keys in the dictionary
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Dictionary extends Object implements \IteratorAggregate, \ArrayAccess, \Countable
-{
-	/**
-	 * @var array internal data storage
-	 */
-	private $_d = array();
-
-	/**
-	 * Constructor.
-	 * Initializes the dictionary with an array or an iterable object.
-	 * @param mixed $data the initial data to be populated into the dictionary.
-	 * This can be an array or an iterable object.
-	 * @param array $config name-value pairs that will be used to initialize the object properties
-	 * @throws Exception if data is not well formed (neither an array nor an iterable object)
-	 */
-	public function __construct($data = array(), $config = array())
-	{
-		if (!empty($data)) {
-			$this->copyFrom($data);
-		}
-		parent::__construct($config);
-	}
-
-	/**
-	 * Returns an iterator for traversing the items in the dictionary.
-	 * This method is required by the SPL interface `IteratorAggregate`.
-	 * It will be implicitly called when you use `foreach` to traverse the dictionary.
-	 * @return DictionaryIterator an iterator for traversing the items in the dictionary.
-	 */
-	public function getIterator()
-	{
-		return new DictionaryIterator($this->_d);
-	}
-
-	/**
-	 * Returns the number of items in the dictionary.
-	 * This method is required by the SPL `Countable` interface.
-	 * It will be implicitly called when you use `count($dictionary)`.
-	 * @return integer number of items in the dictionary.
-	 */
-	public function count()
-	{
-		return $this->getCount();
-	}
-
-	/**
-	 * Returns the number of items in the dictionary.
-	 * @return integer the number of items in the dictionary
-	 */
-	public function getCount()
-	{
-		return count($this->_d);
-	}
-
-	/**
-	 * Returns the keys stored in the dictionary.
-	 * @return array the key list
-	 */
-	public function getKeys()
-	{
-		return array_keys($this->_d);
-	}
-
-	/**
-	 * Returns the item with the specified key.
-	 * @param mixed $key the key
-	 * @return mixed the element with the specified key.
-	 * Null if the key cannot be found in the dictionary.
-	 */
-	public function itemAt($key)
-	{
-		return isset($this->_d[$key]) ? $this->_d[$key] : null;
-	}
-
-	/**
-	 * Adds an item into the dictionary.
-	 * Note, if the specified key already exists, the old value will be overwritten.
-	 * @param mixed $key key
-	 * @param mixed $value value
-	 * @throws Exception if the dictionary is read-only
-	 */
-	public function add($key, $value)
-	{
-		if ($key === null) {
-			$this->_d[] = $value;
-		} else {
-			$this->_d[$key] = $value;
-		}
-	}
-
-	/**
-	 * Removes an item from the dictionary by its key.
-	 * @param mixed $key the key of the item to be removed
-	 * @return mixed the removed value, null if no such key exists.
-	 * @throws Exception if the dictionary is read-only
-	 */
-	public function remove($key)
-	{
-		if (isset($this->_d[$key])) {
-			$value = $this->_d[$key];
-			unset($this->_d[$key]);
-			return $value;
-		} else { // the value is null
-			unset($this->_d[$key]);
-			return null;
-		}
-	}
-
-	/**
-	 * Removes all items from the dictionary.
-	 * @param boolean $safeClear whether to clear every item by calling [[remove]].
-	 * Defaults to false, meaning all items in the dictionary will be cleared directly
-	 * without calling [[remove]].
-	 */
-	public function removeAll($safeClear = false)
-	{
-		if ($safeClear) {
-			foreach (array_keys($this->_d) as $key) {
-				$this->remove($key);
-			}
-		} else {
-			$this->_d = array();
-		}
-	}
-
-	/**
-	 * Returns a value indicating whether the dictionary contains the specified key.
-	 * @param mixed $key the key
-	 * @return boolean whether the dictionary contains an item with the specified key
-	 */
-	public function has($key)
-	{
-		return isset($this->_d[$key]) || array_key_exists($key, $this->_d);
-	}
-
-	/**
-	 * Returns the dictionary as a PHP array.
-	 * @return array the list of items in array
-	 */
-	public function toArray()
-	{
-		return $this->_d;
-	}
-
-	/**
-	 * Copies iterable data into the dictionary.
-	 * Note, existing data in the dictionary will be cleared first.
-	 * @param mixed $data the data to be copied from, must be an array or an object implementing `Traversable`
-	 * @throws InvalidParamException if data is neither an array nor an iterator.
-	 */
-	public function copyFrom($data)
-	{
-		if (is_array($data) || $data instanceof \Traversable) {
-			if (!empty($this->_d)) {
-				$this->removeAll();
-			}
-			if ($data instanceof self) {
-				$data = $data->_d;
-			}
-			foreach ($data as $key => $value) {
-				$this->add($key, $value);
-			}
-		} else {
-			throw new InvalidParamException('Data must be either an array or an object implementing Traversable.');
-		}
-	}
-
-	/**
-	 * Merges iterable data into the dictionary.
-	 *
-	 * Existing elements in the dictionary will be overwritten if their keys are the same as those in the source.
-	 * If the merge is recursive, the following algorithm is performed:
-	 *
-	 * - the dictionary data is saved as $a, and the source data is saved as $b;
-	 * - if $a and $b both have an array indexed at the same string key, the arrays will be merged using this algorithm;
-	 * - any integer-indexed elements in $b will be appended to $a;
-	 * - any string-indexed elements in $b will overwrite elements in $a with the same index;
-	 *
-	 * @param array|\Traversable $data the data to be merged with. It must be an array or object implementing Traversable
-	 * @param boolean $recursive whether the merging should be recursive.
-	 * @throws InvalidParamException if data is neither an array nor an object implementing `Traversable`.
-	 */
-	public function mergeWith($data, $recursive = true)
-	{
-		if (is_array($data) || $data instanceof \Traversable) {
-			if ($data instanceof self) {
-				$data = $data->_d;
-			}
-			if ($recursive) {
-				if ($data instanceof \Traversable) {
-					$d = array();
-					foreach ($data as $key => $value) {
-						$d[$key] = $value;
-					}
-					$this->_d = ArrayHelper::merge($this->_d, $d);
-				} else {
-					$this->_d = ArrayHelper::merge($this->_d, $data);
-				}
-			} else {
-				foreach ($data as $key => $value) {
-					$this->add($key, $value);
-				}
-			}
-		} else {
-			throw new InvalidParamException('The data to be merged with must be an array or an object implementing Traversable.');
-		}
-	}
-
-	/**
-	 * Returns whether there is an element at the specified offset.
-	 * This method is required by the SPL interface `ArrayAccess`.
-	 * It is implicitly called when you use something like `isset($dictionary[$offset])`.
-	 * This is equivalent to [[contains]].
-	 * @param mixed $offset the offset to check on
-	 * @return boolean
-	 */
-	public function offsetExists($offset)
-	{
-		return $this->has($offset);
-	}
-
-	/**
-	 * Returns the element at the specified offset.
-	 * This method is required by the SPL interface `ArrayAccess`.
-	 * It is implicitly called when you use something like `$value = $dictionary[$offset];`.
-	 * This is equivalent to [[itemAt]].
-	 * @param mixed $offset the offset to retrieve element.
-	 * @return mixed the element at the offset, null if no element is found at the offset
-	 */
-	public function offsetGet($offset)
-	{
-		return $this->itemAt($offset);
-	}
-
-	/**
-	 * Sets the element at the specified offset.
-	 * This method is required by the SPL interface `ArrayAccess`.
-	 * It is implicitly called when you use something like `$dictionary[$offset] = $item;`.
-	 * If the offset is null, the new item will be appended to the dictionary.
-	 * Otherwise, the existing item at the offset will be replaced with the new item.
-	 * This is equivalent to [[add]].
-	 * @param mixed $offset the offset to set element
-	 * @param mixed $item the element value
-	 */
-	public function offsetSet($offset, $item)
-	{
-		$this->add($offset, $item);
-	}
-
-	/**
-	 * Unsets the element at the specified offset.
-	 * This method is required by the SPL interface `ArrayAccess`.
-	 * It is implicitly called when you use something like `unset($dictionary[$offset])`.
-	 * This is equivalent to [[remove]].
-	 * @param mixed $offset the offset to unset element
-	 */
-	public function offsetUnset($offset)
-	{
-		$this->remove($offset);
-	}
-}
diff --git a/framework/base/DictionaryIterator.php b/framework/base/DictionaryIterator.php
deleted file mode 100644
index 0d15bb0..0000000
--- a/framework/base/DictionaryIterator.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-/**
- * DictionaryIterator implements the SPL `Iterator` interface for [[Dictionary]].
- *
- * It allows [[Dictionary]] to return a new iterator for data traversing purpose.
- * You normally do not use this class directly.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class DictionaryIterator implements \Iterator
-{
-	/**
-	 * @var array the data to be iterated through
-	 */
-	private $_d;
-	/**
-	 * @var array list of keys in the map
-	 */
-	private $_keys;
-	/**
-	 * @var mixed current key
-	 */
-	private $_key;
-
-	/**
-	 * Constructor.
-	 * @param array $data the data to be iterated through
-	 */
-	public function __construct(&$data)
-	{
-		$this->_d = &$data;
-		$this->_keys = array_keys($data);
-		$this->_key = reset($this->_keys);
-	}
-
-	/**
-	 * Rewinds the index of the current item.
-	 * This method is required by the SPL interface `Iterator`.
-	 */
-	public function rewind()
-	{
-		$this->_key = reset($this->_keys);
-	}
-
-	/**
-	 * Returns the key of the current array element.
-	 * This method is required by the SPL interface `Iterator`.
-	 * @return mixed the key of the current array element
-	 */
-	public function key()
-	{
-		return $this->_key;
-	}
-
-	/**
-	 * Returns the current array element.
-	 * This method is required by the SPL interface `Iterator`.
-	 * @return mixed the current array element
-	 */
-	public function current()
-	{
-		return $this->_d[$this->_key];
-	}
-
-	/**
-	 * Moves the internal pointer to the next element.
-	 * This method is required by the SPL interface `Iterator`.
-	 */
-	public function next()
-	{
-		$this->_key = next($this->_keys);
-	}
-
-	/**
-	 * Returns whether there is an element at current position.
-	 * This method is required by the SPL interface `Iterator`.
-	 * @return boolean whether there is an item at current position.
-	 */
-	public function valid()
-	{
-		return $this->_key !== false;
-	}
-}
diff --git a/framework/base/ErrorException.php b/framework/base/ErrorException.php
deleted file mode 100644
index b41e9ed..0000000
--- a/framework/base/ErrorException.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-use Yii;
-
-/**
- * ErrorException represents a PHP error.
- *
- * @author Alexander Makarov <sam@rmcreative.ru>
- * @since 2.0
- */
-class ErrorException extends Exception
-{
-	protected $severity;
-
-	/**
-	 * Constructs the exception
-	 * @link http://php.net/manual/en/errorexception.construct.php
-	 * @param $message [optional]
-	 * @param $code [optional]
-	 * @param $severity [optional]
-	 * @param $filename [optional]
-	 * @param $lineno [optional]
-	 * @param $previous [optional]
-	 */
-	public function __construct($message = '', $code = 0, $severity = 1, $filename = __FILE__, $lineno = __LINE__, \Exception $previous = null)
-	{
-		parent::__construct($message, $code, $previous);
-		$this->severity = $severity;
-		$this->file = $filename;
-		$this->line = $lineno;
-
-		if (function_exists('xdebug_get_function_stack')) {
-			$trace = array_slice(array_reverse(xdebug_get_function_stack()), 3, -1);
-			foreach ($trace as &$frame) {
-				if (!isset($frame['function'])) {
-					$frame['function'] = 'unknown';
-				}
-
-				// XDebug < 2.1.1: http://bugs.xdebug.org/view.php?id=695
-				if (!isset($frame['type']) || $frame['type'] === 'static') {
-					$frame['type'] = '::';
-				} elseif ($frame['type'] === 'dynamic') {
-					$frame['type'] = '->';
-				}
-
-				// XDebug has a different key name
-				$frame['args'] = array();
-				if (isset($frame['params']) && !isset($frame['args'])) {
-					$frame['args'] = $frame['params'];
-				}
-			}
-
-			$ref = new \ReflectionProperty('Exception', 'trace');
-			$ref->setAccessible(true);
-			$ref->setValue($this, $trace);
-		}
-	}
-
-	/**
-	 * Gets the exception severity
-	 * @link http://php.net/manual/en/errorexception.getseverity.php
-	 * @return int the severity level of the exception.
-	 */
-	final public function getSeverity()
-	{
-		return $this->severity;
-	}
-
-	/**
-	 * Returns if error is one of fatal type
-	 *
-	 * @param array $error error got from error_get_last()
-	 * @return bool if error is one of fatal type
-	 */
-	public static function isFatalError($error)
-	{
-		return isset($error['type']) && in_array($error['type'], array(E_ERROR, E_PARSE, E_CORE_ERROR, E_CORE_WARNING, E_COMPILE_ERROR, E_COMPILE_WARNING));
-	}
-
-	/**
-	 * @return string the user-friendly name of this exception
-	 */
-	public function getName()
-	{
-		$names = array(
-			E_ERROR => Yii::t('yii|Fatal Error'),
-			E_PARSE => Yii::t('yii|Parse Error'),
-			E_CORE_ERROR => Yii::t('yii|Core Error'),
-			E_COMPILE_ERROR => Yii::t('yii|Compile Error'),
-			E_USER_ERROR => Yii::t('yii|User Error'),
-			E_WARNING => Yii::t('yii|Warning'),
-			E_CORE_WARNING => Yii::t('yii|Core Warning'),
-			E_COMPILE_WARNING => Yii::t('yii|Compile Warning'),
-			E_USER_WARNING => Yii::t('yii|User Warning'),
-			E_STRICT => Yii::t('yii|Strict'),
-			E_NOTICE => Yii::t('yii|Notice'),
-			E_RECOVERABLE_ERROR => Yii::t('yii|Recoverable Error'),
-			E_DEPRECATED => Yii::t('yii|Deprecated'),
-		);
-		return isset($names[$this->getCode()]) ? $names[$this->getCode()] : Yii::t('yii|Error');
-	}
-}
diff --git a/framework/base/ErrorHandler.php b/framework/base/ErrorHandler.php
deleted file mode 100644
index 98a061d..0000000
--- a/framework/base/ErrorHandler.php
+++ /dev/null
@@ -1,280 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-/**
- * ErrorHandler handles uncaught PHP errors and exceptions.
- *
- * ErrorHandler displays these errors using appropriate views based on the
- * nature of the errors and the mode the application runs at.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class ErrorHandler extends Component
-{
-	/**
-	 * @var integer maximum number of source code lines to be displayed. Defaults to 25.
-	 */
-	public $maxSourceLines = 25;
-	/**
-	 * @var integer maximum number of trace source code lines to be displayed. Defaults to 10.
-	 */
-	public $maxTraceSourceLines = 10;
-	/**
-	 * @var boolean whether to discard any existing page output before error display. Defaults to true.
-	 */
-	public $discardExistingOutput = true;
-	/**
-	 * @var string the route (eg 'site/error') to the controller action that will be used to display external errors.
-	 * Inside the action, it can retrieve the error information by \Yii::$app->errorHandler->error.
-	 * This property defaults to null, meaning ErrorHandler will handle the error display.
-	 */
-	public $errorAction;
-	/**
-	 * @var string the path of the view file for rendering exceptions
-	 */
-	public $exceptionView = '@yii/views/exception.php';
-	/**
-	 * @var string the path of the view file for rendering errors
-	 */
-	public $errorView = '@yii/views/error.php';
-	/**
-	 * @var \Exception the exception that is being handled currently
-	 */
-	public $exception;
-
-
-	/**
-	 * Handles exception
-	 * @param \Exception $exception
-	 */
-	public function handle($exception)
-	{
-		$this->exception = $exception;
-
-		if ($this->discardExistingOutput) {
-			$this->clearOutput();
-		}
-
-		$this->renderException($exception);
-	}
-
-	/**
-	 * Renders exception
-	 * @param \Exception $exception
-	 */
-	protected function renderException($exception)
-	{
-		if ($this->errorAction !== null) {
-			\Yii::$app->runAction($this->errorAction);
-		} elseif (\Yii::$app instanceof \yii\web\Application) {
-			if (!headers_sent()) {
-				$errorCode = $exception instanceof HttpException ? $exception->statusCode : 500;
-				header("HTTP/1.0 $errorCode " . get_class($exception));
-			}
-			if (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest') {
-				\Yii::$app->renderException($exception);
-			} else {
-				// if there is an error during error rendering it's useful to
-				// display PHP error in debug mode instead of a blank screen
-				if(YII_DEBUG) {
-					ini_set('display_errors', 1);
-				}
-
-				$view = new View;
-				if (!YII_DEBUG || $exception instanceof UserException) {
-					$viewName = $this->errorView;
-				} else {
-					$viewName = $this->exceptionView;
-				}
-				echo $view->renderFile($viewName, array(
-					'exception' => $exception,
-				), $this);
-			}
-		} else {
-			\Yii::$app->renderException($exception);
-		}
-	}
-
-	/**
-	 * Returns server and Yii version information.
-	 * @return string server version information.
-	 */
-	public function getVersionInfo()
-	{
-		$version = '<a href="http://www.yiiframework.com/">Yii Framework</a>/' . \Yii::getVersion();
-		if (isset($_SERVER['SERVER_SOFTWARE'])) {
-			$version = $_SERVER['SERVER_SOFTWARE'] . ' ' . $version;
-		}
-		return $version;
-	}
-
-	/**
-	 * Converts arguments array to its string representation
-	 *
-	 * @param array $args arguments array to be converted
-	 * @return string string representation of the arguments array
-	 */
-	public function argumentsToString($args)
-	{
-		$isAssoc = $args !== array_values($args);
-		$count = 0;
-		foreach ($args as $key => $value) {
-			$count++;
-			if ($count >= 5) {
-				if ($count > 5) {
-					unset($args[$key]);
-				} else {
-					$args[$key] = '...';
-				}
-				continue;
-			}
-
-			if (is_object($value)) {
-				$args[$key] = get_class($value);
-			} elseif (is_bool($value)) {
-				$args[$key] = $value ? 'true' : 'false';
-			} elseif (is_string($value)) {
-				if (strlen($value) > 64) {
-					$args[$key] = '"' . substr($value, 0, 64) . '..."';
-				} else {
-					$args[$key] = '"' . $value . '"';
-				}
-			} elseif (is_array($value)) {
-				$args[$key] = 'array(' . $this->argumentsToString($value) . ')';
-			} elseif ($value === null) {
-				$args[$key] = 'null';
-			} elseif (is_resource($value)) {
-				$args[$key] = 'resource';
-			}
-
-			if (is_string($key)) {
-				$args[$key] = '"' . $key . '" => ' . $args[$key];
-			} elseif ($isAssoc) {
-				$args[$key] = $key . ' => ' . $args[$key];
-			}
-		}
-		return implode(', ', $args);
-	}
-
-	/**
-	 * Returns a value indicating whether the call stack is from application code.
-	 * @param array $trace the trace data
-	 * @return boolean whether the call stack is from application code.
-	 */
-	public function isCoreCode($trace)
-	{
-		if (isset($trace['file'])) {
-			return $trace['file'] === 'unknown' || strpos(realpath($trace['file']), YII_PATH . DIRECTORY_SEPARATOR) === 0;
-		}
-		return false;
-	}
-
-	/**
-	 * Renders the source code around the error line.
-	 * @param string $file source file path
-	 * @param integer $errorLine the error line number
-	 * @param integer $maxLines maximum number of lines to display
-	 */
-	public function renderSourceCode($file, $errorLine, $maxLines)
-	{
-		$errorLine--; // adjust line number to 0-based from 1-based
-		if ($errorLine < 0 || ($lines = @file($file)) === false || ($lineCount = count($lines)) <= $errorLine) {
-			return;
-		}
-
-		$halfLines = (int)($maxLines / 2);
-		$beginLine = $errorLine - $halfLines > 0 ? $errorLine - $halfLines : 0;
-		$endLine = $errorLine + $halfLines < $lineCount ? $errorLine + $halfLines : $lineCount - 1;
-		$lineNumberWidth = strlen($endLine + 1);
-
-		$output = '';
-		for ($i = $beginLine; $i <= $endLine; ++$i) {
-			$isErrorLine = $i === $errorLine;
-			$code = sprintf("<span class=\"ln" . ($isErrorLine ? ' error-ln' : '') . "\">%0{$lineNumberWidth}d</span> %s", $i + 1, $this->htmlEncode(str_replace("\t", '    ', $lines[$i])));
-			if (!$isErrorLine) {
-				$output .= $code;
-			} else {
-				$output .= '<span class="error">' . $code . '</span>';
-			}
-		}
-		echo '<div class="code"><pre>' . $output . '</pre></div>';
-	}
-
-	/**
-	 * Renders calls stack trace
-	 * @param array $trace
-	 */
-	public function renderTrace($trace)
-	{
-		$count = 0;
-		echo "<table>\n";
-		foreach ($trace as $n => $t) {
-			if ($this->isCoreCode($t)) {
-				$cssClass = 'core collapsed';
-			} elseif (++$count > 3) {
-				$cssClass = 'app collapsed';
-			} else {
-				$cssClass = 'app expanded';
-			}
-
-			$hasCode = isset($t['file']) && $t['file'] !== 'unknown' && is_file($t['file']);
-			echo "<tr class=\"trace $cssClass\"><td class=\"number\">#$n</td><td class=\"content\">";
-			echo '<div class="trace-file">';
-			if ($hasCode) {
-				echo '<div class="plus">+</div><div class="minus">-</div>';
-			}
-			echo '&nbsp;';
-			if(isset($t['file'])) {
-				echo $this->htmlEncode($t['file']) . '(' . $t['line'] . '): ';
-			}
-			if (!empty($t['class'])) {
-				echo '<strong>' . $t['class'] . '</strong>' . $t['type'];
-			}
-			echo '<strong>' . $t['function'] . '</strong>';
-			echo '(' . (empty($t['args']) ? '' : $this->htmlEncode($this->argumentsToString($t['args']))) . ')';
-			echo '</div>';
-			if ($hasCode) {
-				$this->renderSourceCode($t['file'], $t['line'], $this->maxTraceSourceLines);
-			}
-			echo "</td></tr>\n";
-		}
-		echo '</table>';
-	}
-
-	/**
-	 * Converts special characters to HTML entities
-	 * @param string $text text to encode
-	 * @return string
-	 */
-	public function htmlEncode($text)
-	{
-		return htmlspecialchars($text, ENT_QUOTES, \Yii::$app->charset);
-	}
-
-	public function clearOutput()
-	{
-		// the following manual level counting is to deal with zlib.output_compression set to On
-		for ($level = ob_get_level(); $level > 0; --$level) {
-			@ob_end_clean();
-		}
-	}
-
-	/**
-	 * @param \Exception $exception
-	 */
-	public function renderAsHtml($exception)
-	{
-		$view = new View;
-		$name = !YII_DEBUG || $exception instanceof HttpException ? $this->errorView : $this->exceptionView;
-		echo $view->renderFile($name, array(
-			'exception' => $exception,
-		), $this);
-	}
-}
diff --git a/framework/base/Event.php b/framework/base/Event.php
deleted file mode 100644
index 5d40736..0000000
--- a/framework/base/Event.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-/**
- * Event is the base class for all event classes.
- *
- * It encapsulates the parameters associated with an event.
- * The [[sender]] property describes who raises the event.
- * And the [[handled]] property indicates if the event is handled.
- * If an event handler sets [[handled]] to be true, the rest of the
- * uninvoked handlers will no longer be called to handle the event.
- *
- * Additionally, when attaching an event handler, extra data may be passed
- * and be available via the [[data]] property when the event handler is invoked.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Event extends Object
-{
-	/**
-	 * @var string the event name. This property is set by [[Component::trigger()]].
-	 * Event handlers may use this property to check what event it is handling.
-	 */
-	public $name;
-	/**
-	 * @var object the sender of this event. If not set, this property will be
-	 * set as the object whose "trigger()" method is called.
-	 */
-	public $sender;
-	/**
-	 * @var boolean whether the event is handled. Defaults to false.
-	 * When a handler sets this to be true, the event processing will stop and
-	 * ignore the rest of the uninvoked event handlers.
-	 */
-	public $handled = false;
-	/**
-	 * @var mixed the data that is passed to [[Component::on()]] when attaching an event handler.
-	 * Note that this varies according to which event handler is currently executing.
-	 */
-	public $data;
-}
diff --git a/framework/base/Exception.php b/framework/base/Exception.php
deleted file mode 100644
index 7d26bd0..0000000
--- a/framework/base/Exception.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-/**
- * Exception represents a generic exception for all purposes.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Exception extends \Exception
-{
-	/**
-	 * @return string the user-friendly name of this exception
-	 */
-	public function getName()
-	{
-		return \Yii::t('yii|Exception');
-	}
-}
diff --git a/framework/base/HttpException.php b/framework/base/HttpException.php
deleted file mode 100644
index 948d96b..0000000
--- a/framework/base/HttpException.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-/**
- * HttpException represents an exception caused by an improper request of the end-user.
- *
- * HttpException can be differentiated via its [[statusCode]] property value which
- * keeps a standard HTTP status code (e.g. 404, 500). Error handlers may use this status code
- * to decide how to format the error page.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class HttpException extends UserException
-{
-	/**
-	 * @var integer HTTP status code, such as 403, 404, 500, etc.
-	 */
-	public $statusCode;
-
-	/**
-	 * Constructor.
-	 * @param integer $status HTTP status code, such as 404, 500, etc.
-	 * @param string $message error message
-	 * @param integer $code error code
-	 * @param \Exception $previous The previous exception used for the exception chaining.
-	 */
-	public function __construct($status, $message = null, $code = 0, \Exception $previous = null)
-	{
-		$this->statusCode = $status;
-		parent::__construct($message, $code, $previous);
-	}
-
-	/**
-	 * @return string the user-friendly name of this exception
-	 */
-	public function getName()
-	{
-		static $httpCodes = array(
-			100 => 'Continue',
-			101 => 'Switching Protocols',
-			102 => 'Processing',
-			118 => 'Connection timed out',
-			200 => 'OK',
-			201 => 'Created',
-			202 => 'Accepted',
-			203 => 'Non-Authoritative',
-			204 => 'No Content',
-			205 => 'Reset Content',
-			206 => 'Partial Content',
-			207 => 'Multi-Status',
-			210 => 'Content Different',
-			300 => 'Multiple Choices',
-			301 => 'Moved Permanently',
-			302 => 'Found',
-			303 => 'See Other',
-			304 => 'Not Modified',
-			305 => 'Use Proxy',
-			307 => 'Temporary Redirect',
-			310 => 'Too many Redirect',
-			400 => 'Bad Request',
-			401 => 'Unauthorized',
-			402 => 'Payment Required',
-			403 => 'Forbidden',
-			404 => 'Not Found',
-			405 => 'Method Not Allowed',
-			406 => 'Not Acceptable',
-			407 => 'Proxy Authentication Required',
-			408 => 'Request Time-out',
-			409 => 'Conflict',
-			410 => 'Gone',
-			411 => 'Length Required',
-			412 => 'Precondition Failed',
-			413 => 'Request Entity Too Large',
-			414 => 'Request-URI Too Long',
-			415 => 'Unsupported Media Type',
-			416 => 'Requested range unsatisfiable',
-			417 => 'Expectation failed',
-			418 => 'I’m a teapot',
-			422 => 'Unprocessable entity',
-			423 => 'Locked',
-			424 => 'Method failure',
-			425 => 'Unordered Collection',
-			426 => 'Upgrade Required',
-			449 => 'Retry With',
-			450 => 'Blocked by Windows Parental Controls',
-			500 => 'Internal Server Error',
-			501 => 'Not Implemented',
-			502 => 'Bad Gateway ou Proxy Error',
-			503 => 'Service Unavailable',
-			504 => 'Gateway Time-out',
-			505 => 'HTTP Version not supported',
-			507 => 'Insufficient storage',
-			509 => 'Bandwidth Limit Exceeded',
-		);
-
-		if(isset($httpCodes[$this->statusCode]))
-			return $httpCodes[$this->statusCode];
-		else
-			return \Yii::t('yii|Error');
-	}
-}
diff --git a/framework/base/InlineAction.php b/framework/base/InlineAction.php
deleted file mode 100644
index c5afe28..0000000
--- a/framework/base/InlineAction.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-/**
- * InlineAction represents an action that is defined as a controller method.
- *
- * The name of the controller method is available via [[actionMethod]] which
- * is set by the [[controller]] who creates this action.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class InlineAction extends Action
-{
-	/**
-	 * @var string the controller method that  this inline action is associated with
-	 */
-	public $actionMethod;
-
-	/**
-	 * @param string $id the ID of this action
-	 * @param Controller $controller the controller that owns this action
-	 * @param string $actionMethod the controller method that  this inline action is associated with
-	 * @param array $config name-value pairs that will be used to initialize the object properties
-	 */
-	public function __construct($id, $controller, $actionMethod, $config = array())
-	{
-		$this->actionMethod = $actionMethod;
-		parent::__construct($id, $controller, $config);
-	}
-
-	/**
-	 * Runs this action with the specified parameters.
-	 * This method is mainly invoked by the controller.
-	 * @param array $params action parameters
-	 * @return integer the exit status (0 means normal, non-zero means abnormal).
-	 */
-	public function runWithParams($params)
-	{
-		$args = $this->controller->bindActionParams($this, $params);
-		return (int)call_user_func_array(array($this->controller, $this->actionMethod), $args);
-	}
-}
diff --git a/framework/base/InvalidCallException.php b/framework/base/InvalidCallException.php
deleted file mode 100644
index 9aefe14..0000000
--- a/framework/base/InvalidCallException.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-/**
- * InvalidCallException represents an exception caused by calling a method in a wrong way.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class InvalidCallException extends Exception
-{
-	/**
-	 * @return string the user-friendly name of this exception
-	 */
-	public function getName()
-	{
-		return \Yii::t('yii|Invalid Call');
-	}
-}
-
diff --git a/framework/base/InvalidConfigException.php b/framework/base/InvalidConfigException.php
deleted file mode 100644
index 389737c..0000000
--- a/framework/base/InvalidConfigException.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-/**
- * InvalidConfigException represents an exception caused by incorrect object configuration.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class InvalidConfigException extends Exception
-{
-	/**
-	 * @return string the user-friendly name of this exception
-	 */
-	public function getName()
-	{
-		return \Yii::t('yii|Invalid Configuration');
-	}
-}
-
diff --git a/framework/base/InvalidParamException.php b/framework/base/InvalidParamException.php
deleted file mode 100644
index a8c96fd..0000000
--- a/framework/base/InvalidParamException.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-/**
- * InvalidParamException represents an exception caused by invalid parameters passed to a method.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class InvalidParamException extends Exception
-{
-	/**
-	 * @return string the user-friendly name of this exception
-	 */
-	public function getName()
-	{
-		return \Yii::t('yii|Invalid Parameter');
-	}
-}
-
diff --git a/framework/base/InvalidRequestException.php b/framework/base/InvalidRequestException.php
deleted file mode 100644
index 6663e29..0000000
--- a/framework/base/InvalidRequestException.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-/**
- * InvalidRequestException represents an exception caused by incorrect end user request.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class InvalidRequestException extends UserException
-{
-	/**
-	 * @return string the user-friendly name of this exception
-	 */
-	public function getName()
-	{
-		return \Yii::t('yii|Invalid Request');
-	}
-}
-
diff --git a/framework/base/InvalidRouteException.php b/framework/base/InvalidRouteException.php
deleted file mode 100644
index 6d2256e..0000000
--- a/framework/base/InvalidRouteException.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-/**
- * InvalidRouteException represents an exception caused by an invalid route.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class InvalidRouteException extends UserException
-{
-	/**
-	 * @return string the user-friendly name of this exception
-	 */
-	public function getName()
-	{
-		return \Yii::t('yii|Invalid Route');
-	}
-}
-
diff --git a/framework/base/Model.php b/framework/base/Model.php
deleted file mode 100644
index 7f55239..0000000
--- a/framework/base/Model.php
+++ /dev/null
@@ -1,688 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-use yii\helpers\StringHelper;
-use yii\validators\RequiredValidator;
-use yii\validators\Validator;
-
-/**
- * Model is the base class for data models.
- *
- * Model implements the following commonly used features:
- *
- * - attribute declaration: by default, every public class member is considered as
- *   a model attribute
- * - attribute labels: each attribute may be associated with a label for display purpose
- * - massive attribute assignment
- * - scenario-based validation
- *
- * Model also raises the following events when performing data validation:
- *
- * - [[EVENT_BEFORE_VALIDATE]]: an event raised at the beginning of [[validate()]]
- * - [[EVENT_AFTER_VALIDATE]]: an event raised at the end of [[validate()]]
- *
- * You may directly use Model to store model data, or extend it with customization.
- * You may also customize Model by attaching [[ModelBehavior|model behaviors]].
- *
- * @property Vector $validators All the validators declared in the model.
- * @property array $activeValidators The validators applicable to the current [[scenario]].
- * @property array $errors Errors for all attributes or the specified attribute. Empty array is returned if no error.
- * @property array $attributes Attribute values (name=>value).
- * @property string $scenario The scenario that this model is in.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Model extends Component implements \IteratorAggregate, \ArrayAccess
-{
-	/**
-	 * @event ModelEvent an event raised at the beginning of [[validate()]]. You may set
-	 * [[ModelEvent::isValid]] to be false to stop the validation.
-	 */
-	const EVENT_BEFORE_VALIDATE = 'beforeValidate';
-	/**
-	 * @event Event an event raised at the end of [[validate()]]
-	 */
-	const EVENT_AFTER_VALIDATE = 'afterValidate';
-
-	/**
-	 * @var array validation errors (attribute name => array of errors)
-	 */
-	private $_errors;
-	/**
-	 * @var Vector vector of validators
-	 */
-	private $_validators;
-	/**
-	 * @var string current scenario
-	 */
-	private $_scenario = 'default';
-
-	/**
-	 * Returns the validation rules for attributes.
-	 *
-	 * Validation rules are used by [[validate()]] to check if attribute values are valid.
-	 * Child classes may override this method to declare different validation rules.
-	 *
-	 * Each rule is an array with the following structure:
-	 *
-	 * ~~~
-	 * array(
-	 *     'attribute list',
-	 *     'validator type',
-	 *     'on'=>'scenario name',
-	 *     ...other parameters...
-	 * )
-	 * ~~~
-	 *
-	 * where
-	 *
-	 *  - attribute list: required, specifies the attributes (separated by commas) to be validated;
-	 *  - validator type: required, specifies the validator to be used. It can be the name of a model
-	 *    class method, the name of a built-in validator, or a validator class name (or its path alias).
-	 *  - on: optional, specifies the [[scenario|scenarios]] (separated by commas) when the validation
-	 *    rule can be applied. If this option is not set, the rule will apply to all scenarios.
-	 *  - additional name-value pairs can be specified to initialize the corresponding validator properties.
-	 *    Please refer to individual validator class API for possible properties.
-	 *
-	 * A validator can be either an object of a class extending [[Validator]], or a model class method
-	 * (called *inline validator*) that has the following signature:
-	 *
-	 * ~~~
-	 * // $params refers to validation parameters given in the rule
-	 * function validatorName($attribute, $params)
-	 * ~~~
-	 *
-	 * Yii also provides a set of [[Validator::builtInValidators|built-in validators]].
-	 * They each has an alias name which can be used when specifying a validation rule.
-	 *
-	 * Below are some examples:
-	 *
-	 * ~~~
-	 * array(
-	 *     // built-in "required" validator
-	 *     array('username', 'required'),
-	 *     // built-in "length" validator customized with "min" and "max" properties
-	 *     array('username', 'length', 'min'=>3, 'max'=>12),
-	 *     // built-in "compare" validator that is used in "register" scenario only
-	 *     array('password', 'compare', 'compareAttribute'=>'password2', 'on'=>'register'),
-	 *     // an inline validator defined via the "authenticate()" method in the model class
-	 *     array('password', 'authenticate', 'on'=>'login'),
-	 *     // a validator of class "CaptchaValidator"
-	 *     array('captcha', 'CaptchaValidator'),
-	 * );
-	 * ~~~
-	 *
-	 * Note, in order to inherit rules defined in the parent class, a child class needs to
-	 * merge the parent rules with child rules using functions such as `array_merge()`.
-	 *
-	 * @return array validation rules
-	 * @see scenarios
-	 */
-	public function rules()
-	{
-		return array();
-	}
-
-	/**
-	 * Returns a list of scenarios and the corresponding active attributes.
-	 * An active attribute is one that is subject to validation in the current scenario.
-	 * The returned array should be in the following format:
-	 *
-	 * ~~~
-	 * array(
-	 *     'scenario1' => array('attribute11', 'attribute12', ...),
-	 *     'scenario2' => array('attribute21', 'attribute22', ...),
-	 *     ...
-	 * )
-	 * ~~~
-	 *
-	 * By default, an active attribute that is considered safe and can be massively assigned.
-	 * If an attribute should NOT be massively assigned (thus considered unsafe),
-	 * please prefix the attribute with an exclamation character (e.g. '!rank').
-	 *
-	 * The default implementation of this method will return a 'default' scenario
-	 * which corresponds to all attributes listed in the validation rules applicable
-	 * to the 'default' scenario.
-	 *
-	 * @return array a list of scenarios and the corresponding active attributes.
-	 */
-	public function scenarios()
-	{
-		$attributes = array();
-		foreach ($this->getActiveValidators() as $validator) {
-			if ($validator->isActive('default')) {
-				foreach ($validator->attributes as $name) {
-					$attributes[$name] = true;
-				}
-			}
-		}
-		return array(
-			'default' => array_keys($attributes),
-		);
-	}
-
-	/**
-	 * Returns the form name that this model class should use.
-	 *
-	 * The form name is mainly used by [[\yii\web\ActiveForm]] to determine how to name
-	 * the input fields for the attributes in a model. If the form name is "A" and an attribute
-	 * name is "b", then the corresponding input name would be "A[b]". If the form name is
-	 * an empty string, then the input name would be "b".
-	 *
-	 * By default, this method returns the model class name (without the namespace part)
-	 * as the form name. You may override it when the model is used in different forms.
-	 *
-	 * @return string the form name of this model class.
-	 */
-	public function formName()
-	{
-		$class = get_class($this);
-		$pos = strrpos($class, '\\');
-		return $pos === false ? $class : substr($class, $pos + 1);
-	}
-
-	/**
-	 * Returns the list of attribute names.
-	 * By default, this method returns all public non-static properties of the class.
-	 * You may override this method to change the default behavior.
-	 * @return array list of attribute names.
-	 */
-	public function attributes()
-	{
-		$class = new \ReflectionClass($this);
-		$names = array();
-		foreach ($class->getProperties(\ReflectionProperty::IS_PUBLIC) as $property) {
-			$name = $property->getName();
-			if (!$property->isStatic()) {
-				$names[] = $name;
-			}
-		}
-		return $names;
-	}
-
-	/**
-	 * Returns the attribute labels.
-	 *
-	 * Attribute labels are mainly used for display purpose. For example, given an attribute
-	 * `firstName`, we can declare a label `First Name` which is more user-friendly and can
-	 * be displayed to end users.
-	 *
-	 * By default an attribute label is generated using [[generateAttributeLabel()]].
-	 * This method allows you to explicitly specify attribute labels.
-	 *
-	 * Note, in order to inherit labels defined in the parent class, a child class needs to
-	 * merge the parent labels with child labels using functions such as `array_merge()`.
-	 *
-	 * @return array attribute labels (name=>label)
-	 * @see generateAttributeLabel
-	 */
-	public function attributeLabels()
-	{
-		return array();
-	}
-
-	/**
-	 * Performs the data validation.
-	 *
-	 * This method executes the validation rules applicable to the current [[scenario]].
-	 * The following criteria are used to determine whether a rule is currently applicable:
-	 *
-	 * - the rule must be associated with the attributes relevant to the current scenario;
-	 * - the rules must be effective for the current scenario.
-	 *
-	 * This method will call [[beforeValidate()]] and [[afterValidate()]] before and
-	 * after the actual validation, respectively. If [[beforeValidate()]] returns false,
-	 * the validation will be cancelled and [[afterValidate()]] will not be called.
-	 *
-	 * Errors found during the validation can be retrieved via [[getErrors()]]
-	 * and [[getError()]].
-	 *
-	 * @param array $attributes list of attributes that should be validated.
-	 * If this parameter is empty, it means any attribute listed in the applicable
-	 * validation rules should be validated.
-	 * @param boolean $clearErrors whether to call [[clearErrors()]] before performing validation
-	 * @return boolean whether the validation is successful without any error.
-	 */
-	public function validate($attributes = null, $clearErrors = true)
-	{
-		if ($clearErrors) {
-			$this->clearErrors();
-		}
-		if ($attributes === null) {
-			$attributes = $this->activeAttributes();
-		}
-		if ($this->beforeValidate()) {
-			foreach ($this->getActiveValidators() as $validator) {
-				$validator->validate($this, $attributes);
-			}
-			$this->afterValidate();
-			return !$this->hasErrors();
-		}
-		return false;
-	}
-
-	/**
-	 * This method is invoked before validation starts.
-	 * The default implementation raises a `beforeValidate` event.
-	 * You may override this method to do preliminary checks before validation.
-	 * Make sure the parent implementation is invoked so that the event can be raised.
-	 * @return boolean whether the validation should be executed. Defaults to true.
-	 * If false is returned, the validation will stop and the model is considered invalid.
-	 */
-	public function beforeValidate()
-	{
-		$event = new ModelEvent;
-		$this->trigger(self::EVENT_BEFORE_VALIDATE, $event);
-		return $event->isValid;
-	}
-
-	/**
-	 * This method is invoked after validation ends.
-	 * The default implementation raises an `afterValidate` event.
-	 * You may override this method to do postprocessing after validation.
-	 * Make sure the parent implementation is invoked so that the event can be raised.
-	 */
-	public function afterValidate()
-	{
-		$this->trigger(self::EVENT_AFTER_VALIDATE);
-	}
-
-	/**
-	 * Returns all the validators declared in [[rules()]].
-	 *
-	 * This method differs from [[getActiveValidators()]] in that the latter
-	 * only returns the validators applicable to the current [[scenario]].
-	 *
-	 * Because this method returns a [[Vector]] object, you may
-	 * manipulate it by inserting or removing validators (useful in model behaviors).
-	 * For example,
-	 *
-	 * ~~~
-	 * $model->validators->add($newValidator);
-	 * ~~~
-	 *
-	 * @return Vector all the validators declared in the model.
-	 */
-	public function getValidators()
-	{
-		if ($this->_validators === null) {
-			$this->_validators = $this->createValidators();
-		}
-		return $this->_validators;
-	}
-
-	/**
-	 * Returns the validators applicable to the current [[scenario]].
-	 * @param string $attribute the name of the attribute whose applicable validators should be returned.
-	 * If this is null, the validators for ALL attributes in the model will be returned.
-	 * @return \yii\validators\Validator[] the validators applicable to the current [[scenario]].
-	 */
-	public function getActiveValidators($attribute = null)
-	{
-		$validators = array();
-		$scenario = $this->getScenario();
-		/** @var $validator Validator */
-		foreach ($this->getValidators() as $validator) {
-			if ($validator->isActive($scenario) && ($attribute === null || in_array($attribute, $validator->attributes, true))) {
-				$validators[] = $validator;
-			}
-		}
-		return $validators;
-	}
-
-	/**
-	 * Creates validator objects based on the validation rules specified in [[rules()]].
-	 * Unlike [[getValidators()]], each time this method is called, a new list of validators will be returned.
-	 * @return Vector validators
-	 * @throws InvalidConfigException if any validation rule configuration is invalid
-	 */
-	public function createValidators()
-	{
-		$validators = new Vector;
-		foreach ($this->rules() as $rule) {
-			if ($rule instanceof Validator) {
-				$validators->add($rule);
-			} elseif (is_array($rule) && isset($rule[0], $rule[1])) { // attributes, validator type
-				$validator = Validator::createValidator($rule[1], $this, $rule[0], array_slice($rule, 2));
-				$validators->add($validator);
-			} else {
-				throw new InvalidConfigException('Invalid validation rule: a rule must specify both attribute names and validator type.');
-			}
-		}
-		return $validators;
-	}
-
-	/**
-	 * Returns a value indicating whether the attribute is required.
-	 * This is determined by checking if the attribute is associated with a
-	 * [[\yii\validators\RequiredValidator|required]] validation rule in the
-	 * current [[scenario]].
-	 * @param string $attribute attribute name
-	 * @return boolean whether the attribute is required
-	 */
-	public function isAttributeRequired($attribute)
-	{
-		foreach ($this->getActiveValidators($attribute) as $validator) {
-			if ($validator instanceof RequiredValidator) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Returns a value indicating whether the attribute is safe for massive assignments.
-	 * @param string $attribute attribute name
-	 * @return boolean whether the attribute is safe for massive assignments
-	 */
-	public function isAttributeSafe($attribute)
-	{
-		return in_array($attribute, $this->safeAttributes(), true);
-	}
-
-	/**
-	 * Returns the text label for the specified attribute.
-	 * @param string $attribute the attribute name
-	 * @return string the attribute label
-	 * @see generateAttributeLabel
-	 * @see attributeLabels
-	 */
-	public function getAttributeLabel($attribute)
-	{
-		$labels = $this->attributeLabels();
-		return isset($labels[$attribute]) ? $labels[$attribute] : $this->generateAttributeLabel($attribute);
-	}
-
-	/**
-	 * Returns a value indicating whether there is any validation error.
-	 * @param string|null $attribute attribute name. Use null to check all attributes.
-	 * @return boolean whether there is any error.
-	 */
-	public function hasErrors($attribute = null)
-	{
-		return $attribute === null ? !empty($this->_errors) : isset($this->_errors[$attribute]);
-	}
-
-	/**
-	 * Returns the errors for all attribute or a single attribute.
-	 * @param string $attribute attribute name. Use null to retrieve errors for all attributes.
-	 * @return array errors for all attributes or the specified attribute. Empty array is returned if no error.
-	 * Note that when returning errors for all attributes, the result is a two-dimensional array, like the following:
-	 *
-	 * ~~~
-	 * array(
-	 *     'username' => array(
-	 *         'Username is required.',
-	 *         'Username must contain only word characters.',
-	 *     ),
-	 *     'email' => array(
-	 *         'Email address is invalid.',
-	 *     )
-	 * )
-	 * ~~~
-	 *
-	 * @see getError
-	 */
-	public function getErrors($attribute = null)
-	{
-		if ($attribute === null) {
-			return $this->_errors === null ? array() : $this->_errors;
-		} else {
-			return isset($this->_errors[$attribute]) ? $this->_errors[$attribute] : array();
-		}
-	}
-
-	/**
-	 * Returns the first error of every attribute in the model.
-	 * @return array the first errors. An empty array will be returned if there is no error.
-	 */
-	public function getFirstErrors()
-	{
-		if (empty($this->_errors)) {
-			return array();
-		} else {
-			$errors = array();
-			foreach ($this->_errors as $attributeErrors) {
-				if (isset($attributeErrors[0])) {
-					$errors[] = $attributeErrors[0];
-				}
-			}
-		}
-		return $errors;
-	}
-
-	/**
-	 * Returns the first error of the specified attribute.
-	 * @param string $attribute attribute name.
-	 * @return string the error message. Null is returned if no error.
-	 * @see getErrors
-	 */
-	public function getFirstError($attribute)
-	{
-		return isset($this->_errors[$attribute]) ? reset($this->_errors[$attribute]) : null;
-	}
-
-	/**
-	 * Adds a new error to the specified attribute.
-	 * @param string $attribute attribute name
-	 * @param string $error new error message
-	 */
-	public function addError($attribute, $error)
-	{
-		$this->_errors[$attribute][] = $error;
-	}
-
-	/**
-	 * Removes errors for all attributes or a single attribute.
-	 * @param string $attribute attribute name. Use null to remove errors for all attribute.
-	 */
-	public function clearErrors($attribute = null)
-	{
-		if ($attribute === null) {
-			$this->_errors = array();
-		} else {
-			unset($this->_errors[$attribute]);
-		}
-	}
-
-	/**
-	 * Generates a user friendly attribute label based on the give attribute name.
-	 * This is done by replacing underscores, dashes and dots with blanks and
-	 * changing the first letter of each word to upper case.
-	 * For example, 'department_name' or 'DepartmentName' will generate 'Department Name'.
-	 * @param string $name the column name
-	 * @return string the attribute label
-	 */
-	public function generateAttributeLabel($name)
-	{
-		return StringHelper::camel2words($name, true);
-	}
-
-	/**
-	 * Returns attribute values.
-	 * @param array $names list of attributes whose value needs to be returned.
-	 * Defaults to null, meaning all attributes listed in [[attributes()]] will be returned.
-	 * If it is an array, only the attributes in the array will be returned.
-	 * @param array $except list of attributes whose value should NOT be returned.
-	 * @return array attribute values (name=>value).
-	 */
-	public function getAttributes($names = null, $except = array())
-	{
-		$values = array();
-		if ($names === null) {
-			$names = $this->attributes();
-		}
-		foreach ($names as $name) {
-			$values[$name] = $this->$name;
-		}
-		foreach ($except as $name) {
-			unset($values[$name]);
-		}
-
-		return $values;
-	}
-
-	/**
-	 * Sets the attribute values in a massive way.
-	 * @param array $values attribute values (name=>value) to be assigned to the model.
-	 * @param boolean $safeOnly whether the assignments should only be done to the safe attributes.
-	 * A safe attribute is one that is associated with a validation rule in the current [[scenario]].
-	 * @see safeAttributes()
-	 * @see attributes()
-	 */
-	public function setAttributes($values, $safeOnly = true)
-	{
-		if (is_array($values)) {
-			$attributes = array_flip($safeOnly ? $this->safeAttributes() : $this->attributes());
-			foreach ($values as $name => $value) {
-				if (isset($attributes[$name])) {
-					$this->$name = $value;
-				} elseif ($safeOnly) {
-					$this->onUnsafeAttribute($name, $value);
-				}
-			}
-		}
-	}
-
-	/**
-	 * This method is invoked when an unsafe attribute is being massively assigned.
-	 * The default implementation will log a warning message if YII_DEBUG is on.
-	 * It does nothing otherwise.
-	 * @param string $name the unsafe attribute name
-	 * @param mixed $value the attribute value
-	 */
-	public function onUnsafeAttribute($name, $value)
-	{
-		if (YII_DEBUG) {
-			\Yii::info("Failed to set unsafe attribute '$name' in '" . get_class($this) . "'.", __METHOD__);
-		}
-	}
-
-	/**
-	 * Returns the scenario that this model is used in.
-	 *
-	 * Scenario affects how validation is performed and which attributes can
-	 * be massively assigned.
-	 *
-	 * @return string the scenario that this model is in. Defaults to 'default'.
-	 */
-	public function getScenario()
-	{
-		return $this->_scenario;
-	}
-
-	/**
-	 * Sets the scenario for the model.
-	 * @param string $value the scenario that this model is in.
-	 * @see getScenario
-	 */
-	public function setScenario($value)
-	{
-		$this->_scenario = $value;
-	}
-
-	/**
-	 * Returns the attribute names that are safe to be massively assigned in the current scenario.
-	 * @return array safe attribute names
-	 */
-	public function safeAttributes()
-	{
-		$scenario = $this->getScenario();
-		$scenarios = $this->scenarios();
-		$attributes = array();
-		if (isset($scenarios[$scenario])) {
-			foreach ($scenarios[$scenario] as $attribute) {
-				if ($attribute[0] !== '!') {
-					$attributes[] = $attribute;
-				}
-			}
-		}
-		return $attributes;
-	}
-
-	/**
-	 * Returns the attribute names that are subject to validation in the current scenario.
-	 * @return array safe attribute names
-	 */
-	public function activeAttributes()
-	{
-		$scenario = $this->getScenario();
-		$scenarios = $this->scenarios();
-		if (isset($scenarios[$scenario])) {
-			$attributes = $scenarios[$this->getScenario()];
-			foreach ($attributes as $i => $attribute) {
-				if ($attribute[0] === '!') {
-					$attributes[$i] = substr($attribute, 1);
-				}
-			}
-			return $attributes;
-		} else {
-			return array();
-		}
-	}
-
-	/**
-	 * Returns an iterator for traversing the attributes in the model.
-	 * This method is required by the interface IteratorAggregate.
-	 * @return DictionaryIterator an iterator for traversing the items in the list.
-	 */
-	public function getIterator()
-	{
-		$attributes = $this->getAttributes();
-		return new DictionaryIterator($attributes);
-	}
-
-	/**
-	 * Returns whether there is an element at the specified offset.
-	 * This method is required by the SPL interface `ArrayAccess`.
-	 * It is implicitly called when you use something like `isset($model[$offset])`.
-	 * @param mixed $offset the offset to check on
-	 * @return boolean
-	 */
-	public function offsetExists($offset)
-	{
-		return $this->$offset !== null;
-	}
-
-	/**
-	 * Returns the element at the specified offset.
-	 * This method is required by the SPL interface `ArrayAccess`.
-	 * It is implicitly called when you use something like `$value = $model[$offset];`.
-	 * @param mixed $offset the offset to retrieve element.
-	 * @return mixed the element at the offset, null if no element is found at the offset
-	 */
-	public function offsetGet($offset)
-	{
-		return $this->$offset;
-	}
-
-	/**
-	 * Sets the element at the specified offset.
-	 * This method is required by the SPL interface `ArrayAccess`.
-	 * It is implicitly called when you use something like `$model[$offset] = $item;`.
-	 * @param integer $offset the offset to set element
-	 * @param mixed $item the element value
-	 */
-	public function offsetSet($offset, $item)
-	{
-		$this->$offset = $item;
-	}
-
-	/**
-	 * Sets the element value at the specified offset to null.
-	 * This method is required by the SPL interface `ArrayAccess`.
-	 * It is implicitly called when you use something like `unset($model[$offset])`.
-	 * @param mixed $offset the offset to unset element
-	 */
-	public function offsetUnset($offset)
-	{
-		$this->$offset = null;
-	}
-}
diff --git a/framework/base/ModelEvent.php b/framework/base/ModelEvent.php
deleted file mode 100644
index 57e41f9..0000000
--- a/framework/base/ModelEvent.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-/**
- * ModelEvent class.
- *
- * ModelEvent represents the parameter needed by model events.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class ModelEvent extends Event
-{
-	/**
-	 * @var boolean whether the model is in valid status. Defaults to true.
-	 * A model is in valid status if it passes validations or certain checks.
-	 */
-	public $isValid = true;
-}
diff --git a/framework/base/Module.php b/framework/base/Module.php
deleted file mode 100644
index b1597e2..0000000
--- a/framework/base/Module.php
+++ /dev/null
@@ -1,650 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-use Yii;
-use yii\helpers\StringHelper;
-
-/**
- * Module is the base class for module and application classes.
- *
- * A module represents a sub-application which contains MVC elements by itself, such as
- * models, views, controllers, etc.
- *
- * A module may consist of [[modules|sub-modules]].
- *
- * [[components|Components]] may be registered with the module so that they are globally
- * accessible within the module.
- *
- * @property string $uniqueId An ID that uniquely identifies this module among all modules within
- * the current application.
- * @property string $basePath The root directory of the module. Defaults to the directory containing the module class.
- * @property string $controllerPath The directory containing the controller classes. Defaults to "[[basePath]]/controllers".
- * @property string $viewPath The directory containing the view files within this module. Defaults to "[[basePath]]/views".
- * @property string $layoutPath The directory containing the layout view files within this module. Defaults to "[[viewPath]]/layouts".
- * @property array $modules The configuration of the currently installed modules (module ID => configuration).
- * @property array $components The components (indexed by their IDs) registered within this module.
- * @property array $import List of aliases to be imported. This property is write-only.
- * @property array $aliases List of aliases to be defined. This property is write-only.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-abstract class Module extends Component
-{
-	/**
-	 * @event ActionEvent an event raised before executing a controller action.
-	 * You may set [[ActionEvent::isValid]] to be false to cancel the action execution.
-	 */
-	const EVENT_BEFORE_ACTION = 'beforeAction';
-	/**
-	 * @event ActionEvent an event raised after executing a controller action.
-	 */
-	const EVENT_AFTER_ACTION = 'afterAction';
-	/**
-	 * @var array custom module parameters (name => value).
-	 */
-	public $params = array();
-	/**
-	 * @var array the IDs of the components that should be preloaded when this module is created.
-	 */
-	public $preload = array();
-	/**
-	 * @var string an ID that uniquely identifies this module among other modules which have the same [[module|parent]].
-	 */
-	public $id;
-	/**
-	 * @var Module the parent module of this module. Null if this module does not have a parent.
-	 */
-	public $module;
-	/**
-	 * @var string|boolean the layout that should be applied for views within this module. This refers to a view name
-	 * relative to [[layoutPath]]. If this is not set, it means the layout value of the [[module|parent module]]
-	 * will be taken. If this is false, layout will be disabled within this module.
-	 */
-	public $layout;
-	/**
-	 * @var array mapping from controller ID to controller configurations.
-	 * Each name-value pair specifies the configuration of a single controller.
-	 * A controller configuration can be either a string or an array.
-	 * If the former, the string should be the class name or path alias of the controller.
-	 * If the latter, the array must contain a 'class' element which specifies
-	 * the controller's class name or path alias, and the rest of the name-value pairs
-	 * in the array are used to initialize the corresponding controller properties. For example,
-	 *
-	 * ~~~
-	 * array(
-	 *   'account' => '@app/controllers/UserController',
-	 *   'article' => array(
-	 *      'class' => '@app/controllers/PostController',
-	 *      'pageTitle' => 'something new',
-	 *   ),
-	 * )
-	 * ~~~
-	 */
-	public $controllerMap = array();
-	/**
-	 * @var string the namespace that controller classes are in. Default is to use global namespace.
-	 */
-	public $controllerNamespace;
-	/**
-	 * @return string the default route of this module. Defaults to 'default'.
-	 * The route may consist of child module ID, controller ID, and/or action ID.
-	 * For example, `help`, `post/create`, `admin/post/create`.
-	 * If action ID is not given, it will take the default value as specified in
-	 * [[Controller::defaultAction]].
-	 */
-	public $defaultRoute = 'default';
-	/**
-	 * @var string the root directory of the module.
-	 */
-	private $_basePath;
-	/**
-	 * @var string the root directory that contains view files for this module
-	 */
-	private $_viewPath;
-	/**
-	 * @var string the root directory that contains layout view files for this module.
-	 */
-	private $_layoutPath;
-	/**
-	 * @var string the directory containing controller classes in the module.
-	 */
-	private $_controllerPath;
-	/**
-	 * @var array child modules of this module
-	 */
-	private $_modules = array();
-	/**
-	 * @var array components registered under this module
-	 */
-	private $_components = array();
-
-	/**
-	 * Constructor.
-	 * @param string $id the ID of this module
-	 * @param Module $parent the parent module (if any)
-	 * @param array $config name-value pairs that will be used to initialize the object properties
-	 */
-	public function __construct($id, $parent = null, $config = array())
-	{
-		$this->id = $id;
-		$this->module = $parent;
-		parent::__construct($config);
-	}
-
-	/**
-	 * Getter magic method.
-	 * This method is overridden to support accessing components
-	 * like reading module properties.
-	 * @param string $name component or property name
-	 * @return mixed the named property value
-	 */
-	public function __get($name)
-	{
-		if ($this->hasComponent($name)) {
-			return $this->getComponent($name);
-		} else {
-			return parent::__get($name);
-		}
-	}
-
-	/**
-	 * Checks if a property value is null.
-	 * This method overrides the parent implementation by checking
-	 * if the named component is loaded.
-	 * @param string $name the property name or the event name
-	 * @return boolean whether the property value is null
-	 */
-	public function __isset($name)
-	{
-		if ($this->hasComponent($name)) {
-			return $this->getComponent($name) !== null;
-		} else {
-			return parent::__isset($name);
-		}
-	}
-
-	/**
-	 * Initializes the module.
-	 * This method is called after the module is created and initialized with property values
-	 * given in configuration. The default implement will create a path alias using the module [[id]]
-	 * and then call [[preloadComponents()]] to load components that are declared in [[preload]].
-	 */
-	public function init()
-	{
-		$this->preloadComponents();
-	}
-
-	/**
-	 * Returns an ID that uniquely identifies this module among all modules within the current application.
-	 * Note that if the module is an application, an empty string will be returned.
-	 * @return string the unique ID of the module.
-	 */
-	public function getUniqueId()
-	{
-		if ($this instanceof Application) {
-			return '';
-		} elseif ($this->module) {
-			return $this->module->getUniqueId() . '/' . $this->id;
-		} else {
-			return $this->id;
-		}
-	}
-
-	/**
-	 * Returns the root directory of the module.
-	 * It defaults to the directory containing the module class file.
-	 * @return string the root directory of the module.
-	 */
-	public function getBasePath()
-	{
-		if ($this->_basePath === null) {
-			$class = new \ReflectionClass($this);
-			$this->_basePath = dirname($class->getFileName());
-		}
-		return $this->_basePath;
-	}
-
-	/**
-	 * Sets the root directory of the module.
-	 * This method can only be invoked at the beginning of the constructor.
-	 * @param string $path the root directory of the module. This can be either a directory name or a path alias.
-	 * @throws InvalidParamException if the directory does not exist.
-	 */
-	public function setBasePath($path)
-	{
-		$path = Yii::getAlias($path);
-		$p = realpath($path);
-		if ($p !== false && is_dir($p)) {
-			$this->_basePath = $p;
-		} else {
-			throw new InvalidParamException("The directory does not exist: $path");
-		}
-	}
-
-	/**
-	 * Returns the directory that contains the controller classes.
-	 * Defaults to "[[basePath]]/controllers".
-	 * @return string the directory that contains the controller classes.
-	 */
-	public function getControllerPath()
-	{
-		if ($this->_controllerPath !== null) {
-			return $this->_controllerPath;
-		} else {
-			return $this->_controllerPath = $this->getBasePath() . DIRECTORY_SEPARATOR . 'controllers';
-		}
-	}
-
-	/**
-	 * Sets the directory that contains the controller classes.
-	 * @param string $path the directory that contains the controller classes.
-	 * This can be either a directory name or a path alias.
-	 * @throws Exception if the directory is invalid
-	 */
-	public function setControllerPath($path)
-	{
-		$this->_controllerPath = Yii::getAlias($path);
-	}
-
-	/**
-	 * Returns the directory that contains the view files for this module.
-	 * @return string the root directory of view files. Defaults to "[[basePath]]/view".
-	 */
-	public function getViewPath()
-	{
-		if ($this->_viewPath !== null) {
-			return $this->_viewPath;
-		} else {
-			return $this->_viewPath = $this->getBasePath() . DIRECTORY_SEPARATOR . 'views';
-		}
-	}
-
-	/**
-	 * Sets the directory that contains the view files.
-	 * @param string $path the root directory of view files.
-	 * @throws Exception if the directory is invalid
-	 */
-	public function setViewPath($path)
-	{
-		$this->_viewPath = Yii::getAlias($path);
-	}
-
-	/**
-	 * Returns the directory that contains layout view files for this module.
-	 * @return string the root directory of layout files. Defaults to "[[viewPath]]/layouts".
-	 */
-	public function getLayoutPath()
-	{
-		if ($this->_layoutPath !== null) {
-			return $this->_layoutPath;
-		} else {
-			return $this->_layoutPath = $this->getViewPath() . DIRECTORY_SEPARATOR . 'layouts';
-		}
-	}
-
-	/**
-	 * Sets the directory that contains the layout files.
-	 * @param string $path the root directory of layout files.
-	 * @throws Exception if the directory is invalid
-	 */
-	public function setLayoutPath($path)
-	{
-		$this->_layoutPath = Yii::getAlias($path);
-	}
-
-	/**
-	 * Defines path aliases.
-	 * This method calls [[Yii::setAlias()]] to register the path aliases.
-	 * This method is provided so that you can define path aliases when configuring a module.
-	 * @param array $aliases list of path aliases to be defined. The array keys are alias names
-	 * (must start with '@') and the array values are the corresponding paths or aliases.
-	 * For example,
-	 *
-	 * ~~~
-	 * array(
-	 *	'@models' => '@app/models', // an existing alias
-	 *	'@backend' => __DIR__ . '/../backend',  // a directory
-	 * )
-	 * ~~~
-	 */
-	public function setAliases($aliases)
-	{
-		foreach ($aliases as $name => $alias) {
-			Yii::setAlias($name, $alias);
-		}
-	}
-
-	/**
-	 * Checks whether the named module exists.
-	 * @param string $id module ID
-	 * @return boolean whether the named module exists. Both loaded and unloaded modules
-	 * are considered.
-	 */
-	public function hasModule($id)
-	{
-		return isset($this->_modules[$id]);
-	}
-
-	/**
-	 * Retrieves the named module.
-	 * @param string $id module ID (case-sensitive)
-	 * @param boolean $load whether to load the module if it is not yet loaded.
-	 * @return Module|null the module instance, null if the module
-	 * does not exist.
-	 * @see hasModule()
-	 */
-	public function getModule($id, $load = true)
-	{
-		if (isset($this->_modules[$id])) {
-			if ($this->_modules[$id] instanceof Module) {
-				return $this->_modules[$id];
-			} elseif ($load) {
-				Yii::trace("Loading module: $id", __METHOD__);
-				return $this->_modules[$id] = Yii::createObject($this->_modules[$id], $id, $this);
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Adds a sub-module to this module.
-	 * @param string $id module ID
-	 * @param Module|array|null $module the sub-module to be added to this module. This can
-	 * be one of the followings:
-	 *
-	 * - a [[Module]] object
-	 * - a configuration array: when [[getModule()]] is called initially, the array
-	 *   will be used to instantiate the sub-module
-	 * - null: the named sub-module will be removed from this module
-	 */
-	public function setModule($id, $module)
-	{
-		if ($module === null) {
-			unset($this->_modules[$id]);
-		} else {
-			$this->_modules[$id] = $module;
-		}
-	}
-
-	/**
-	 * Returns the sub-modules in this module.
-	 * @param boolean $loadedOnly whether to return the loaded sub-modules only. If this is set false,
-	 * then all sub-modules registered in this module will be returned, whether they are loaded or not.
-	 * Loaded modules will be returned as objects, while unloaded modules as configuration arrays.
-	 * @return array the modules (indexed by their IDs)
-	 */
-	public function getModules($loadedOnly = false)
-	{
-		if ($loadedOnly) {
-			$modules = array();
-			foreach ($this->_modules as $module) {
-				if ($module instanceof Module) {
-					$modules[] = $module;
-				}
-			}
-			return $modules;
-		} else {
-			return $this->_modules;
-		}
-	}
-
-	/**
-	 * Registers sub-modules in the current module.
-	 *
-	 * Each sub-module should be specified as a name-value pair, where
-	 * name refers to the ID of the module and value the module or a configuration
-	 * array that can be used to create the module. In the latter case, [[Yii::createObject()]]
-	 * will be used to create the module.
-	 *
-	 * If a new sub-module has the same ID as an existing one, the existing one will be overwritten silently.
-	 *
-	 * The following is an example for registering two sub-modules:
-	 *
-	 * ~~~
-	 * array(
-	 *     'comment' => array(
-	 *         'class' => 'app\modules\CommentModule',
-	 *         'db' => 'db',
-	 *     ),
-	 *     'booking' => array(
-	 *         'class' => 'app\modules\BookingModule',
-	 *     ),
-	 * )
-	 * ~~~
-	 *
-	 * @param array $modules modules (id => module configuration or instances)
-	 */
-	public function setModules($modules)
-	{
-		foreach ($modules as $id => $module) {
-			$this->_modules[$id] = $module;
-		}
-	}
-
-	/**
-	 * Checks whether the named component exists.
-	 * @param string $id component ID
-	 * @return boolean whether the named component exists. Both loaded and unloaded components
-	 * are considered.
-	 */
-	public function hasComponent($id)
-	{
-		return isset($this->_components[$id]);
-	}
-
-	/**
-	 * Retrieves the named component.
-	 * @param string $id component ID (case-sensitive)
-	 * @param boolean $load whether to load the component if it is not yet loaded.
-	 * @return Component|null the component instance, null if the component does not exist.
-	 * @see hasComponent()
-	 */
-	public function getComponent($id, $load = true)
-	{
-		if (isset($this->_components[$id])) {
-			if ($this->_components[$id] instanceof Component) {
-				return $this->_components[$id];
-			} elseif ($load) {
-				Yii::trace("Loading component: $id", __METHOD__);
-				return $this->_components[$id] = Yii::createObject($this->_components[$id]);
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Registers a component with this module.
-	 * @param string $id component ID
-	 * @param Component|array|null $component the component to be registered with the module. This can
-	 * be one of the followings:
-	 *
-	 * - a [[Component]] object
-	 * - a configuration array: when [[getComponent()]] is called initially for this component, the array
-	 *   will be used to instantiate the component via [[Yii::createObject()]].
-	 * - null: the named component will be removed from the module
-	 */
-	public function setComponent($id, $component)
-	{
-		if ($component === null) {
-			unset($this->_components[$id]);
-		} else {
-			$this->_components[$id] = $component;
-		}
-	}
-
-	/**
-	 * Returns the registered components.
-	 * @param boolean $loadedOnly whether to return the loaded components only. If this is set false,
-	 * then all components specified in the configuration will be returned, whether they are loaded or not.
-	 * Loaded components will be returned as objects, while unloaded components as configuration arrays.
-	 * @return array the components (indexed by their IDs)
-	 */
-	public function getComponents($loadedOnly = false)
-	{
-		if ($loadedOnly) {
-			$components = array();
-			foreach ($this->_components as $component) {
-				if ($component instanceof Component) {
-					$components[] = $component;
-				}
-			}
-			return $components;
-		} else {
-			return $this->_components;
-		}
-	}
-
-	/**
-	 * Registers a set of components in this module.
-	 *
-	 * Each component should be specified as a name-value pair, where
-	 * name refers to the ID of the component and value the component or a configuration
-	 * array that can be used to create the component. In the latter case, [[Yii::createObject()]]
-	 * will be used to create the component.
-	 *
-	 * If a new component has the same ID as an existing one, the existing one will be overwritten silently.
-	 *
-	 * The following is an example for setting two components:
-	 *
-	 * ~~~
-	 * array(
-	 *     'db' => array(
-	 *         'class' => 'yii\db\Connection',
-	 *         'dsn' => 'sqlite:path/to/file.db',
-	 *     ),
-	 *     'cache' => array(
-	 *         'class' => 'yii\caching\DbCache',
-	 *         'db' => 'db',
-	 *     ),
-	 * )
-	 * ~~~
-	 *
-	 * @param array $components components (id => component configuration or instance)
-	 */
-	public function setComponents($components)
-	{
-		foreach ($components as $id => $component) {
-			if (isset($this->_components[$id]['class']) && !isset($component['class'])) {
-				$component['class'] = $this->_components[$id]['class'];
-			}
-			$this->_components[$id] = $component;
-		}
-	}
-
-	/**
-	 * Loads components that are declared in [[preload]].
-	 */
-	public function preloadComponents()
-	{
-		foreach ($this->preload as $id) {
-			$this->getComponent($id);
-		}
-	}
-
-	/**
-	 * Runs a controller action specified by a route.
-	 * This method parses the specified route and creates the corresponding child module(s), controller and action
-	 * instances. It then calls [[Controller::runAction()]] to run the action with the given parameters.
-	 * If the route is empty, the method will use [[defaultRoute]].
-	 * @param string $route the route that specifies the action.
-	 * @param array $params the parameters to be passed to the action
-	 * @return integer the status code returned by the action execution. 0 means normal, and other values mean abnormal.
-	 * @throws InvalidRouteException if the requested route cannot be resolved into an action successfully
-	 */
-	public function runAction($route, $params = array())
-	{
-		$result = $this->createController($route);
-		if (is_array($result)) {
-			/** @var $controller Controller */
-			list($controller, $actionID) = $result;
-			$oldController = Yii::$app->controller;
-			Yii::$app->controller = $controller;
-			$status = $controller->runAction($actionID, $params);
-			Yii::$app->controller = $oldController;
-			return $status;
-		} else {
-			throw new InvalidRouteException('Unable to resolve the request "' . trim($this->getUniqueId() . '/' . $route, '/') . '".');
-		}
-	}
-
-	/**
-	 * Creates a controller instance based on the controller ID.
-	 *
-	 * The controller is created within this module. The method first attempts to
-	 * create the controller based on the [[controllerMap]] of the module. If not available,
-	 * it will look for the controller class under the [[controllerPath]] and create an
-	 * instance of it.
-	 *
-	 * @param string $route the route consisting of module, controller and action IDs.
-	 * @return array|boolean If the controller is created successfully, it will be returned together
-	 * with the requested action ID. Otherwise false will be returned.
-	 * @throws InvalidConfigException if the controller class and its file do not match.
-	 */
-	public function createController($route)
-	{
-		if ($route === '') {
-			$route = $this->defaultRoute;
-		}
-		if (($pos = strpos($route, '/')) !== false) {
-			$id = substr($route, 0, $pos);
-			$route = substr($route, $pos + 1);
-		} else {
-			$id = $route;
-			$route = '';
-		}
-
-		$module = $this->getModule($id);
-		if ($module !== null) {
-			return $module->createController($route);
-		}
-
-		if (isset($this->controllerMap[$id])) {
-			$controller = Yii::createObject($this->controllerMap[$id], $id, $this);
-		} elseif (preg_match('/^[a-z0-9\\-_]+$/', $id)) {
-			$className = StringHelper::id2camel($id) . 'Controller';
-			$classFile = $this->controllerPath . DIRECTORY_SEPARATOR . $className . '.php';
-			if (!is_file($classFile)) {
-				return false;
-			}
-			$className = ltrim($this->controllerNamespace . '\\' . $className, '\\');
-			Yii::$classMap[$className] = $classFile;
-			if (is_subclass_of($className, 'yii\base\Controller')) {
-				$controller = new $className($id, $this);
-			} elseif (YII_DEBUG) {
-				throw new InvalidConfigException("Controller class must extend from \\yii\\base\\Controller.");
-			}
-		}
-
-		return isset($controller) ? array($controller, $route) : false;
-	}
-
-	/**
-	 * This method is invoked right before an action is to be executed (after all possible filters.)
-	 * You may override this method to do last-minute preparation for the action.
-	 * @param Action $action the action to be executed.
-	 * @return boolean whether the action should continue to be executed.
-	 */
-	public function beforeAction($action)
-	{
-		$event = new ActionEvent($action);
-		$this->trigger(self::EVENT_BEFORE_ACTION, $event);
-		return $event->isValid;
-	}
-
-	/**
-	 * This method is invoked right after an action is executed.
-	 * You may override this method to do some postprocessing for the action.
-	 * @param Action $action the action just executed.
-	 */
-	public function afterAction($action)
-	{
-		$this->trigger(self::EVENT_AFTER_ACTION, new ActionEvent($action));
-	}
-}
diff --git a/framework/base/NotSupportedException.php b/framework/base/NotSupportedException.php
deleted file mode 100644
index 2f08891..0000000
--- a/framework/base/NotSupportedException.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-/**
- * NotSupportedException represents an exception caused by accessing features that are not supported.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class NotSupportedException extends Exception
-{
-	/**
-	 * @return string the user-friendly name of this exception
-	 */
-	public function getName()
-	{
-		return \Yii::t('yii|Not Supported');
-	}
-}
-
diff --git a/framework/base/Object.php b/framework/base/Object.php
deleted file mode 100644
index a90a231..0000000
--- a/framework/base/Object.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-/**
- * @include @yii/base/Object.md
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Object
-{
-	/**
-	 * @return string the fully qualified name of this class.
-	 */
-	public static function className()
-	{
-		return get_called_class();
-	}
-
-	/**
-	 * Constructor.
-	 * The default implementation does two things:
-	 *
-	 * - Initializes the object with the given configuration `$config`.
-	 * - Call [[init()]].
-	 *
-	 * If this method is overridden in a child class, it is recommended that
-	 *
-	 * - the last parameter of the constructor is a configuration array, like `$config` here.
-	 * - call the parent implementation at the end of the constructor.
-	 *
-	 * @param array $config name-value pairs that will be used to initialize the object properties
-	 */
-	public function __construct($config = array())
-	{
-		foreach ($config as $name => $value) {
-			$this->$name = $value;
-		}
-		$this->init();
-	}
-
-	/**
-	 * Initializes the object.
-	 * This method is invoked at the end of the constructor after the object is initialized with the
-	 * given configuration.
-	 */
-	public function init()
-	{
-	}
-
-	/**
-	 * Returns the value of an object property.
-	 *
-	 * Do not call this method directly as it is a PHP magic method that
-	 * will be implicitly called when executing `$value = $object->property;`.
-	 * @param string $name the property name
-	 * @return mixed the property value, event handlers attached to the event,
-	 * the named behavior, or the value of a behavior's property
-	 * @throws UnknownPropertyException if the property is not defined
-	 * @see __set
-	 */
-	public function __get($name)
-	{
-		$getter = 'get' . $name;
-		if (method_exists($this, $getter)) {
-			return $this->$getter();
-		} else {
-			throw new UnknownPropertyException('Getting unknown property: ' . get_class($this) . '::' . $name);
-		}
-	}
-
-	/**
-	 * Sets value of an object property.
-	 *
-	 * Do not call this method directly as it is a PHP magic method that
-	 * will be implicitly called when executing `$object->property = $value;`.
-	 * @param string $name the property name or the event name
-	 * @param mixed $value the property value
-	 * @throws UnknownPropertyException if the property is not defined
-	 * @throws InvalidCallException if the property is read-only.
-	 * @see __get
-	 */
-	public function __set($name, $value)
-	{
-		$setter = 'set' . $name;
-		if (method_exists($this, $setter)) {
-			$this->$setter($value);
-		} elseif (method_exists($this, 'get' . $name)) {
-			throw new InvalidCallException('Setting read-only property: ' . get_class($this) . '::' . $name);
-		} else {
-			throw new UnknownPropertyException('Setting unknown property: ' . get_class($this) . '::' . $name);
-		}
-	}
-
-	/**
-	 * Checks if the named property is set (not null).
-	 *
-	 * Do not call this method directly as it is a PHP magic method that
-	 * will be implicitly called when executing `isset($object->property)`.
-	 *
-	 * Note that if the property is not defined, false will be returned.
-	 * @param string $name the property name or the event name
-	 * @return boolean whether the named property is set (not null).
-	 */
-	public function __isset($name)
-	{
-		$getter = 'get' . $name;
-		if (method_exists($this, $getter)) {
-			return $this->$getter() !== null;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Sets an object property to null.
-	 *
-	 * Do not call this method directly as it is a PHP magic method that
-	 * will be implicitly called when executing `unset($object->property)`.
-	 *
-	 * Note that if the property is not defined, this method will do nothing.
-	 * If the property is read-only, it will throw an exception.
-	 * @param string $name the property name
-	 * @throws InvalidCallException if the property is read only.
-	 */
-	public function __unset($name)
-	{
-		$setter = 'set' . $name;
-		if (method_exists($this, $setter)) {
-			$this->$setter(null);
-		} elseif (method_exists($this, 'get' . $name)) {
-			throw new InvalidCallException('Unsetting read-only property: ' . get_class($this) . '::' . $name);
-		}
-	}
-
-	/**
-	 * Calls the named method which is not a class method.
-	 * If the name refers to a component property whose value is
-	 * an anonymous function, the method will execute the function.
-	 *
-	 * Do not call this method directly as it is a PHP magic method that
-	 * will be implicitly called when an unknown method is being invoked.
-	 * @param string $name the method name
-	 * @param array $params method parameters
-	 * @throws UnknownMethodException when calling unknown method
-	 * @return mixed the method return value
-	 */
-	public function __call($name, $params)
-	{
-		$getter = 'get' . $name;
-		if (method_exists($this, $getter)) {
-			$func = $this->$getter();
-			if ($func instanceof \Closure) {
-				return call_user_func_array($func, $params);
-			}
-		}
-		throw new UnknownMethodException('Unknown method: ' . get_class($this) . "::$name()");
-	}
-
-	/**
-	 * Returns a value indicating whether a property is defined.
-	 * A property is defined if:
-	 *
-	 * - the class has a getter or setter method associated with the specified name
-	 *   (in this case, property name is case-insensitive);
-	 * - the class has a member variable with the specified name (when `$checkVar` is true);
-	 *
-	 * @param string $name the property name
-	 * @param boolean $checkVar whether to treat member variables as properties
-	 * @return boolean whether the property is defined
-	 * @see canGetProperty
-	 * @see canSetProperty
-	 */
-	public function hasProperty($name, $checkVar = true)
-	{
-		return $this->canGetProperty($name, $checkVar) || $this->canSetProperty($name, false);
-	}
-
-	/**
-	 * Returns a value indicating whether a property can be read.
-	 * A property is readable if:
-	 *
-	 * - the class has a getter method associated with the specified name
-	 *   (in this case, property name is case-insensitive);
-	 * - the class has a member variable with the specified name (when `$checkVar` is true);
-	 *
-	 * @param string $name the property name
-	 * @param boolean $checkVar whether to treat member variables as properties
-	 * @return boolean whether the property can be read
-	 * @see canSetProperty
-	 */
-	public function canGetProperty($name, $checkVar = true)
-	{
-		return method_exists($this, 'get' . $name) || $checkVar && property_exists($this, $name);
-	}
-
-	/**
-	 * Returns a value indicating whether a property can be set.
-	 * A property is writable if:
-	 *
-	 * - the class has a setter method associated with the specified name
-	 *   (in this case, property name is case-insensitive);
-	 * - the class has a member variable with the specified name (when `$checkVar` is true);
-	 *
-	 * @param string $name the property name
-	 * @param boolean $checkVar whether to treat member variables as properties
-	 * @return boolean whether the property can be written
-	 * @see canGetProperty
-	 */
-	public function canSetProperty($name, $checkVar = true)
-	{
-		return method_exists($this, 'set' . $name) || $checkVar && property_exists($this, $name);
-	}
-}
diff --git a/framework/base/Request.php b/framework/base/Request.php
deleted file mode 100644
index 45556ab..0000000
--- a/framework/base/Request.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-/**
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-abstract class Request extends Component
-{
-	private $_scriptFile;
-	private $_isConsoleRequest;
-
-	/**
-	 * Resolves the current request into a route and the associated parameters.
-	 * @return array the first element is the route, and the second is the associated parameters.
-	 */
-	abstract public function resolve();
-
-	/**
-	 * Returns a value indicating whether the current request is made via command line
-	 * @return boolean the value indicating whether the current request is made via console
-	 */
-	public function getIsConsoleRequest()
-	{
-		return $this->_isConsoleRequest !== null ? $this->_isConsoleRequest : PHP_SAPI === 'cli';
-	}
-
-	/**
-	 * Sets the value indicating whether the current request is made via command line
-	 * @param boolean $value the value indicating whether the current request is made via command line
-	 */
-	public function setIsConsoleRequest($value)
-	{
-		$this->_isConsoleRequest = $value;
-	}
-
-	/**
-	 * Returns entry script file path.
-	 * @return string entry script file path (processed w/ realpath())
-	 * @throws InvalidConfigException if the entry script file path cannot be determined automatically.
-	 */
-	public function getScriptFile()
-	{
-		if ($this->_scriptFile === null) {
-			if (isset($_SERVER['SCRIPT_FILENAME'])) {
-				$this->setScriptFile($_SERVER['SCRIPT_FILENAME']);
-			} else {
-				throw new InvalidConfigException('Unable to determine the entry script file path.');
-			}
-		}
-		return $this->_scriptFile;
-	}
-
-	/**
-	 * Sets the entry script file path.
-	 * The entry script file path can normally be determined based on the `SCRIPT_FILENAME` SERVER variable.
-	 * However, for some server configurations, this may not be correct or feasible.
-	 * This setter is provided so that the entry script file path can be manually specified.
-	 * @param string $value the entry script file path. This can be either a file path or a path alias.
-	 * @throws InvalidConfigException if the provided entry script file path is invalid.
-	 */
-	public function setScriptFile($value)
-	{
-		$scriptFile = realpath(\Yii::getAlias($value));
-		if ($scriptFile !== false && is_file($scriptFile)) {
-			$this->_scriptFile = $scriptFile;
-		} else {
-			throw new InvalidConfigException('Unable to determine the entry script file path.');
-		}
-	}
-}
diff --git a/framework/base/Response.php b/framework/base/Response.php
deleted file mode 100644
index 396b073..0000000
--- a/framework/base/Response.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-/**
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Response extends Component
-{
-	/**
-	 * Starts output buffering
-	 */
-	public function beginOutput()
-	{
-		ob_start();
-		ob_implicit_flush(false);
-	}
-
-	/**
-	 * Returns contents of the output buffer and discards it
-	 * @return string output buffer contents
-	 */
-	public function endOutput()
-	{
-		return ob_get_clean();
-	}
-
-	/**
-	 * Returns contents of the output buffer
-	 * @return string output buffer contents
-	 */
-	public function getOutput()
-	{
-		return ob_get_contents();
-	}
-
-	/**
-	 * Discards the output buffer
-	 * @param boolean $all if true recursively discards all output buffers used
-	 */
-	public function cleanOutput($all = true)
-	{
-		if ($all) {
-			for ($level = ob_get_level(); $level > 0; --$level) {
-				if (!@ob_end_clean()) {
-					ob_clean();
-				}
-			}
-		} else {
-			ob_end_clean();
-		}
-	}
-}
diff --git a/framework/base/Theme.php b/framework/base/Theme.php
deleted file mode 100644
index a60d56e..0000000
--- a/framework/base/Theme.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-use Yii;
-use yii\base\InvalidConfigException;
-use yii\helpers\FileHelper;
-
-/**
- * Theme represents an application theme.
- *
- * A theme is directory consisting of view and layout files which are meant to replace their
- * non-themed counterparts.
- *
- * Theme uses [[pathMap]] to achieve the file replacement. A view or layout file will be replaced
- * with its themed version if part of its path matches one of the keys in [[pathMap]].
- * Then the matched part will be replaced with the corresponding array value.
- *
- * For example, if [[pathMap]] is `array('/www/views' => '/www/themes/basic')`,
- * then the themed version for a view file `/www/views/site/index.php` will be
- * `/www/themes/basic/site/index.php`.
- *
- * @property string $baseUrl the base URL for this theme. This is mainly used by [[getUrl()]].
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Theme extends Component
-{
-	/**
-	 * @var string the root path or path alias of this theme. All resources of this theme are located
-	 * under this directory. This property must be set if [[pathMap]] is not set.
-	 * @see pathMap
-	 */
-	public $basePath;
-	/**
-	 * @var string the base URL (or path alias) for this theme. All resources of this theme are considered
-	 * to be under this base URL. This property must be set. It is mainly used by [[getUrl()]].
-	 */
-	public $baseUrl;
-	/**
-	 * @var array the mapping between view directories and their corresponding themed versions.
-	 * If not set, it will be initialized as a mapping from [[Application::basePath]] to [[basePath]].
-	 * This property is used by [[applyTo()]] when a view is trying to apply the theme.
-	 * Path aliases can be used when specifying directories.
-	 */
-	public $pathMap;
-
-
-	/**
-	 * Initializes the theme.
-	 * @throws InvalidConfigException if [[basePath]] is not set.
-	 */
-	public function init()
-	{
-	 	parent::init();
-		if (empty($this->pathMap)) {
-			if ($this->basePath !== null) {
-				$this->basePath = Yii::getAlias($this->basePath);
-				$this->pathMap = array(Yii::$app->getBasePath() => $this->basePath);
-			} else {
-				throw new InvalidConfigException('The "basePath" property must be set.');
-			}
-		}
-		$paths = array();
-		foreach ($this->pathMap as $from => $to) {
-			$from = FileHelper::normalizePath(Yii::getAlias($from));
-			$to = FileHelper::normalizePath(Yii::getAlias($to));
-			$paths[$from . DIRECTORY_SEPARATOR] = $to . DIRECTORY_SEPARATOR;
-		}
-		$this->pathMap = $paths;
-		if ($this->baseUrl === null) {
-			throw new InvalidConfigException('The "baseUrl" property must be set.');
-		} else {
-			$this->baseUrl = rtrim(Yii::getAlias($this->baseUrl), '/');
-		}
-	}
-
-	/**
-	 * Converts a file to a themed file if possible.
-	 * If there is no corresponding themed file, the original file will be returned.
-	 * @param string $path the file to be themed
-	 * @return string the themed file, or the original file if the themed version is not available.
-	 */
-	public function applyTo($path)
-	{
-		$path = FileHelper::normalizePath($path);
-		foreach ($this->pathMap as $from => $to) {
-			if (strpos($path, $from) === 0) {
-				$n = strlen($from);
-				$file = $to . substr($path, $n);
-				if (is_file($file)) {
-					return $file;
-				}
-			}
-		}
-		return $path;
-	}
-
-	/**
-	 * Converts a relative URL into an absolute URL using [[baseUrl]].
-	 * @param string $url the relative URL to be converted.
-	 * @return string the absolute URL
-	 */
-	public function getUrl($url)
-	{
-		return $this->baseUrl . '/' . ltrim($url, '/');
-	}
-}
diff --git a/framework/base/UnknownClassException.php b/framework/base/UnknownClassException.php
deleted file mode 100644
index ac44746..0000000
--- a/framework/base/UnknownClassException.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-/**
- * UnknownClassException represents an exception caused by accessing an unknown class.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class UnknownClassException extends Exception
-{
-	/**
-	 * @return string the user-friendly name of this exception
-	 */
-	public function getName()
-	{
-		return \Yii::t('yii|Unknown Class');
-	}
-}
-
diff --git a/framework/base/UnknownMethodException.php b/framework/base/UnknownMethodException.php
deleted file mode 100644
index 440e76e..0000000
--- a/framework/base/UnknownMethodException.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-/**
- * UnknownMethodException represents an exception caused by accessing an unknown object method.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class UnknownMethodException extends Exception
-{
-	/**
-	 * @return string the user-friendly name of this exception
-	 */
-	public function getName()
-	{
-		return \Yii::t('yii|Unknown Method');
-	}
-}
-
diff --git a/framework/base/UnknownPropertyException.php b/framework/base/UnknownPropertyException.php
deleted file mode 100644
index 5ec3814..0000000
--- a/framework/base/UnknownPropertyException.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-/**
- * UnknownPropertyException represents an exception caused by accessing unknown object properties.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class UnknownPropertyException extends Exception
-{
-	/**
-	 * @return string the user-friendly name of this exception
-	 */
-	public function getName()
-	{
-		return \Yii::t('yii|Unknown Property');
-	}
-}
-
diff --git a/framework/base/UserException.php b/framework/base/UserException.php
deleted file mode 100644
index 01ca602..0000000
--- a/framework/base/UserException.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-/**
- * UserException is the base class for exceptions that are meant to be shown to end users.
- * Such exceptions are often caused by mistakes of end users.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class UserException extends Exception
-{
-}
diff --git a/framework/base/Vector.php b/framework/base/Vector.php
deleted file mode 100644
index 6418077..0000000
--- a/framework/base/Vector.php
+++ /dev/null
@@ -1,341 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-/**
- * Vector implements an integer-indexed collection class.
- *
- * You can access, append, insert, remove an item from the vector
- * by calling methods such as [[itemAt()]], [[add()]], [[insertAt()]],
- * [[remove()]] and [[removeAt()]].
- *
- * To get the number of the items in the vector, use [[getCount()]].
- *
- * Because Vector implements a set of SPL interfaces, it can be used
- * like a regular PHP array as follows,
- *
- * ~~~
- * $vector[] = $item;				// append new item at the end
- * $vector[$index] = $item;			// set new item at $index
- * unset($vector[$index]);			// remove the item at $index
- * if (isset($vector[$index]))		// if the vector has an item at $index
- * foreach ($vector as $index=>$item) // traverse each item in the vector
- * $n = count($vector);				// count the number of items
- * ~~~
- *
- * Note that if you plan to extend Vector by performing additional operations
- * with each addition or removal of an item (e.g. performing type check),
- * please make sure you override [[insertAt()]] and [[removeAt()]].
- *
- * @property integer $count the number of items in the vector
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Vector extends Object implements \IteratorAggregate, \ArrayAccess, \Countable
-{
-	/**
-	 * @var array internal data storage
-	 */
-	private $_d = array();
-	/**
-	 * @var integer number of items
-	 */
-	private $_c = 0;
-
-	/**
-	 * Constructor.
-	 * Initializes the vector with an array or an iterable object.
-	 * @param mixed $data the initial data to be populated into the vector.
-	 * This can be an array or an iterable object.
-	 * @param array $config name-value pairs that will be used to initialize the object properties
-	 * @throws Exception if data is not well formed (neither an array nor an iterable object)
-	 */
-	public function __construct($data = array(), $config = array())
-	{
-		if (!empty($data)) {
-			$this->copyFrom($data);
-		}
-		parent::__construct($config);
-	}
-
-	/**
-	 * Returns an iterator for traversing the items in the vector.
-	 * This method is required by the SPL interface `IteratorAggregate`.
-	 * It will be implicitly called when you use `foreach` to traverse the vector.
-	 * @return VectorIterator an iterator for traversing the items in the vector.
-	 */
-	public function getIterator()
-	{
-		return new VectorIterator($this->_d);
-	}
-
-	/**
-	 * Returns the number of items in the vector.
-	 * This method is required by the SPL `Countable` interface.
-	 * It will be implicitly called when you use `count($vector)`.
-	 * @return integer number of items in the vector.
-	 */
-	public function count()
-	{
-		return $this->getCount();
-	}
-
-	/**
-	 * Returns the number of items in the vector.
-	 * @return integer the number of items in the vector
-	 */
-	public function getCount()
-	{
-		return $this->_c;
-	}
-
-	/**
-	 * Returns the item at the specified index.
-	 * @param integer $index the index of the item
-	 * @return mixed the item at the index
-	 * @throws InvalidParamException if the index is out of range
-	 */
-	public function itemAt($index)
-	{
-		if (isset($this->_d[$index])) {
-			return $this->_d[$index];
-		} elseif ($index >= 0 && $index < $this->_c) { // in case the value is null
-			return $this->_d[$index];
-		} else {
-			throw new InvalidParamException('Index out of range: ' . $index);
-		}
-	}
-
-	/**
-	 * Appends an item at the end of the vector.
-	 * @param mixed $item new item
-	 * @return integer the zero-based index at which the item is added
-	 * @throws Exception if the vector is read-only.
-	 */
-	public function add($item)
-	{
-		$this->insertAt($this->_c, $item);
-		return $this->_c - 1;
-	}
-
-	/**
-	 * Inserts an item at the specified position.
-	 * Original item at the position and the following items will be moved
-	 * one step towards the end.
-	 * @param integer $index the specified position.
-	 * @param mixed $item new item to be inserted into the vector
-	 * @throws InvalidParamException if the index specified is out of range, or the vector is read-only.
-	 */
-	public function insertAt($index, $item)
-	{
-		if ($index === $this->_c) {
-			$this->_d[$this->_c++] = $item;
-		} elseif ($index >= 0 && $index < $this->_c) {
-			array_splice($this->_d, $index, 0, array($item));
-			$this->_c++;
-		} else {
-			throw new InvalidParamException('Index out of range: ' . $index);
-		}
-	}
-
-	/**
-	 * Removes an item from the vector.
-	 * The vector will search for the item, and the first item found
-	 * will be removed from the vector.
-	 * @param mixed $item the item to be removed.
-	 * @return mixed the index at which the item is being removed, or false
-	 * if the item cannot be found in the vector.
-	 * @throws Exception if the vector is read only.
-	 */
-	public function remove($item)
-	{
-		if (($index = $this->indexOf($item)) >= 0) {
-			$this->removeAt($index);
-			return $index;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Removes an item at the specified position.
-	 * @param integer $index the index of the item to be removed.
-	 * @return mixed the removed item.
-	 * @throws InvalidParamException if the index is out of range, or the vector is read only.
-	 */
-	public function removeAt($index)
-	{
-		if ($index >= 0 && $index < $this->_c) {
-			$this->_c--;
-			if ($index === $this->_c) {
-				return array_pop($this->_d);
-			} else {
-				$item = $this->_d[$index];
-				array_splice($this->_d, $index, 1);
-				return $item;
-			}
-		} else {
-			throw new InvalidParamException('Index out of range: ' . $index);
-		}
-	}
-
-	/**
-	 * Removes all items from the vector.
-	 * @param boolean $safeClear whether to clear every item by calling [[removeAt]].
-	 * Defaults to false, meaning all items in the vector will be cleared directly
-	 * without calling [[removeAt]].
-	 */
-	public function removeAll($safeClear = false)
-	{
-		if ($safeClear) {
-			for ($i = $this->_c - 1; $i >= 0; --$i) {
-				$this->removeAt($i);
-			}
-		} else {
-			$this->_d = array();
-			$this->_c = 0;
-		}
-	}
-
-	/**
-	 * Returns a value indicating whether the vector contains the specified item.
-	 * Note that the search is based on strict PHP comparison.
-	 * @param mixed $item the item
-	 * @return boolean whether the vector contains the item
-	 */
-	public function has($item)
-	{
-		return $this->indexOf($item) >= 0;
-	}
-
-	/**
-	 * Returns the index of the specified item in the vector.
-	 * The index is zero-based. If the item is not found in the vector, -1 will be returned.
-	 * Note that the search is based on strict PHP comparison.
-	 * @param mixed $item the item
-	 * @return integer the index of the item in the vector (0 based), -1 if not found.
-	 */
-	public function indexOf($item)
-	{
-		$index = array_search($item, $this->_d, true);
-		return $index === false ? -1 : $index;
-	}
-
-	/**
-	 * Returns the vector as a PHP array.
-	 * @return array the items in the vector.
-	 */
-	public function toArray()
-	{
-		return $this->_d;
-	}
-
-	/**
-	 * Copies iterable data into the vector.
-	 * Note, existing data in the vector will be cleared first.
-	 * @param mixed $data the data to be copied from, must be an array or an object implementing `Traversable`
-	 * @throws InvalidParamException if data is neither an array nor an object implementing `Traversable`.
-	 */
-	public function copyFrom($data)
-	{
-		if (is_array($data) || $data instanceof \Traversable) {
-			if ($this->_c > 0) {
-				$this->removeAll();
-			}
-			if ($data instanceof self) {
-				$data = $data->_d;
-			}
-			foreach ($data as $item) {
-				$this->add($item);
-			}
-		} else {
-			throw new InvalidParamException('Data must be either an array or an object implementing Traversable.');
-		}
-	}
-
-	/**
-	 * Merges iterable data into the vector.
-	 * New items will be appended to the end of the existing items.
-	 * @param array|\Traversable $data the data to be merged with. It must be an array or object implementing Traversable
-	 * @throws InvalidParamException if data is neither an array nor an object implementing `Traversable`.
-	 */
-	public function mergeWith($data)
-	{
-		if (is_array($data) || ($data instanceof \Traversable)) {
-			if ($data instanceof Vector) {
-				$data = $data->_d;
-			}
-			foreach ($data as $item) {
-				$this->add($item);
-			}
-		} else {
-			throw new InvalidParamException('The data to be merged with must be an array or an object implementing Traversable.');
-		}
-	}
-
-	/**
-	 * Returns a value indicating whether there is an item at the specified offset.
-	 * This method is required by the SPL interface `ArrayAccess`.
-	 * It is implicitly called when you use something like `isset($vector[$offset])`.
-	 * @param integer $offset the offset to be checked
-	 * @return boolean whether there is an item at the specified offset.
-	 */
-	public function offsetExists($offset)
-	{
-		return $offset >= 0 && $offset < $this->_c;
-	}
-
-	/**
-	 * Returns the item at the specified offset.
-	 * This method is required by the SPL interface `ArrayAccess`.
-	 * It is implicitly called when you use something like `$value = $vector[$offset];`.
-	 * This is equivalent to [[itemAt]].
-	 * @param integer $offset the offset to retrieve item.
-	 * @return mixed the item at the offset
-	 * @throws Exception if the offset is out of range
-	 */
-	public function offsetGet($offset)
-	{
-		return $this->itemAt($offset);
-	}
-
-	/**
-	 * Sets the item at the specified offset.
-	 * This method is required by the SPL interface `ArrayAccess`.
-	 * It is implicitly called when you use something like `$vector[$offset] = $item;`.
-	 * If the offset is null or equal to the number of the existing items,
-	 * the new item will be appended to the vector.
-	 * Otherwise, the existing item at the offset will be replaced with the new item.
-	 * @param integer $offset the offset to set item
-	 * @param mixed $item the item value
-	 * @throws Exception if the offset is out of range, or the vector is read only.
-	 */
-	public function offsetSet($offset, $item)
-	{
-		if ($offset === null || $offset === $this->_c) {
-			$this->insertAt($this->_c, $item);
-		} else {
-			$this->removeAt($offset);
-			$this->insertAt($offset, $item);
-		}
-	}
-
-	/**
-	 * Unsets the item at the specified offset.
-	 * This method is required by the SPL interface `ArrayAccess`.
-	 * It is implicitly called when you use something like `unset($vector[$offset])`.
-	 * This is equivalent to [[removeAt]].
-	 * @param integer $offset the offset to unset item
-	 * @throws Exception if the offset is out of range, or the vector is read only.
-	 */
-	public function offsetUnset($offset)
-	{
-		$this->removeAt($offset);
-	}
-}
diff --git a/framework/base/VectorIterator.php b/framework/base/VectorIterator.php
deleted file mode 100644
index f83d42d..0000000
--- a/framework/base/VectorIterator.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-/**
- * VectorIterator implements the SPL `Iterator` interface for [[Vector]].
- *
- * It allows [[Vector]] to return a new iterator for data traversing purpose.
- * You normally do not use this class directly.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class VectorIterator implements \Iterator
-{
-	/**
-	 * @var array the data to be iterated through
-	 */
-	private $_d;
-	/**
-	 * @var integer index of the current item
-	 */
-	private $_i;
-	/**
-	 * @var integer count of the data items
-	 */
-	private $_c;
-
-	/**
-	 * Constructor.
-	 * @param array $data the data to be iterated through
-	 */
-	public function __construct(&$data)
-	{
-		$this->_d = &$data;
-		$this->_i = 0;
-		$this->_c = count($this->_d);
-	}
-
-	/**
-	 * Rewinds the index of the current item.
-	 * This method is required by the SPL interface `Iterator`.
-	 */
-	public function rewind()
-	{
-		$this->_i = 0;
-	}
-
-	/**
-	 * Returns the key of the current item.
-	 * This method is required by the SPL interface `Iterator`.
-	 * @return integer the key of the current item
-	 */
-	public function key()
-	{
-		return $this->_i;
-	}
-
-	/**
-	 * Returns the current item.
-	 * This method is required by the SPL interface `Iterator`.
-	 * @return mixed the current item
-	 */
-	public function current()
-	{
-		return $this->_d[$this->_i];
-	}
-
-	/**
-	 * Moves the internal pointer to the next item.
-	 * This method is required by the SPL interface `Iterator`.
-	 */
-	public function next()
-	{
-		$this->_i++;
-	}
-
-	/**
-	 * Returns a value indicating whether there is an item at current position.
-	 * This method is required by the SPL interface `Iterator`.
-	 * @return boolean whether there is an item at current position.
-	 */
-	public function valid()
-	{
-		return $this->_i < $this->_c;
-	}
-}
diff --git a/framework/base/View.php b/framework/base/View.php
deleted file mode 100644
index af65c49..0000000
--- a/framework/base/View.php
+++ /dev/null
@@ -1,810 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-use Yii;
-use yii\base\Application;
-use yii\helpers\FileHelper;
-use yii\helpers\Html;
-
-/**
- * View represents a view object in the MVC pattern.
- *
- * View provides a set of methods (e.g. [[render()]]) for rendering purpose.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class View extends Component
-{
-	/**
-	 * @event ViewEvent an event that is triggered by [[beginPage()]].
-	 */
-	const EVENT_BEGIN_PAGE = 'beginPage';
-	/**
-	 * @event ViewEvent an event that is triggered by [[endPage()]].
-	 */
-	const EVENT_END_PAGE = 'endPage';
-	/**
-	 * @event ViewEvent an event that is triggered by [[renderFile()]] right before it renders a view file.
-	 */
-	const EVENT_BEFORE_RENDER = 'beforeRender';
-	/**
-	 * @event ViewEvent an event that is triggered by [[renderFile()]] right after it renders a view file.
-	 */
-	const EVENT_AFTER_RENDER = 'afterRender';
-
-	/**
-	 * The location of registered JavaScript code block or files.
-	 * This means the location is in the head section.
-	 */
-	const POS_HEAD = 1;
-	/**
-	 * The location of registered JavaScript code block or files.
-	 * This means the location is at the beginning of the body section.
-	 */
-	const POS_BEGIN = 2;
-	/**
-	 * The location of registered JavaScript code block or files.
-	 * This means the location is at the end of the body section.
-	 */
-	const POS_END = 3;
-	/**
-	 * This is internally used as the placeholder for receiving the content registered for the head section.
-	 */
-	const PL_HEAD = '<![CDATA[YII-BLOCK-HEAD]]>';
-	/**
-	 * This is internally used as the placeholder for receiving the content registered for the beginning of the body section.
-	 */
-	const PL_BODY_BEGIN = '<![CDATA[YII-BLOCK-BODY-BEGIN]]>';
-	/**
-	 * This is internally used as the placeholder for receiving the content registered for the end of the body section.
-	 */
-	const PL_BODY_END = '<![CDATA[YII-BLOCK-BODY-END]]>';
-
-
-	/**
-	 * @var object the context under which the [[renderFile()]] method is being invoked.
-	 * This can be a controller, a widget, or any other object.
-	 */
-	public $context;
-	/**
-	 * @var mixed custom parameters that are shared among view templates.
-	 */
-	public $params;
-	/**
-	 * @var array a list of available renderers indexed by their corresponding supported file extensions.
-	 * Each renderer may be a view renderer object or the configuration for creating the renderer object.
-	 * The default setting supports both Smarty and Twig (their corresponding file extension is "tpl"
-	 * and "twig" respectively. Please refer to [[SmartyRenderer]] and [[TwigRenderer]] on how to install
-	 * the needed libraries for these template engines.
-	 *
-	 * If no renderer is available for the given view file, the view file will be treated as a normal PHP
-	 * and rendered via [[renderPhpFile()]].
-	 */
-	public $renderers = array(
-		'tpl' => array(
-			'class' => 'yii\renderers\SmartyRenderer',
-		),
-		'twig' => array(
-			'class' => 'yii\renderers\TwigRenderer',
-		),
-	);
-	/**
-	 * @var Theme|array the theme object or the configuration array for creating the theme object.
-	 * If not set, it means theming is not enabled.
-	 */
-	public $theme;
-	/**
-	 * @var array a list of named output blocks. The keys are the block names and the values
-	 * are the corresponding block content. You can call [[beginBlock()]] and [[endBlock()]]
-	 * to capture small fragments of a view. They can be later accessed somewhere else
-	 * through this property.
-	 */
-	public $blocks;
-	/**
-	 * @var Widget[] the widgets that are currently being rendered (not ended). This property
-	 * is maintained by [[beginWidget()]] and [[endWidget()]] methods. Do not modify it directly.
-	 * @internal
-	 */
-	public $widgetStack = array();
-	/**
-	 * @var array a list of currently active fragment cache widgets. This property
-	 * is used internally to implement the content caching feature. Do not modify it directly.
-	 * @internal
-	 */
-	public $cacheStack = array();
-	/**
-	 * @var array a list of placeholders for embedding dynamic contents. This property
-	 * is used internally to implement the content caching feature. Do not modify it directly.
-	 * @internal
-	 */
-	public $dynamicPlaceholders = array();
-	/**
-	 * @var array the registered asset bundles. The keys are the bundle names, and the values
-	 * are the corresponding [[AssetBundle]] objects.
-	 * @see registerAssetBundle
-	 */
-	public $assetBundles;
-	/**
-	 * @var string the page title
-	 */
-	public $title;
-	/**
-	 * @var array the registered meta tags.
-	 * @see registerMetaTag
-	 */
-	public $metaTags;
-	/**
-	 * @var array the registered link tags.
-	 * @see registerLinkTag
-	 */
-	public $linkTags;
-	/**
-	 * @var array the registered CSS code blocks.
-	 * @see registerCss
-	 */
-	public $css;
-	/**
-	 * @var array the registered CSS files.
-	 * @see registerCssFile
-	 */
-	public $cssFiles;
-	/**
-	 * @var array the registered JS code blocks
-	 * @see registerJs
-	 */
-	public $js;
-	/**
-	 * @var array the registered JS files.
-	 * @see registerJsFile
-	 */
-	public $jsFiles;
-
-
-	/**
-	 * Initializes the view component.
-	 */
-	public function init()
-	{
-		parent::init();
-		if (is_array($this->theme)) {
-			$this->theme = Yii::createObject($this->theme);
-		}
-	}
-
-	/**
-	 * Renders a view.
-	 *
-	 * This method delegates the call to the [[context]] object:
-	 *
-	 * - If [[context]] is a controller, the [[Controller::renderPartial()]] method will be called;
-	 * - If [[context]] is a widget, the [[Widget::render()]] method will be called;
-	 * - Otherwise, an InvalidCallException exception will be thrown.
-	 *
-	 * @param string $view the view name. Please refer to [[Controller::findViewFile()]]
-	 * and [[Widget::findViewFile()]] on how to specify this parameter.
-	 * @param array $params the parameters (name-value pairs) that will be extracted and made available in the view file.
-	 * @return string the rendering result
-	 * @throws InvalidCallException if [[context]] is neither a controller nor a widget.
-	 * @throws InvalidParamException if the view cannot be resolved or the view file does not exist.
-	 * @see renderFile
-	 */
-	public function render($view, $params = array())
-	{
-		if ($this->context instanceof Controller) {
-			return $this->context->renderPartial($view, $params);
-		} elseif ($this->context instanceof Widget) {
-			return $this->context->render($view, $params);
-		} else {
-			throw new InvalidCallException('View::render() is not supported for the current context.');
-		}
-	}
-
-	/**
-	 * Renders a view file.
-	 *
-	 * If [[theme]] is enabled (not null), it will try to render the themed version of the view file as long
-	 * as it is available.
-	 *
-	 * The method will call [[FileHelper::localize()]] to localize the view file.
-	 *
-	 * If [[renderer]] is enabled (not null), the method will use it to render the view file.
-	 * Otherwise, it will simply include the view file as a normal PHP file, capture its output and
-	 * return it as a string.
-	 *
-	 * @param string $viewFile the view file. This can be either a file path or a path alias.
-	 * @param array $params the parameters (name-value pairs) that will be extracted and made available in the view file.
-	 * @param object $context the context that the view should use for rendering the view. If null,
-	 * existing [[context]] will be used.
-	 * @return string the rendering result
-	 * @throws InvalidParamException if the view file does not exist
-	 */
-	public function renderFile($viewFile, $params = array(), $context = null)
-	{
-		$viewFile = Yii::getAlias($viewFile);
-		if (is_file($viewFile)) {
-			if ($this->theme !== null) {
-				$viewFile = $this->theme->applyTo($viewFile);
-			}
-			$viewFile = FileHelper::localize($viewFile);
-		} else {
-			throw new InvalidParamException("The view file does not exist: $viewFile");
-		}
-
-		$oldContext = $this->context;
-		if ($context !== null) {
-			$this->context = $context;
-		}
-
-		$output = '';
-		if ($this->beforeRender($viewFile)) {
-			$ext = pathinfo($viewFile, PATHINFO_EXTENSION);
-			if (isset($this->renderers[$ext])) {
-				if (is_array($this->renderers[$ext])) {
-					$this->renderers[$ext] = Yii::createObject($this->renderers[$ext]);
-				}
-				/** @var ViewRenderer $renderer */
-				$renderer = $this->renderers[$ext];
-				$output = $renderer->render($this, $viewFile, $params);
-			} else {
-				$output = $this->renderPhpFile($viewFile, $params);
-			}
-			$this->afterRender($viewFile, $output);
-		}
-
-		$this->context = $oldContext;
-
-		return $output;
-	}
-
-	/**
-	 * This method is invoked right before [[renderFile()]] renders a view file.
-	 * The default implementation will trigger the [[EVENT_BEFORE_RENDER]] event.
-	 * If you override this method, make sure you call the parent implementation first.
-	 * @param string $viewFile the view file to be rendered
-	 * @return boolean whether to continue rendering the view file.
-	 */
-	public function beforeRender($viewFile)
-	{
-		$event = new ViewEvent($viewFile);
-		$this->trigger(self::EVENT_BEFORE_RENDER, $event);
-		return $event->isValid;
-	}
-
-	/**
-	 * This method is invoked right after [[renderFile()]] renders a view file.
-	 * The default implementation will trigger the [[EVENT_AFTER_RENDER]] event.
-	 * If you override this method, make sure you call the parent implementation first.
-	 * @param string $viewFile the view file to be rendered
-	 * @param string $output the rendering result of the view file. Updates to this parameter
-	 * will be passed back and returned by [[renderFile()]].
-	 */
-	public function afterRender($viewFile, &$output)
-	{
-		if ($this->hasEventHandlers(self::EVENT_AFTER_RENDER)) {
-			$event = new ViewEvent($viewFile);
-			$event->output = $output;
-			$this->trigger(self::EVENT_AFTER_RENDER, $event);
-			$output = $event->output;
-		}
-	}
-
-	/**
-	 * Renders a view file as a PHP script.
-	 *
-	 * This method treats the view file as a PHP script and includes the file.
-	 * It extracts the given parameters and makes them available in the view file.
-	 * The method captures the output of the included view file and returns it as a string.
-	 *
-	 * This method should mainly be called by view renderer or [[renderFile()]].
-	 *
-	 * @param string $_file_ the view file.
-	 * @param array $_params_ the parameters (name-value pairs) that will be extracted and made available in the view file.
-	 * @return string the rendering result
-	 */
-	public function renderPhpFile($_file_, $_params_ = array())
-	{
-		ob_start();
-		ob_implicit_flush(false);
-		extract($_params_, EXTR_OVERWRITE);
-		require($_file_);
-		return ob_get_clean();
-	}
-
-	/**
-	 * Renders dynamic content returned by the given PHP statements.
-	 * This method is mainly used together with content caching (fragment caching and page caching)
-	 * when some portions of the content (called *dynamic content*) should not be cached.
-	 * The dynamic content must be returned by some PHP statements.
-	 * @param string $statements the PHP statements for generating the dynamic content.
-	 * @return string the placeholder of the dynamic content, or the dynamic content if there is no
-	 * active content cache currently.
-	 */
-	public function renderDynamic($statements)
-	{
-		if (!empty($this->cacheStack)) {
-			$n = count($this->dynamicPlaceholders);
-			$placeholder = "<![CDATA[YII-DYNAMIC-$n]]>";
-			$this->addDynamicPlaceholder($placeholder, $statements);
-			return $placeholder;
-		} else {
-			return $this->evaluateDynamicContent($statements);
-		}
-	}
-
-	/**
-	 * Adds a placeholder for dynamic content.
-	 * This method is internally used.
-	 * @param string $placeholder the placeholder name
-	 * @param string $statements the PHP statements for generating the dynamic content
-	 */
-	public function addDynamicPlaceholder($placeholder, $statements)
-	{
-		foreach ($this->cacheStack as $cache) {
-			$cache->dynamicPlaceholders[$placeholder] = $statements;
-		}
-		$this->dynamicPlaceholders[$placeholder] = $statements;
-	}
-
-	/**
-	 * Evaluates the given PHP statements.
-	 * This method is mainly used internally to implement dynamic content feature.
-	 * @param string $statements the PHP statements to be evaluated.
-	 * @return mixed the return value of the PHP statements.
-	 */
-	public function evaluateDynamicContent($statements)
-	{
-		return eval($statements);
-	}
-
-	/**
-	 * Creates a widget.
-	 * This method will use [[Yii::createObject()]] to create the widget.
-	 * @param string $class the widget class name or path alias
-	 * @param array $properties the initial property values of the widget.
-	 * @return Widget the newly created widget instance
-	 */
-	public function createWidget($class, $properties = array())
-	{
-		$properties['class'] = $class;
-		if (!isset($properties['view'])) {
-			$properties['view'] = $this;
-		}
-		return Yii::createObject($properties);
-	}
-
-	/**
-	 * Creates and runs a widget.
-	 * Compared with [[createWidget()]], this method does one more thing: it will
-	 * run the widget after it is created.
-	 * @param string $class the widget class name or path alias
-	 * @param array $properties the initial property values of the widget.
-	 * @param boolean $captureOutput whether to capture the output of the widget and return it as a string
-	 * @return string|Widget if $captureOutput is true, the output of the widget will be returned;
-	 * otherwise the widget object will be returned.
-	 */
-	public function widget($class, $properties = array(), $captureOutput = false)
-	{
-		if ($captureOutput) {
-			ob_start();
-			ob_implicit_flush(false);
-			$widget = $this->createWidget($class, $properties);
-			$widget->run();
-			return ob_get_clean();
-		} else {
-			$widget = $this->createWidget($class, $properties);
-			$widget->run();
-			return $widget;
-		}
-	}
-
-	/**
-	 * Begins a widget.
-	 * This method is similar to [[createWidget()]] except that it will expect a matching
-	 * [[endWidget()]] call after this.
-	 * @param string $class the widget class name or path alias
-	 * @param array $properties the initial property values of the widget.
-	 * @return Widget the widget instance
-	 */
-	public function beginWidget($class, $properties = array())
-	{
-		$widget = $this->createWidget($class, $properties);
-		$this->widgetStack[] = $widget;
-		return $widget;
-	}
-
-	/**
-	 * Ends a widget.
-	 * Note that the rendering result of the widget is directly echoed out.
-	 * If you want to capture the rendering result of a widget, you may use
-	 * [[createWidget()]] and [[Widget::run()]].
-	 * @return Widget the widget instance
-	 * @throws InvalidCallException if [[beginWidget()]] and [[endWidget()]] calls are not properly nested
-	 */
-	public function endWidget()
-	{
-		$widget = array_pop($this->widgetStack);
-		if ($widget instanceof Widget) {
-			$widget->run();
-			return $widget;
-		} else {
-			throw new InvalidCallException("Unmatched beginWidget() and endWidget() calls.");
-		}
-	}
-
-	/**
-	 * Begins recording a block.
-	 * This method is a shortcut to beginning [[yii\widgets\Block]]
-	 * @param string $id the block ID.
-	 * @param boolean $renderInPlace whether to render the block content in place.
-	 * Defaults to false, meaning the captured block will not be displayed.
-	 * @return \yii\widgets\Block the Block widget instance
-	 */
-	public function beginBlock($id, $renderInPlace = false)
-	{
-		return $this->beginWidget('yii\widgets\Block', array(
-			'id' => $id,
-			'renderInPlace' => $renderInPlace,
-		));
-	}
-
-	/**
-	 * Ends recording a block.
-	 */
-	public function endBlock()
-	{
-		$this->endWidget();
-	}
-
-	/**
-	 * Begins the rendering of content that is to be decorated by the specified view.
-	 * This method can be used to implement nested layout. For example, a layout can be embedded
-	 * in another layout file specified as '@app/view/layouts/base' like the following:
-	 *
-	 * ~~~
-	 * <?php $this->beginContent('@app/view/layouts/base'); ?>
-	 * ...layout content here...
-	 * <?php $this->endContent(); ?>
-	 * ~~~
-	 *
-	 * @param string $viewFile the view file that will be used to decorate the content enclosed by this widget.
-	 * This can be specified as either the view file path or path alias.
-	 * @param array $params the variables (name=>value) to be extracted and made available in the decorative view.
-	 * @return \yii\widgets\ContentDecorator the ContentDecorator widget instance
-	 * @see \yii\widgets\ContentDecorator
-	 */
-	public function beginContent($viewFile, $params = array())
-	{
-		return $this->beginWidget('yii\widgets\ContentDecorator', array(
-			'viewFile' => $viewFile,
-			'params' => $params,
-		));
-	}
-
-	/**
-	 * Ends the rendering of content.
-	 */
-	public function endContent()
-	{
-		$this->endWidget();
-	}
-
-	/**
-	 * Begins fragment caching.
-	 * This method will display cached content if it is available.
-	 * If not, it will start caching and would expect an [[endCache()]]
-	 * call to end the cache and save the content into cache.
-	 * A typical usage of fragment caching is as follows,
-	 *
-	 * ~~~
-	 * if($this->beginCache($id)) {
-	 *     // ...generate content here
-	 *     $this->endCache();
-	 * }
-	 * ~~~
-	 *
-	 * @param string $id a unique ID identifying the fragment to be cached.
-	 * @param array $properties initial property values for [[\yii\widgets\FragmentCache]]
-	 * @return boolean whether you should generate the content for caching.
-	 * False if the cached version is available.
-	 */
-	public function beginCache($id, $properties = array())
-	{
-		$properties['id'] = $id;
-		/** @var $cache \yii\widgets\FragmentCache */
-		$cache = $this->beginWidget('yii\widgets\FragmentCache', $properties);
-		if ($cache->getCachedContent() !== false) {
-			$this->endCache();
-			return false;
-		} else {
-			return true;
-		}
-	}
-
-	/**
-	 * Ends fragment caching.
-	 */
-	public function endCache()
-	{
-		$this->endWidget();
-	}
-
-
-	private $_assetManager;
-
-	/**
-	 * Registers the asset manager being used by this view object.
-	 * @return \yii\web\AssetManager the asset manager. Defaults to the "assetManager" application component.
-	 */
-	public function getAssetManager()
-	{
-		return $this->_assetManager ?: Yii::$app->getAssetManager();
-	}
-
-	/**
-	 * Sets the asset manager.
-	 * @param \yii\web\AssetManager $value the asset manager
-	 */
-	public function setAssetManager($value)
-	{
-		$this->_assetManager = $value;
-	}
-
-	/**
-	 * Marks the beginning of an HTML page.
-	 */
-	public function beginPage()
-	{
-		ob_start();
-		ob_implicit_flush(false);
-
-		$this->trigger(self::EVENT_BEGIN_PAGE);
-	}
-
-	/**
-	 * Marks the ending of an HTML page.
-	 */
-	public function endPage()
-	{
-		$this->trigger(self::EVENT_END_PAGE);
-
-		$content = ob_get_clean();
-		echo strtr($content, array(
-			self::PL_HEAD => $this->renderHeadHtml(),
-			self::PL_BODY_BEGIN => $this->renderBodyBeginHtml(),
-			self::PL_BODY_END => $this->renderBodyEndHtml(),
-		));
-
-		unset(
-			$this->assetBundles,
-			$this->metaTags,
-			$this->linkTags,
-			$this->css,
-			$this->cssFiles,
-			$this->js,
-			$this->jsFiles
-		);
-	}
-
-	/**
-	 * Marks the beginning of an HTML body section.
-	 */
-	public function beginBody()
-	{
-		echo self::PL_BODY_BEGIN;
-	}
-
-	/**
-	 * Marks the ending of an HTML body section.
-	 */
-	public function endBody()
-	{
-		echo self::PL_BODY_END;
-	}
-
-	/**
-	 * Marks the position of an HTML head section.
-	 */
-	public function head()
-	{
-		echo self::PL_HEAD;
-	}
-
-	/**
-	 * Registers the named asset bundle.
-	 * All dependent asset bundles will be registered.
-	 * @param string $name the name of the asset bundle.
-	 * @throws InvalidConfigException if the asset bundle does not exist or a circular dependency is detected
-	 */
-	public function registerAssetBundle($name)
-	{
-		if (!isset($this->assetBundles[$name])) {
-			$am = $this->getAssetManager();
-			$bundle = $am->getBundle($name);
-			if ($bundle !== null) {
-				$this->assetBundles[$name] = false;
-				$bundle->registerAssets($this);
-				$this->assetBundles[$name] = true;
-			} else {
-				throw new InvalidConfigException("Unknown asset bundle: $name");
-			}
-		} elseif ($this->assetBundles[$name] === false) {
-			throw new InvalidConfigException("A circular dependency is detected for bundle '$name'.");
-		}
-	}
-
-	/**
-	 * Registers a meta tag.
-	 * @param array $options the HTML attributes for the meta tag.
-	 * @param string $key the key that identifies the meta tag. If two meta tags are registered
-	 * with the same key, the latter will overwrite the former. If this is null, the new meta tag
-	 * will be appended to the existing ones.
-	 */
-	public function registerMetaTag($options, $key = null)
-	{
-		if ($key === null) {
-			$this->metaTags[] = Html::tag('meta', '', $options);
-		} else {
-			$this->metaTags[$key] = Html::tag('meta', '', $options);
-		}
-	}
-
-	/**
-	 * Registers a link tag.
-	 * @param array $options the HTML attributes for the link tag.
-	 * @param string $key the key that identifies the link tag. If two link tags are registered
-	 * with the same key, the latter will overwrite the former. If this is null, the new link tag
-	 * will be appended to the existing ones.
-	 */
-	public function registerLinkTag($options, $key = null)
-	{
-		if ($key === null) {
-			$this->linkTags[] = Html::tag('link', '', $options);
-		} else {
-			$this->linkTags[$key] = Html::tag('link', '', $options);
-		}
-	}
-
-	/**
-	 * Registers a CSS code block.
-	 * @param string $css the CSS code block to be registered
-	 * @param array $options the HTML attributes for the style tag.
-	 * @param string $key the key that identifies the CSS code block. If null, it will use
-	 * $css as the key. If two CSS code blocks are registered with the same key, the latter
-	 * will overwrite the former.
-	 */
-	public function registerCss($css, $options = array(), $key = null)
-	{
-		$key = $key ?: $css;
-		$this->css[$key] = Html::style($css, $options);
-	}
-
-	/**
-	 * Registers a CSS file.
-	 * @param string $url the CSS file to be registered.
-	 * @param array $options the HTML attributes for the link tag.
-	 * @param string $key the key that identifies the CSS script file. If null, it will use
-	 * $url as the key. If two CSS files are registered with the same key, the latter
-	 * will overwrite the former.
-	 */
-	public function registerCssFile($url, $options = array(), $key = null)
-	{
-		$key = $key ?: $url;
-		$this->cssFiles[$key] = Html::cssFile($url, $options);
-	}
-
-	/**
-	 * Registers a JS code block.
-	 * @param string $js the JS code block to be registered
-	 * @param array $options the HTML attributes for the script tag. A special option
-	 * named "position" is supported which specifies where the JS script tag should be inserted
-	 * in a page. The possible values of "position" are:
-	 *
-	 * - [[POS_HEAD]]: in the head section
-	 * - [[POS_BEGIN]]: at the beginning of the body section
-	 * - [[POS_END]]: at the end of the body section
-	 *
-	 * @param string $key the key that identifies the JS code block. If null, it will use
-	 * $js as the key. If two JS code blocks are registered with the same key, the latter
-	 * will overwrite the former.
-	 */
-	public function registerJs($js, $options = array(), $key = null)
-	{
-		$position = isset($options['position']) ? $options['position'] : self::POS_END;
-		unset($options['position']);
-		$key = $key ?: $js;
-		$this->js[$position][$key] = Html::script($js, $options);
-	}
-
-	/**
-	 * Registers a JS file.
-	 * @param string $url the JS file to be registered.
-	 * @param array $options the HTML attributes for the script tag. A special option
-	 * named "position" is supported which specifies where the JS script tag should be inserted
-	 * in a page. The possible values of "position" are:
-	 *
-	 * - [[POS_HEAD]]: in the head section
-	 * - [[POS_BEGIN]]: at the beginning of the body section
-	 * - [[POS_END]]: at the end of the body section
-	 *
-	 * @param string $key the key that identifies the JS script file. If null, it will use
-	 * $url as the key. If two JS files are registered with the same key, the latter
-	 * will overwrite the former.
-	 */
-	public function registerJsFile($url, $options = array(), $key = null)
-	{
-		$position = isset($options['position']) ? $options['position'] : self::POS_END;
-		unset($options['position']);
-		$key = $key ?: $url;
-		$this->jsFiles[$position][$key] = Html::jsFile($url, $options);
-	}
-
-	/**
-	 * Renders the content to be inserted in the head section.
-	 * The content is rendered using the registered meta tags, link tags, CSS/JS code blocks and files.
-	 * @return string the rendered content
-	 */
-	protected function renderHeadHtml()
-	{
-		$lines = array();
-		if (!empty($this->metaTags)) {
-			$lines[] = implode("\n", $this->metaTags);
-		}
-		if (!empty($this->linkTags)) {
-			$lines[] = implode("\n", $this->linkTags);
-		}
-		if (!empty($this->cssFiles)) {
-			$lines[] = implode("\n", $this->cssFiles);
-		}
-		if (!empty($this->css)) {
-			$lines[] = implode("\n", $this->css);
-		}
-		if (!empty($this->jsFiles[self::POS_HEAD])) {
-			$lines[] = implode("\n", $this->jsFiles[self::POS_HEAD]);
-		}
-		if (!empty($this->js[self::POS_HEAD])) {
-			$lines[] = implode("\n", $this->js[self::POS_HEAD]);
-		}
-		return implode("\n", $lines);
-	}
-
-	/**
-	 * Renders the content to be inserted at the beginning of the body section.
-	 * The content is rendered using the registered JS code blocks and files.
-	 * @return string the rendered content
-	 */
-	protected function renderBodyBeginHtml()
-	{
-		$lines = array();
-		if (!empty($this->jsFiles[self::POS_BEGIN])) {
-			$lines[] = implode("\n", $this->jsFiles[self::POS_BEGIN]);
-		}
-		if (!empty($this->js[self::POS_BEGIN])) {
-			$lines[] = implode("\n", $this->js[self::POS_BEGIN]);
-		}
-		return implode("\n", $lines);
-	}
-
-	/**
-	 * Renders the content to be inserted at the end of the body section.
-	 * The content is rendered using the registered JS code blocks and files.
-	 * @return string the rendered content
-	 */
-	protected function renderBodyEndHtml()
-	{
-		$lines = array();
-		if (!empty($this->jsFiles[self::POS_END])) {
-			$lines[] = implode("\n", $this->jsFiles[self::POS_END]);
-		}
-		if (!empty($this->js[self::POS_END])) {
-			$lines[] = implode("\n", $this->js[self::POS_END]);
-		}
-		return implode("\n", $lines);
-	}
-}
diff --git a/framework/base/ViewEvent.php b/framework/base/ViewEvent.php
deleted file mode 100644
index f1ee7b9..0000000
--- a/framework/base/ViewEvent.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-/**
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class ViewEvent extends Event
-{
-	/**
-	 * @var string the rendering result of [[View::renderFile()]].
-	 * Event handlers may modify this property and the modified output will be
-	 * returned by [[View::renderFile()]]. This property is only used
-	 * by [[View::EVENT_AFTER_RENDER]] event.
-	 */
-	public $output;
-	/**
-	 * @var string the view file path that is being rendered by [[View::renderFile()]].
-	 */
-	public $viewFile;
-	/**
-	 * @var boolean whether to continue rendering the view file. Event handlers of
-	 * [[View::EVENT_BEFORE_RENDER]] may set this property to decide whether
-	 * to continue rendering the current view file.
-	 */
-	public $isValid = true;
-
-	/**
-	 * Constructor.
-	 * @param string $viewFile the view file path that is being rendered by [[View::renderFile()]].
-	 * @param array $config name-value pairs that will be used to initialize the object properties
-	 */
-	public function __construct($viewFile, $config = array())
-	{
-		$this->viewFile = $viewFile;
-		parent::__construct($config);
-	}
-}
diff --git a/framework/base/ViewRenderer.php b/framework/base/ViewRenderer.php
deleted file mode 100644
index 576bbe8..0000000
--- a/framework/base/ViewRenderer.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-/**
- * ViewRenderer is the base class for view renderer classes.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-abstract class ViewRenderer extends Component
-{
-	/**
-	 * Renders a view file.
-	 *
-	 * This method is invoked by [[View]] whenever it tries to render a view.
-	 * Child classes must implement this method to render the given view file.
-	 *
-	 * @param View $view the view object used for rendering the file.
-	 * @param string $file the view file.
-	 * @param array $params the parameters to be passed to the view file.
-	 * @return string the rendering result
-	 */
-	abstract public function render($view, $file, $params);
-}
diff --git a/framework/base/Widget.php b/framework/base/Widget.php
deleted file mode 100644
index c0c524f..0000000
--- a/framework/base/Widget.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\base;
-
-use Yii;
-use yii\helpers\FileHelper;
-
-/**
- * Widget is the base class for widgets.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Widget extends Component
-{
-	/**
-	 * @var View the view object that is used to create this widget.
-	 * This property is automatically set by [[View::createWidget()]].
-	 * This property is required by [[render()]] and [[renderFile()]].
-	 */
-	public $view;
-	/**
-	 * @var string id of the widget.
-	 */
-	private $_id;
-	/**
-	 * @var integer a counter used to generate IDs for widgets.
-	 */
-	private static $_counter = 0;
-
-	/**
-	 * Returns the ID of the widget.
-	 * @param boolean $autoGenerate whether to generate an ID if it is not set previously
-	 * @return string ID of the widget.
-	 */
-	public function getId($autoGenerate = true)
-	{
-		if ($autoGenerate && $this->_id === null) {
-			$this->_id = 'w' . self::$_counter++;
-		}
-		return $this->_id;
-	}
-
-	/**
-	 * Sets the ID of the widget.
-	 * @param string $value id of the widget.
-	 */
-	public function setId($value)
-	{
-		$this->_id = $value;
-	}
-
-	/**
-	 * Executes the widget.
-	 */
-	public function run()
-	{
-	}
-
-	/**
-	 * Renders a view.
-	 * The view to be rendered can be specified in one of the following formats:
-	 *
-	 * - path alias (e.g. "@app/views/site/index");
-	 * - absolute path within application (e.g. "//site/index"): the view name starts with double slashes.
-	 *   The actual view file will be looked for under the [[Application::viewPath|view path]] of the application.
-	 * - absolute path within module (e.g. "/site/index"): the view name starts with a single slash.
-	 *   The actual view file will be looked for under the [[Module::viewPath|view path]] of the currently
-	 *   active module.
-	 * - relative path (e.g. "index"): the actual view file will be looked for under [[viewPath]].
-	 *
-	 * If the view name does not contain a file extension, it will use the default one `.php`.
-
-	 * @param string $view the view name. Please refer to [[findViewFile()]] on how to specify a view name.
-	 * @param array $params the parameters (name-value pairs) that should be made available in the view.
-	 * @return string the rendering result.
-	 * @throws InvalidParamException if the view file does not exist.
-	 */
-	public function render($view, $params = array())
-	{
-		$viewFile = $this->findViewFile($view);
-		return $this->view->renderFile($viewFile, $params, $this);
-	}
-
-	/**
-	 * Renders a view file.
-	 * @param string $file the view file to be rendered. This can be either a file path or a path alias.
-	 * @param array $params the parameters (name-value pairs) that should be made available in the view.
-	 * @return string the rendering result.
-	 * @throws InvalidParamException if the view file does not exist.
-	 */
-	public function renderFile($file, $params = array())
-	{
-		return $this->view->renderFile($file, $params, $this);
-	}
-
-	/**
-	 * Returns the directory containing the view files for this widget.
-	 * The default implementation returns the 'views' subdirectory under the directory containing the widget class file.
-	 * @return string the directory containing the view files for this widget.
-	 */
-	public function getViewPath()
-	{
-		$className = get_class($this);
-		$class = new \ReflectionClass($className);
-		return dirname($class->getFileName()) . DIRECTORY_SEPARATOR . 'views';
-	}
-
-	/**
-	 * Finds the view file based on the given view name.
-	 * @param string $view the view name or the path alias of the view file. Please refer to [[render()]]
-	 * on how to specify this parameter.
-	 * @return string the view file path. Note that the file may not exist.
-	 */
-	protected function findViewFile($view)
-	{
-		if (strncmp($view, '@', 1) === 0) {
-			// e.g. "@app/views/main"
-			$file = Yii::getAlias($view);
-		} elseif (strncmp($view, '//', 2) === 0) {
-			// e.g. "//layouts/main"
-			$file = Yii::$app->getViewPath() . DIRECTORY_SEPARATOR . ltrim($view, '/');
-		} elseif (strncmp($view, '/', 1) === 0 && Yii::$app->controller !== null) {
-			// e.g. "/site/index"
-			$file = Yii::$app->controller->module->getViewPath() . DIRECTORY_SEPARATOR . ltrim($view, '/');
-		} else {
-			$file = $this->getViewPath() . DIRECTORY_SEPARATOR . ltrim($view, '/');
-		}
-
-		return pathinfo($file, PATHINFO_EXTENSION) === '' ? $file . '.php' : $file;
-	}
-}
diff --git a/framework/caching/ApcCache.php b/framework/caching/ApcCache.php
deleted file mode 100644
index 391851d..0000000
--- a/framework/caching/ApcCache.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\caching;
-
-/**
- * ApcCache provides APC caching in terms of an application component.
- *
- * To use this application component, the [APC PHP extension](http://www.php.net/apc) must be loaded.
- * In order to enable APC for CLI you should add "apc.enable_cli = 1" to your php.ini.
- *
- * See [[Cache]] for common cache operations that ApcCache supports.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class ApcCache extends Cache
-{
-	/**
-	 * Retrieves a value from cache with a specified key.
-	 * This is the implementation of the method declared in the parent class.
-	 * @param string $key a unique key identifying the cached value
-	 * @return string the value stored in cache, false if the value is not in the cache or expired.
-	 */
-	protected function getValue($key)
-	{
-		return apc_fetch($key);
-	}
-
-	/**
-	 * Retrieves multiple values from cache with the specified keys.
-	 * @param array $keys a list of keys identifying the cached values
-	 * @return array a list of cached values indexed by the keys
-	 */
-	protected function getValues($keys)
-	{
-		return apc_fetch($keys);
-	}
-
-	/**
-	 * Stores a value identified by a key in cache.
-	 * This is the implementation of the method declared in the parent class.
-	 *
-	 * @param string $key the key identifying the value to be cached
-	 * @param string $value the value to be cached
-	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
-	 * @return boolean true if the value is successfully stored into cache, false otherwise
-	 */
-	protected function setValue($key, $value, $expire)
-	{
-		return apc_store($key, $value, $expire);
-	}
-
-	/**
-	 * Stores a value identified by a key into cache if the cache does not contain this key.
-	 * This is the implementation of the method declared in the parent class.
-	 * @param string $key the key identifying the value to be cached
-	 * @param string $value the value to be cached
-	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
-	 * @return boolean true if the value is successfully stored into cache, false otherwise
-	 */
-	protected function addValue($key, $value, $expire)
-	{
-		return apc_add($key, $value, $expire);
-	}
-
-	/**
-	 * Deletes a value with the specified key from cache
-	 * This is the implementation of the method declared in the parent class.
-	 * @param string $key the key of the value to be deleted
-	 * @return boolean if no error happens during deletion
-	 */
-	protected function deleteValue($key)
-	{
-		return apc_delete($key);
-	}
-
-	/**
-	 * Deletes all values from cache.
-	 * This is the implementation of the method declared in the parent class.
-	 * @return boolean whether the flush operation was successful.
-	 */
-	protected function flushValues()
-	{
-		return apc_clear_cache('user');
-	}
-}
diff --git a/framework/caching/Cache.php b/framework/caching/Cache.php
deleted file mode 100644
index 78f2854..0000000
--- a/framework/caching/Cache.php
+++ /dev/null
@@ -1,352 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\caching;
-
-use yii\base\Component;
-use yii\helpers\StringHelper;
-
-/**
- * Cache is the base class for cache classes supporting different cache storage implementation.
- *
- * A data item can be stored in cache by calling [[set()]] and be retrieved back
- * later (in the same or different request) by [[get()]]. In both operations,
- * a key identifying the data item is required. An expiration time and/or a [[Dependency|dependency]]
- * can also be specified when calling [[set()]]. If the data item expires or the dependency
- * changes at the time of calling [[get()]], the cache will return no data.
- *
- * A typical usage pattern of cache is like the following:
- *
- * ~~~
- * $key = 'demo';
- * $data = $cache->get($key);
- * if ($data === false) {
- *     // ...generate $data here...
- *     $cache->set($key, $data, $expire, $dependency);
- * }
- * ~~~
- *
- * Because Cache implements the ArrayAccess interface, it can be used like an array. For example,
- *
- * ~~~
- * $cache['foo'] = 'some data';
- * echo $cache['foo'];
- * ~~~
- *
- * Derived classes should implement the following methods:
- *
- * - [[getValue()]]: retrieve the value with a key (if any) from cache
- * - [[setValue()]]: store the value with a key into cache
- * - [[addValue()]]: store the value only if the cache does not have this key before
- * - [[deleteValue()]]: delete the value with the specified key from cache
- * - [[flushValues()]]: delete all values from cache
- *
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-abstract class Cache extends Component implements \ArrayAccess
-{
-	/**
-	 * @var string a string prefixed to every cache key so that it is unique. Defaults to null, meaning using
-	 * the value of [[Application::id]] as the key prefix. You may set this property to be an empty string
-	 * if you don't want to use key prefix. It is recommended that you explicitly set this property to some
-	 * static value if the cached data needs to be shared among multiple applications.
-	 */
-	public $keyPrefix;
-	/**
-	 * @var array|boolean the functions used to serialize and unserialize cached data. Defaults to null, meaning
-	 * using the default PHP `serialize()` and `unserialize()` functions. If you want to use some more efficient
-	 * serializer (e.g. [igbinary](http://pecl.php.net/package/igbinary)), you may configure this property with
-	 * a two-element array. The first element specifies the serialization function, and the second the deserialization
-	 * function. If this property is set false, data will be directly sent to and retrieved from the underlying
-	 * cache component without any serialization or deserialization. You should not turn off serialization if
-	 * you are using [[Dependency|cache dependency]], because it relies on data serialization.
-	 */
-	public $serializer;
-
-
-	/**
-	 * Initializes the application component.
-	 * This method overrides the parent implementation by setting default cache key prefix.
-	 */
-	public function init()
-	{
-		parent::init();
-		if ($this->keyPrefix === null) {
-			$this->keyPrefix = \Yii::$app->id;
-		}
-	}
-
-	/**
-	 * Builds a normalized cache key from a given key.
-	 *
-	 * The generated key contains letters and digits only, and its length is no more than 32.
-	 * 
-	 * If the given key is a string containing alphanumeric characters only and no more than 32 characters,
-	 * then the key will be returned back without change. Otherwise, a normalized key
-	 * is generated by serializing the given key and applying MD5 hashing.
-	 * 
-	 * The following example builds a cache key using three parameters:
-	 *
-	 * ~~~
-	 * $key = $cache->buildKey($className, $method, $id);
-	 * ~~~
-	 *
-	 * @param array|string $key the key to be normalized
-	 * @return string the generated cache key
-	 */
-	public function buildKey($key)
-	{
-		if (is_string($key)) {
-			return ctype_alnum($key) && StringHelper::strlen($key) <= 32 ? $key : md5($key);
-		} else {
-			return md5(json_encode($key));
-		}
-	}
-
-	/**
-	 * Retrieves a value from cache with a specified key.
-	 * @param string $key a key identifying the cached value
-	 * @return mixed the value stored in cache, false if the value is not in the cache, expired,
-	 * or the dependency associated with the cached data has changed.
-	 */
-	public function get($key)
-	{
-		$key = $this->keyPrefix . $this->buildKey($key);
-		$value = $this->getValue($key);
-		if ($value === false || $this->serializer === false) {
-			return $value;
-		} elseif ($this->serializer === null) {
-			$value = unserialize($value);
-		} else {
-			$value = call_user_func($this->serializer[1], $value);
-		}
-		if (is_array($value) && !($value[1] instanceof Dependency && $value[1]->getHasChanged())) {
-			return $value[0];
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Retrieves multiple values from cache with the specified keys.
-	 * Some caches (such as memcache, apc) allow retrieving multiple cached values at the same time,
-	 * which may improve the performance. In case a cache does not support this feature natively,
-	 * this method will try to simulate it.
-	 * @param array $keys list of keys identifying the cached values
-	 * @return array list of cached values corresponding to the specified keys. The array
-	 * is returned in terms of (key,value) pairs.
-	 * If a value is not cached or expired, the corresponding array value will be false.
-	 */
-	public function mget($keys)
-	{
-		$keyMap = array();
-		foreach ($keys as $key) {
-			$keyMap[$key] = $this->keyPrefix . $this->buildKey($key);
-		}
-		$values = $this->getValues(array_values($keyMap));
-		$results = array();
-		foreach ($keyMap as $key => $newKey) {
-			$results[$key] = false;
-			if (isset($values[$newKey])) {
-				if ($this->serializer === false) {
-					$results[$key] = $values[$newKey];
-				} else {
-					$value = $this->serializer === null ? unserialize($values[$newKey])
-							: call_user_func($this->serializer[1], $values[$newKey]);
-
-					if (is_array($value) && !($value[1] instanceof Dependency && $value[1]->getHasChanged())) {
-						$results[$key] = $value[0];
-					}
-				}
-			}
-		}
-		return $results;
-	}
-
-	/**
-	 * Stores a value identified by a key into cache.
-	 * If the cache already contains such a key, the existing value and
-	 * expiration time will be replaced with the new ones, respectively.
-	 *
-	 * @param string $key the key identifying the value to be cached
-	 * @param mixed $value the value to be cached
-	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
-	 * @param Dependency $dependency dependency of the cached item. If the dependency changes,
-	 * the corresponding value in the cache will be invalidated when it is fetched via [[get()]].
-	 * This parameter is ignored if [[serializer]] is false.
-	 * @return boolean whether the value is successfully stored into cache
-	 */
-	public function set($key, $value, $expire = 0, $dependency = null)
-	{
-		if ($dependency !== null && $this->serializer !== false) {
-			$dependency->evaluateDependency();
-		}
-		if ($this->serializer === null) {
-			$value = serialize(array($value, $dependency));
-		} elseif ($this->serializer !== false) {
-			$value = call_user_func($this->serializer[0], array($value, $dependency));
-		}
-		$key = $this->keyPrefix . $this->buildKey($key);
-		return $this->setValue($key, $value, $expire);
-	}
-
-	/**
-	 * Stores a value identified by a key into cache if the cache does not contain this key.
-	 * Nothing will be done if the cache already contains the key.
-	 * @param string $key the key identifying the value to be cached
-	 * @param mixed $value the value to be cached
-	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
-	 * @param Dependency $dependency dependency of the cached item. If the dependency changes,
-	 * the corresponding value in the cache will be invalidated when it is fetched via [[get()]].
-	 * This parameter is ignored if [[serializer]] is false.
-	 * @return boolean whether the value is successfully stored into cache
-	 */
-	public function add($key, $value, $expire = 0, $dependency = null)
-	{
-		if ($dependency !== null && $this->serializer !== false) {
-			$dependency->evaluateDependency();
-		}
-		if ($this->serializer === null) {
-			$value = serialize(array($value, $dependency));
-		} elseif ($this->serializer !== false) {
-			$value = call_user_func($this->serializer[0], array($value, $dependency));
-		}
-		$key = $this->keyPrefix . $this->buildKey($key);
-		return $this->addValue($key, $value, $expire);
-	}
-
-	/**
-	 * Deletes a value with the specified key from cache
-	 * @param string $key the key of the value to be deleted
-	 * @return boolean if no error happens during deletion
-	 */
-	public function delete($key)
-	{
-		$key = $this->keyPrefix . $this->buildKey($key);
-		return $this->deleteValue($key);
-	}
-
-	/**
-	 * Deletes all values from cache.
-	 * Be careful of performing this operation if the cache is shared among multiple applications.
-	 * @return boolean whether the flush operation was successful.
-	 */
-	public function flush()
-	{
-		return $this->flushValues();
-	}
-
-	/**
-	 * Retrieves a value from cache with a specified key.
-	 * This method should be implemented by child classes to retrieve the data
-	 * from specific cache storage.
-	 * @param string $key a unique key identifying the cached value
-	 * @return string the value stored in cache, false if the value is not in the cache or expired.
-	 */
-	abstract protected function getValue($key);
-
-	/**
-	 * Stores a value identified by a key in cache.
-	 * This method should be implemented by child classes to store the data
-	 * in specific cache storage.
-	 * @param string $key the key identifying the value to be cached
-	 * @param string $value the value to be cached
-	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
-	 * @return boolean true if the value is successfully stored into cache, false otherwise
-	 */
-	abstract protected function setValue($key, $value, $expire);
-
-	/**
-	 * Stores a value identified by a key into cache if the cache does not contain this key.
-	 * This method should be implemented by child classes to store the data
-	 * in specific cache storage.
-	 * @param string $key the key identifying the value to be cached
-	 * @param string $value the value to be cached
-	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
-	 * @return boolean true if the value is successfully stored into cache, false otherwise
-	 */
-	abstract protected function addValue($key, $value, $expire);
-
-	/**
-	 * Deletes a value with the specified key from cache
-	 * This method should be implemented by child classes to delete the data from actual cache storage.
-	 * @param string $key the key of the value to be deleted
-	 * @return boolean if no error happens during deletion
-	 */
-	abstract protected function deleteValue($key);
-
-	/**
-	 * Deletes all values from cache.
-	 * Child classes may implement this method to realize the flush operation.
-	 * @return boolean whether the flush operation was successful.
-	 */
-	abstract protected function flushValues();
-
-	/**
-	 * Retrieves multiple values from cache with the specified keys.
-	 * The default implementation calls [[getValue()]] multiple times to retrieve
-	 * the cached values one by one. If the underlying cache storage supports multiget,
-	 * this method should be overridden to exploit that feature.
-	 * @param array $keys a list of keys identifying the cached values
-	 * @return array a list of cached values indexed by the keys
-	 */
-	protected function getValues($keys)
-	{
-		$results = array();
-		foreach ($keys as $key) {
-			$results[$key] = $this->getValue($key);
-		}
-		return $results;
-	}
-
-	/**
-	 * Returns whether there is a cache entry with a specified key.
-	 * This method is required by the interface ArrayAccess.
-	 * @param string $key a key identifying the cached value
-	 * @return boolean
-	 */
-	public function offsetExists($key)
-	{
-		return $this->get($key) !== false;
-	}
-
-	/**
-	 * Retrieves the value from cache with a specified key.
-	 * This method is required by the interface ArrayAccess.
-	 * @param string $key a key identifying the cached value
-	 * @return mixed the value stored in cache, false if the value is not in the cache or expired.
-	 */
-	public function offsetGet($key)
-	{
-		return $this->get($key);
-	}
-
-	/**
-	 * Stores the value identified by a key into cache.
-	 * If the cache already contains such a key, the existing value will be
-	 * replaced with the new ones. To add expiration and dependencies, use the [[set()]] method.
-	 * This method is required by the interface ArrayAccess.
-	 * @param string $key the key identifying the value to be cached
-	 * @param mixed $value the value to be cached
-	 */
-	public function offsetSet($key, $value)
-	{
-		$this->set($key, $value);
-	}
-
-	/**
-	 * Deletes the value with the specified key from cache
-	 * This method is required by the interface ArrayAccess.
-	 * @param string $key the key of the value to be deleted
-	 */
-	public function offsetUnset($key)
-	{
-		$this->delete($key);
-	}
-}
diff --git a/framework/caching/ChainedDependency.php b/framework/caching/ChainedDependency.php
deleted file mode 100644
index 7c7058e..0000000
--- a/framework/caching/ChainedDependency.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\caching;
-
-/**
- * ChainedDependency represents a dependency which is composed of a list of other dependencies.
- *
- * When [[dependOnAll]] is true, if any of the dependencies has changed, this dependency is
- * considered changed; When [[dependOnAll]] is false, if one of the dependencies has NOT changed,
- * this dependency is considered NOT changed.
- *
- * @property boolean $hasChanged Whether the dependency is changed or not.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class ChainedDependency extends Dependency
-{
-	/**
-	 * @var Dependency[] list of dependencies that this dependency is composed of.
-	 * Each array element must be a dependency object.
-	 */
-	public $dependencies;
-	/**
-	 * @var boolean whether this dependency is depending on every dependency in [[dependencies]].
-	 * Defaults to true, meaning if any of the dependencies has changed, this dependency is considered changed.
-	 * When it is set false, it means if one of the dependencies has NOT changed, this dependency
-	 * is considered NOT changed.
-	 */
-	public $dependOnAll = true;
-
-	/**
-	 * Constructor.
-	 * @param Dependency[] $dependencies list of dependencies that this dependency is composed of.
-	 * Each array element should be a dependency object.
-	 * @param array $config name-value pairs that will be used to initialize the object properties
-	 */
-	public function __construct($dependencies = array(), $config = array())
-	{
-		$this->dependencies = $dependencies;
-		parent::__construct($config);
-	}
-
-	/**
-	 * Evaluates the dependency by generating and saving the data related with dependency.
-	 */
-	public function evaluateDependency()
-	{
-		foreach ($this->dependencies as $dependency) {
-			$dependency->evaluateDependency();
-		}
-	}
-
-	/**
-	 * Generates the data needed to determine if dependency has been changed.
-	 * This method does nothing in this class.
-	 * @return mixed the data needed to determine if dependency has been changed.
-	 */
-	protected function generateDependencyData()
-	{
-		return null;
-	}
-
-	/**
-	 * Performs the actual dependency checking.
-	 * This method returns true if any of the dependency objects
-	 * reports a dependency change.
-	 * @return boolean whether the dependency is changed or not.
-	 */
-	public function getHasChanged()
-	{
-		foreach ($this->dependencies as $dependency) {
-			if ($this->dependOnAll && $dependency->getHasChanged()) {
-				return true;
-			} elseif (!$this->dependOnAll && !$dependency->getHasChanged()) {
-				return false;
-			}
-		}
-		return !$this->dependOnAll;
-	}
-}
diff --git a/framework/caching/DbCache.php b/framework/caching/DbCache.php
deleted file mode 100644
index dee8c7a..0000000
--- a/framework/caching/DbCache.php
+++ /dev/null
@@ -1,247 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\caching;
-
-use Yii;
-use yii\base\InvalidConfigException;
-use yii\db\Connection;
-use yii\db\Query;
-
-/**
- * DbCache implements a cache application component by storing cached data in a database.
- *
- * By default, DbCache stores session data in a DB table named 'tbl_cache'. This table
- * must be pre-created. The table name can be changed by setting [[cacheTable]].
- *
- * Please refer to [[Cache]] for common cache operations that are supported by DbCache.
- *
- * The following example shows how you can configure the application to use DbCache:
- *
- * ~~~
- * 'cache' => array(
- *     'class' => 'yii\caching\DbCache',
- *     // 'db' => 'mydb',
- *     // 'cacheTable' => 'my_cache',
- * )
- * ~~~
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class DbCache extends Cache
-{
-	/**
-	 * @var Connection|string the DB connection object or the application component ID of the DB connection.
-	 * After the DbCache object is created, if you want to change this property, you should only assign it
-	 * with a DB connection object.
-	 */
-	public $db = 'db';
-	/**
-	 * @var string name of the DB table to store cache content.
-	 * The table should be pre-created as follows:
-	 *
-	 * ~~~
-	 * CREATE TABLE tbl_cache (
-	 *     id char(128) NOT NULL PRIMARY KEY,
-	 *     expire int(11),
-	 *     data BLOB
-	 * );
-	 * ~~~
-	 *
-	 * where 'BLOB' refers to the BLOB-type of your preferred DBMS. Below are the BLOB type
-	 * that can be used for some popular DBMS:
-	 *
-	 * - MySQL: LONGBLOB
-	 * - PostgreSQL: BYTEA
-	 * - MSSQL: BLOB
-	 *
-	 * When using DbCache in a production server, we recommend you create a DB index for the 'expire'
-	 * column in the cache table to improve the performance.
-	 */
-	public $cacheTable = 'tbl_cache';
-	/**
-	 * @var integer the probability (parts per million) that garbage collection (GC) should be performed
-	 * when storing a piece of data in the cache. Defaults to 100, meaning 0.01% chance.
-	 * This number should be between 0 and 1000000. A value 0 meaning no GC will be performed at all.
-	 **/
-	public $gcProbability = 100;
-
-
-	/**
-	 * Initializes the DbCache component.
-	 * This method will initialize the [[db]] property to make sure it refers to a valid DB connection.
-	 * @throws InvalidConfigException if [[db]] is invalid.
-	 */
-	public function init()
-	{
-		parent::init();
-		if (is_string($this->db)) {
-			$this->db = Yii::$app->getComponent($this->db);
-		}
-		if (!$this->db instanceof Connection) {
-			throw new InvalidConfigException("DbCache::db must be either a DB connection instance or the application component ID of a DB connection.");
-		}
-	}
-
-	/**
-	 * Retrieves a value from cache with a specified key.
-	 * This is the implementation of the method declared in the parent class.
-	 * @param string $key a unique key identifying the cached value
-	 * @return string the value stored in cache, false if the value is not in the cache or expired.
-	 */
-	protected function getValue($key)
-	{
-		$query = new Query;
-		$query->select(array('data'))
-			->from($this->cacheTable)
-			->where('[[id]] = :id AND ([[expire]] = 0 OR [[expire]] >' . time() . ')', array(':id' => $key));
-		if ($this->db->enableQueryCache) {
-			// temporarily disable and re-enable query caching
-			$this->db->enableQueryCache = false;
-			$result = $query->createCommand($this->db)->queryScalar();
-			$this->db->enableQueryCache = true;
-			return $result;
-		} else {
-			return $query->createCommand($this->db)->queryScalar();
-		}
-	}
-
-	/**
-	 * Retrieves multiple values from cache with the specified keys.
-	 * @param array $keys a list of keys identifying the cached values
-	 * @return array a list of cached values indexed by the keys
-	 */
-	protected function getValues($keys)
-	{
-		if (empty($keys)) {
-			return array();
-		}
-		$query = new Query;
-		$query->select(array('id', 'data'))
-			->from($this->cacheTable)
-			->where(array('id' => $keys))
-			->andWhere('([[expire]] = 0 OR [[expire]] > ' . time() . ')');
-
-		if ($this->db->enableQueryCache) {
-			$this->db->enableQueryCache = false;
-			$rows = $query->createCommand($this->db)->queryAll();
-			$this->db->enableQueryCache = true;
-		} else {
-			$rows = $query->createCommand($this->db)->queryAll();
-		}
-
-		$results = array();
-		foreach ($keys as $key) {
-			$results[$key] = false;
-		}
-		foreach ($rows as $row) {
-			$results[$row['id']] = $row['data'];
-		}
-		return $results;
-	}
-
-	/**
-	 * Stores a value identified by a key in cache.
-	 * This is the implementation of the method declared in the parent class.
-	 *
-	 * @param string $key the key identifying the value to be cached
-	 * @param string $value the value to be cached
-	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
-	 * @return boolean true if the value is successfully stored into cache, false otherwise
-	 */
-	protected function setValue($key, $value, $expire)
-	{
-		$command = $this->db->createCommand()
-			->update($this->cacheTable, array(
-				'expire' => $expire > 0 ? $expire + time() : 0,
-				'data' => array($value, \PDO::PARAM_LOB),
-			), array(
-				'id' => $key,
-			));
-
-		if ($command->execute()) {
-			$this->gc();
-			return true;
-		} else {
-			return $this->addValue($key, $value, $expire);
-		}
- 	}
-
-	/**
-	 * Stores a value identified by a key into cache if the cache does not contain this key.
-	 * This is the implementation of the method declared in the parent class.
-	 *
-	 * @param string $key the key identifying the value to be cached
-	 * @param string $value the value to be cached
-	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
-	 * @return boolean true if the value is successfully stored into cache, false otherwise
-	 */
-	protected function addValue($key, $value, $expire)
-	{
-		$this->gc();
-
-		if ($expire > 0) {
-			$expire += time();
-		} else {
-			$expire = 0;
-		}
-
-		try {
-			$this->db->createCommand()
-				->insert($this->cacheTable, array(
-					'id' => $key,
-					'expire' => $expire,
-					'data' => array($value, \PDO::PARAM_LOB),
-				))->execute();
-			return true;
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Deletes a value with the specified key from cache
-	 * This is the implementation of the method declared in the parent class.
-	 * @param string $key the key of the value to be deleted
-	 * @return boolean if no error happens during deletion
-	 */
-	protected function deleteValue($key)
-	{
-		$this->db->createCommand()
-			->delete($this->cacheTable, array('id' => $key))
-			->execute();
-		return true;
-	}
-
-	/**
-	 * Removes the expired data values.
-	 * @param boolean $force whether to enforce the garbage collection regardless of [[gcProbability]].
-	 * Defaults to false, meaning the actual deletion happens with the probability as specified by [[gcProbability]].
-	 */
-	public function gc($force = false)
-	{
-		if ($force || mt_rand(0, 1000000) < $this->gcProbability) {
-			$this->db->createCommand()
-				->delete($this->cacheTable, '[[expire]] > 0 AND [[expire]] < ' . time())
-				->execute();
-		}
-	}
-
-	/**
-	 * Deletes all values from cache.
-	 * This is the implementation of the method declared in the parent class.
-	 * @return boolean whether the flush operation was successful.
-	 */
-	protected function flushValues()
-	{
-		$this->db->createCommand()
-			->delete($this->cacheTable)
-			->execute();
-		return true;
-	}
-}
diff --git a/framework/caching/DbDependency.php b/framework/caching/DbDependency.php
deleted file mode 100644
index 7d45223..0000000
--- a/framework/caching/DbDependency.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\caching;
-
-use Yii;
-use yii\base\InvalidConfigException;
-use yii\db\Connection;
-
-/**
- * DbDependency represents a dependency based on the query result of a SQL statement.
- *
- * If the query result changes, the dependency is considered as changed.
- * The query is specified via the [[sql]] property.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class DbDependency extends Dependency
-{
-	/**
-	 * @var string the application component ID of the DB connection.
-	 */
-	public $db = 'db';
-	/**
-	 * @var string the SQL query whose result is used to determine if the dependency has been changed.
-	 * Only the first row of the query result will be used.
-	 */
-	public $sql;
-	/**
-	 * @var array the parameters (name=>value) to be bound to the SQL statement specified by [[sql]].
-	 */
-	public $params;
-
-	/**
-	 * Constructor.
-	 * @param string $sql the SQL query whose result is used to determine if the dependency has been changed.
-	 * @param array $params the parameters (name=>value) to be bound to the SQL statement specified by [[sql]].
-	 * @param array $config name-value pairs that will be used to initialize the object properties
-	 */
-	public function __construct($sql, $params = array(), $config = array())
-	{
-		$this->sql = $sql;
-		$this->params = $params;
-		parent::__construct($config);
-	}
-
-	/**
-	 * Generates the data needed to determine if dependency has been changed.
-	 * This method returns the value of the global state.
-	 * @throws InvalidConfigException
-	 * @return mixed the data needed to determine if dependency has been changed.
-	 */
-	protected function generateDependencyData()
-	{
-		$db = Yii::$app->getComponent($this->db);
-		if (!$db instanceof Connection) {
-			throw new InvalidConfigException("DbDependency::db must be the application component ID of a DB connection.");
-		}
-
-		if ($db->enableQueryCache) {
-			// temporarily disable and re-enable query caching
-			$db->enableQueryCache = false;
-			$result = $db->createCommand($this->sql, $this->params)->queryRow();
-			$db->enableQueryCache = true;
-		} else {
-			$result = $db->createCommand($this->sql, $this->params)->queryRow();
-		}
-		return $result;
-	}
-}
diff --git a/framework/caching/Dependency.php b/framework/caching/Dependency.php
deleted file mode 100644
index d1428fc..0000000
--- a/framework/caching/Dependency.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\caching;
-
-/**
- * Dependency is the base class for cache dependency classes.
- *
- * Child classes should override its [[generateDependencyData()]] for generating
- * the actual dependency data.
- *
- * @property boolean $hasChanged Whether the dependency has changed.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-abstract class Dependency extends \yii\base\Object
-{
-	/**
-	 * @var mixed the dependency data that is saved in cache and later is compared with the
-	 * latest dependency data.
-	 */
-	public $data;
-
-	/**
-	 * Evaluates the dependency by generating and saving the data related with dependency.
-	 * This method is invoked by cache before writing data into it.
-	 */
-	public function evaluateDependency()
-	{
-		$this->data = $this->generateDependencyData();
-	}
-
-	/**
-	 * @return boolean whether the dependency has changed.
-	 */
-	public function getHasChanged()
-	{
-		return $this->generateDependencyData() !== $this->data;
-	}
-
-	/**
-	 * Generates the data needed to determine if dependency has been changed.
-	 * Derived classes should override this method to generate the actual dependency data.
-	 * @return mixed the data needed to determine if dependency has been changed.
-	 */
-	abstract protected function generateDependencyData();
-}
diff --git a/framework/caching/DummyCache.php b/framework/caching/DummyCache.php
deleted file mode 100644
index 359fa7c..0000000
--- a/framework/caching/DummyCache.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\caching;
-
-/**
- * DummyCache is a placeholder cache component.
- *
- * DummyCache does not cache anything. It is provided so that one can always configure
- * a 'cache' application component and save the check of existence of `\Yii::$app->cache`.
- * By replacing DummyCache with some other cache component, one can quickly switch from
- * non-caching mode to caching mode.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class DummyCache extends Cache
-{
-	/**
-	 * Retrieves a value from cache with a specified key.
-	 * This is the implementation of the method declared in the parent class.
-	 * @param string $key a unique key identifying the cached value
-	 * @return string the value stored in cache, false if the value is not in the cache or expired.
-	 */
-	protected function getValue($key)
-	{
-		return false;
-	}
-
-	/**
-	 * Stores a value identified by a key in cache.
-	 * This is the implementation of the method declared in the parent class.
-	 *
-	 * @param string $key the key identifying the value to be cached
-	 * @param string $value the value to be cached
-	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
-	 * @return boolean true if the value is successfully stored into cache, false otherwise
-	 */
-	protected function setValue($key, $value, $expire)
-	{
-		return true;
-	}
-
-	/**
-	 * Stores a value identified by a key into cache if the cache does not contain this key.
-	 * This is the implementation of the method declared in the parent class.
-	 * @param string $key the key identifying the value to be cached
-	 * @param string $value the value to be cached
-	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
-	 * @return boolean true if the value is successfully stored into cache, false otherwise
-	 */
-	protected function addValue($key, $value, $expire)
-	{
-		return true;
-	}
-
-	/**
-	 * Deletes a value with the specified key from cache
-	 * This is the implementation of the method declared in the parent class.
-	 * @param string $key the key of the value to be deleted
-	 * @return boolean if no error happens during deletion
-	 */
-	protected function deleteValue($key)
-	{
-		return true;
-	}
-
-	/**
-	 * Deletes all values from cache.
-	 * This is the implementation of the method declared in the parent class.
-	 * @return boolean whether the flush operation was successful.
-	 */
-	protected function flushValues()
-	{
-		return true;
-	}
-}
diff --git a/framework/caching/ExpressionDependency.php b/framework/caching/ExpressionDependency.php
deleted file mode 100644
index ec4736c..0000000
--- a/framework/caching/ExpressionDependency.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\caching;
-
-/**
- * ExpressionDependency represents a dependency based on the result of a PHP expression.
- *
- * ExpressionDependency will use `eval()` to evaluate the PHP expression.
- * The dependency is reported as unchanged if and only if the result of the expression is
- * the same as the one evaluated when storing the data to cache.
- *
- * A PHP expression can be any PHP code that has a value. To learn more about what an expression is,
- * please refer to the [php manual](http://www.php.net/manual/en/language.expressions.php).
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class ExpressionDependency extends Dependency
-{
-	/**
-	 * @var string the string representation of a PHP expression whose result is used to determine the dependency.
-	 * A PHP expression can be any PHP code that has a value. To learn more about what an expression is,
-	 * please refer to the [php manual](http://www.php.net/manual/en/language.expressions.php).
-	 */
-	public $expression;
-	/**
-	 * @var mixed custom data associated with this dependency. In [[expression]], you may compare the value of
-	 * this property with the latest data to determine if the dependency has changed or not.
-	 */
-	public $data;
-
-	/**
-	 * Constructor.
-	 * @param string $expression the PHP expression whose result is used to determine the dependency.
-	 * @param mixed $data the custom data associated with this dependency
-	 * @param array $config name-value pairs that will be used to initialize the object properties
-	 */
-	public function __construct($expression = 'true', $data = null, $config = array())
-	{
-		$this->expression = $expression;
-		$this->data = $data;
-		parent::__construct($config);
-	}
-
-	/**
-	 * Generates the data needed to determine if dependency has been changed.
-	 * This method returns the result of the PHP expression.
-	 * @return mixed the data needed to determine if dependency has been changed.
-	 */
-	protected function generateDependencyData()
-	{
-		return eval("return {$this->expression};");
-	}
-}
diff --git a/framework/caching/FileCache.php b/framework/caching/FileCache.php
deleted file mode 100644
index cc1a871..0000000
--- a/framework/caching/FileCache.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\caching;
-
-use Yii;
-
-/**
- * FileCache implements a cache component using files.
- *
- * For each data value being cached, FileCache will store it in a separate file.
- * The cache files are placed under [[cachePath]]. FileCache will perform garbage collection
- * automatically to remove expired cache files.
- *
- * Please refer to [[Cache]] for common cache operations that are supported by FileCache.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class FileCache extends Cache
-{
-	/**
-	 * @var string the directory to store cache files. You may use path alias here.
-	 */
-	public $cachePath = '@app/runtime/cache';
-	/**
-	 * @var string cache file suffix. Defaults to '.bin'.
-	 */
-	public $cacheFileSuffix = '.bin';
-	/**
-	 * @var integer the level of sub-directories to store cache files. Defaults to 1.
-	 * If the system has huge number of cache files (e.g. one million), you may use a bigger value
-	 * (usually no bigger than 3). Using sub-directories is mainly to ensure the file system
-	 * is not over burdened with a single directory having too many files.
-	 */
-	public $directoryLevel = 1;
-	/**
-	 * @var integer the probability (parts per million) that garbage collection (GC) should be performed
-	 * when storing a piece of data in the cache. Defaults to 10, meaning 0.001% chance.
-	 * This number should be between 0 and 1000000. A value 0 means no GC will be performed at all.
-	 **/
-	public $gcProbability = 10;
-
-	/**
-	 * Initializes this component by ensuring the existence of the cache path.
-	 */
-	public function init()
-	{
-		parent::init();
-		$this->cachePath = Yii::getAlias($this->cachePath);
-		if (!is_dir($this->cachePath)) {
-			mkdir($this->cachePath, 0777, true);
-		}
-	}
-
-	/**
-	 * Retrieves a value from cache with a specified key.
-	 * This is the implementation of the method declared in the parent class.
-	 * @param string $key a unique key identifying the cached value
-	 * @return string the value stored in cache, false if the value is not in the cache or expired.
-	 */
-	protected function getValue($key)
-	{
-		$cacheFile = $this->getCacheFile($key);
-		if (($time = @filemtime($cacheFile)) > time()) {
-			return @file_get_contents($cacheFile);
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Stores a value identified by a key in cache.
-	 * This is the implementation of the method declared in the parent class.
-	 *
-	 * @param string $key the key identifying the value to be cached
-	 * @param string $value the value to be cached
-	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
-	 * @return boolean true if the value is successfully stored into cache, false otherwise
-	 */
-	protected function setValue($key, $value, $expire)
-	{
-		if ($expire <= 0) {
-			$expire = 31536000; // 1 year
-		}
-		$expire += time();
-
-		$cacheFile = $this->getCacheFile($key);
-		if ($this->directoryLevel > 0) {
-			@mkdir(dirname($cacheFile), 0777, true);
-		}
-		if (@file_put_contents($cacheFile, $value, LOCK_EX) !== false) {
-			@chmod($cacheFile, 0777);
-			return @touch($cacheFile, $expire);
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Stores a value identified by a key into cache if the cache does not contain this key.
-	 * This is the implementation of the method declared in the parent class.
-	 *
-	 * @param string $key the key identifying the value to be cached
-	 * @param string $value the value to be cached
-	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
-	 * @return boolean true if the value is successfully stored into cache, false otherwise
-	 */
-	protected function addValue($key, $value, $expire)
-	{
-		$cacheFile = $this->getCacheFile($key);
-		if (@filemtime($cacheFile) > time()) {
-			return false;
-		}
-		return $this->setValue($key, $value, $expire);
-	}
-
-	/**
-	 * Deletes a value with the specified key from cache
-	 * This is the implementation of the method declared in the parent class.
-	 * @param string $key the key of the value to be deleted
-	 * @return boolean if no error happens during deletion
-	 */
-	protected function deleteValue($key)
-	{
-		$cacheFile = $this->getCacheFile($key);
-		return @unlink($cacheFile);
-	}
-
-	/**
-	 * Returns the cache file path given the cache key.
-	 * @param string $key cache key
-	 * @return string the cache file path
-	 */
-	protected function getCacheFile($key)
-	{
-		if ($this->directoryLevel > 0) {
-			$base = $this->cachePath;
-			for ($i = 0; $i < $this->directoryLevel; ++$i) {
-				if (($prefix = substr($key, $i + $i, 2)) !== false) {
-					$base .= DIRECTORY_SEPARATOR . $prefix;
-				}
-			}
-			return $base . DIRECTORY_SEPARATOR . $key . $this->cacheFileSuffix;
-		} else {
-			return $this->cachePath . DIRECTORY_SEPARATOR . $key . $this->cacheFileSuffix;
-		}
-	}
-
-	/**
-	 * Deletes all values from cache.
-	 * This is the implementation of the method declared in the parent class.
-	 * @return boolean whether the flush operation was successful.
-	 */
-	protected function flushValues()
-	{
-		$this->gc(true, false);
-		return true;
-	}
-
-	/**
-	 * Removes expired cache files.
-	 * @param boolean $force whether to enforce the garbage collection regardless of [[gcProbability]].
-	 * Defaults to false, meaning the actual deletion happens with the probability as specified by [[gcProbability]].
-	 * @param boolean $expiredOnly whether to removed expired cache files only.
-	 * If true, all cache files under [[cachePath]] will be removed.
-	 */
-	public function gc($force = false, $expiredOnly = true)
-	{
-		if ($force || mt_rand(0, 1000000) < $this->gcProbability) {
-			$this->gcRecursive($this->cachePath, $expiredOnly);
-		}
-	}
-
-	/**
-	 * Recursively removing expired cache files under a directory.
-	 * This method is mainly used by [[gc()]].
-	 * @param string $path the directory under which expired cache files are removed.
-	 * @param boolean $expiredOnly whether to only remove expired cache files. If false, all files
-	 * under `$path` will be removed.
-	 */
-	protected function gcRecursive($path, $expiredOnly)
-	{
-		if (($handle = opendir($path)) !== false) {
-			while (($file = readdir($handle)) !== false) {
-				if ($file[0] === '.') {
-					continue;
-				}
-				$fullPath = $path . DIRECTORY_SEPARATOR . $file;
-				if (is_dir($fullPath)) {
-					$this->gcRecursive($fullPath, $expiredOnly);
-					if (!$expiredOnly) {
-						@rmdir($fullPath);
-					}
-				} elseif (!$expiredOnly || $expiredOnly && @filemtime($fullPath) < time()) {
-					@unlink($fullPath);
-				}
-			}
-			closedir($handle);
-		}
-	}
-}
diff --git a/framework/caching/FileDependency.php b/framework/caching/FileDependency.php
deleted file mode 100644
index 3797dde..0000000
--- a/framework/caching/FileDependency.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\caching;
-
-/**
- * FileDependency represents a dependency based on a file's last modification time.
- *
- * If th last modification time of the file specified via [[fileName]] is changed,
- * the dependency is considered as changed.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class FileDependency extends Dependency
-{
-	/**
-	 * @var string the name of the file whose last modification time is used to
-	 * check if the dependency has been changed.
-	 */
-	public $fileName;
-
-	/**
-	 * Constructor.
-	 * @param string $fileName name of the file whose change is to be checked.
-	 * @param array $config name-value pairs that will be used to initialize the object properties
-	 */
-	public function __construct($fileName = null, $config = array())
-	{
-		$this->fileName = $fileName;
-		parent::__construct($config);
-	}
-
-	/**
-	 * Generates the data needed to determine if dependency has been changed.
-	 * This method returns the file's last modification time.
-	 * @return mixed the data needed to determine if dependency has been changed.
-	 */
-	protected function generateDependencyData()
-	{
-		return @filemtime($this->fileName);
-	}
-}
diff --git a/framework/caching/MemCache.php b/framework/caching/MemCache.php
deleted file mode 100644
index 20aff21..0000000
--- a/framework/caching/MemCache.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\caching;
-
-use yii\base\Exception;
-use yii\base\InvalidConfigException;
-
-/**
- * MemCache implements a cache application component based on [memcache](http://pecl.php.net/package/memcache)
- * and [memcached](http://pecl.php.net/package/memcached).
- *
- * MemCache supports both [memcache](http://pecl.php.net/package/memcache) and
- * [memcached](http://pecl.php.net/package/memcached). By setting [[useMemcached]] to be true or false,
- * one can let MemCache to use either memcached or memcache, respectively.
- *
- * MemCache can be configured with a list of memcache servers by settings its [[servers]] property.
- * By default, MemCache assumes there is a memcache server running on localhost at port 11211.
- *
- * See [[Cache]] for common cache operations that ApcCache supports.
- *
- * Note, there is no security measure to protected data in memcache.
- * All data in memcache can be accessed by any process running in the system.
- *
- * To use MemCache as the cache application component, configure the application as follows,
- *
- * ~~~
- * array(
- *     'components'=>array(
- *         'cache'=>array(
- *             'class'=>'MemCache',
- *             'servers'=>array(
- *                 array(
- *                     'host'=>'server1',
- *                     'port'=>11211,
- *                     'weight'=>60,
- *                 ),
- *                 array(
- *                     'host'=>'server2',
- *                     'port'=>11211,
- *                     'weight'=>40,
- *                 ),
- *             ),
- *         ),
- *     ),
- * )
- * ~~~
- *
- * In the above, two memcache servers are used: server1 and server2. You can configure more properties of
- * each server, such as `persistent`, `weight`, `timeout`. Please see [[MemCacheServer]] for available options.
- *
- * @property \Memcache|\Memcached $memCache The memcache instance (or memcached if [[useMemcached]] is true) used by this component.
- * @property MemCacheServer[] $servers List of memcache server configurations.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class MemCache extends Cache
-{
-	/**
-	 * @var boolean whether to use memcached or memcache as the underlying caching extension.
-	 * If true, [memcached](http://pecl.php.net/package/memcached) will be used.
-	 * If false, [memcache](http://pecl.php.net/package/memcache) will be used.
-	 * Defaults to false.
-	 */
-	public $useMemcached = false;
-	/**
-	 * @var \Memcache|\Memcached the Memcache instance
-	 */
-	private $_cache = null;
-	/**
-	 * @var array list of memcache server configurations
-	 */
-	private $_servers = array();
-
-	/**
-	 * Initializes this application component.
-	 * It creates the memcache instance and adds memcache servers.
-	 */
-	public function init()
-	{
-		parent::init();
-		$servers = $this->getServers();
-		$cache = $this->getMemCache();
-		if (count($servers)) {
-			foreach ($servers as $server) {
-				if ($server->host === null) {
-					throw new Exception("The 'host' property must be specified for every memcache server.");
-				}
-				if ($this->useMemcached) {
-					$cache->addServer($server->host, $server->port, $server->weight);
-				} else {
-					$cache->addServer($server->host, $server->port, $server->persistent,
-						$server->weight, $server->timeout, $server->retryInterval, $server->status);
-				}
-			}
-		} else {
-			$cache->addServer('127.0.0.1', 11211);
-		}
-	}
-
-	/**
-	 * Returns the underlying memcache (or memcached) object.
-	 * @return \Memcache|\Memcached the memcache (or memcached) object used by this cache component.
-	 * @throws InvalidConfigException if memcache or memcached extension is not loaded
-	 */
-	public function getMemcache()
-	{
-		if ($this->_cache === null) {
-			$extension = $this->useMemcached ? 'memcached' : 'memcache';
-			if (!extension_loaded($extension)) {
-				throw new InvalidConfigException("MemCache requires PHP $extension extension to be loaded.");
-			}
-			$this->_cache = $this->useMemcached ? new \Memcached : new \Memcache;
-		}
-		return $this->_cache;
-	}
-
-	/**
-	 * Returns the memcache server configurations.
-	 * @return MemCacheServer[] list of memcache server configurations.
-	 */
-	public function getServers()
-	{
-		return $this->_servers;
-	}
-
-	/**
-	 * @param array $config list of memcache server configurations. Each element must be an array
-	 * with the following keys: host, port, persistent, weight, timeout, retryInterval, status.
-	 * @see http://www.php.net/manual/en/function.Memcache-addServer.php
-	 */
-	public function setServers($config)
-	{
-		foreach ($config as $c) {
-			$this->_servers[] = new MemCacheServer($c);
-		}
-	}
-
-	/**
-	 * Retrieves a value from cache with a specified key.
-	 * This is the implementation of the method declared in the parent class.
-	 * @param string $key a unique key identifying the cached value
-	 * @return string the value stored in cache, false if the value is not in the cache or expired.
-	 */
-	protected function getValue($key)
-	{
-		return $this->_cache->get($key);
-	}
-
-	/**
-	 * Retrieves multiple values from cache with the specified keys.
-	 * @param array $keys a list of keys identifying the cached values
-	 * @return array a list of cached values indexed by the keys
-	 */
-	protected function getValues($keys)
-	{
-		return $this->useMemcached ? $this->_cache->getMulti($keys) : $this->_cache->get($keys);
-	}
-
-	/**
-	 * Stores a value identified by a key in cache.
-	 * This is the implementation of the method declared in the parent class.
-	 *
-	 * @param string $key the key identifying the value to be cached
-	 * @param string $value the value to be cached
-	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
-	 * @return boolean true if the value is successfully stored into cache, false otherwise
-	 */
-	protected function setValue($key, $value, $expire)
-	{
-		if ($expire > 0) {
-			$expire += time();
-		} else {
-			$expire = 0;
-		}
-
-		return $this->useMemcached ? $this->_cache->set($key, $value, $expire) : $this->_cache->set($key, $value, 0, $expire);
-	}
-
-	/**
-	 * Stores a value identified by a key into cache if the cache does not contain this key.
-	 * This is the implementation of the method declared in the parent class.
-	 *
-	 * @param string $key the key identifying the value to be cached
-	 * @param string $value the value to be cached
-	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
-	 * @return boolean true if the value is successfully stored into cache, false otherwise
-	 */
-	protected function addValue($key, $value, $expire)
-	{
-		if ($expire > 0) {
-			$expire += time();
-		} else {
-			$expire = 0;
-		}
-
-		return $this->useMemcached ? $this->_cache->add($key, $value, $expire) : $this->_cache->add($key, $value, 0, $expire);
-	}
-
-	/**
-	 * Deletes a value with the specified key from cache
-	 * This is the implementation of the method declared in the parent class.
-	 * @param string $key the key of the value to be deleted
-	 * @return boolean if no error happens during deletion
-	 */
-	protected function deleteValue($key)
-	{
-		return $this->_cache->delete($key, 0);
-	}
-
-	/**
-	 * Deletes all values from cache.
-	 * This is the implementation of the method declared in the parent class.
-	 * @return boolean whether the flush operation was successful.
-	 */
-	protected function flushValues()
-	{
-		return $this->_cache->flush();
-	}
-}
diff --git a/framework/caching/MemCacheServer.php b/framework/caching/MemCacheServer.php
deleted file mode 100644
index dc0de08..0000000
--- a/framework/caching/MemCacheServer.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\caching;
-
-/**
- * MemCacheServer represents the configuration data for a single memcache or memcached server.
- *
- * See [PHP manual](http://www.php.net/manual/en/function.Memcache-addServer.php) for detailed explanation
- * of each configuration property.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class MemCacheServer extends \yii\base\Object
-{
-	/**
-	 * @var string memcache server hostname or IP address
-	 */
-	public $host;
-	/**
-	 * @var integer memcache server port
-	 */
-	public $port = 11211;
-	/**
-	 * @var integer probability of using this server among all servers.
-	 */
-	public $weight = 1;
-	/**
-	 * @var boolean whether to use a persistent connection. This is used by memcache only.
-	 */
-	public $persistent = true;
-	/**
-	 * @var integer value in seconds which will be used for connecting to the server. This is used by memcache only.
-	 */
-	public $timeout = 15;
-	/**
-	 * @var integer how often a failed server will be retried (in seconds). This is used by memcache only.
-	 */
-	public $retryInterval = 15;
-	/**
-	 * @var boolean if the server should be flagged as online upon a failure. This is used by memcache only.
-	 */
-	public $status = true;
-}
diff --git a/framework/caching/WinCache.php b/framework/caching/WinCache.php
deleted file mode 100644
index 4e07c7f..0000000
--- a/framework/caching/WinCache.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\caching;
-
-/**
- * WinCache provides XCache caching in terms of an application component.
- *
- * To use this application component, the [WinCache PHP extension](http://www.iis.net/expand/wincacheforphp)
- * must be loaded. Also note that "wincache.ucenabled" should be set to "On" in your php.ini file.
- *
- * See {@link CCache} manual for common cache operations that are supported by WinCache.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class WinCache extends Cache
-{
-	/**
-	 * Retrieves a value from cache with a specified key.
-	 * This is the implementation of the method declared in the parent class.
-	 * @param string $key a unique key identifying the cached value
-	 * @return string the value stored in cache, false if the value is not in the cache or expired.
-	 */
-	protected function getValue($key)
-	{
-		return wincache_ucache_get($key);
-	}
-
-	/**
-	 * Retrieves multiple values from cache with the specified keys.
-	 * @param array $keys a list of keys identifying the cached values
-	 * @return array a list of cached values indexed by the keys
-	 */
-	protected function getValues($keys)
-	{
-		return wincache_ucache_get($keys);
-	}
-
-	/**
-	 * Stores a value identified by a key in cache.
-	 * This is the implementation of the method declared in the parent class.
-	 *
-	 * @param string $key the key identifying the value to be cached
-	 * @param string $value the value to be cached
-	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
-	 * @return boolean true if the value is successfully stored into cache, false otherwise
-	 */
-	protected function setValue($key, $value, $expire)
-	{
-		return wincache_ucache_set($key, $value, $expire);
-	}
-
-	/**
-	 * Stores a value identified by a key into cache if the cache does not contain this key.
-	 * This is the implementation of the method declared in the parent class.
-	 *
-	 * @param string $key the key identifying the value to be cached
-	 * @param string $value the value to be cached
-	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
-	 * @return boolean true if the value is successfully stored into cache, false otherwise
-	 */
-	protected function addValue($key, $value, $expire)
-	{
-		return wincache_ucache_add($key, $value, $expire);
-	}
-
-	/**
-	 * Deletes a value with the specified key from cache
-	 * This is the implementation of the method declared in the parent class.
-	 * @param string $key the key of the value to be deleted
-	 * @return boolean if no error happens during deletion
-	 */
-	protected function deleteValue($key)
-	{
-		return wincache_ucache_delete($key);
-	}
-
-	/**
-	 * Deletes all values from cache.
-	 * This is the implementation of the method declared in the parent class.
-	 * @return boolean whether the flush operation was successful.
-	 */
-	protected function flushValues()
-	{
-		return wincache_ucache_clear();
-	}
-}
diff --git a/framework/caching/XCache.php b/framework/caching/XCache.php
deleted file mode 100644
index 2108c4f..0000000
--- a/framework/caching/XCache.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\caching;
-
-/**
- * XCache provides XCache caching in terms of an application component.
- *
- * To use this application component, the [XCache PHP extension](http://xcache.lighttpd.net/) must be loaded.
- * Also note that the [[flush()]] functionality will work correctly only if "xcache.admin.enable_auth"
- * is set to "Off" in php.ini.
- *
- * See [[Cache]] for common cache operations that XCache supports.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class XCache extends Cache
-{
-	/**
-	 * Retrieves a value from cache with a specified key.
-	 * This is the implementation of the method declared in the parent class.
-	 * @param string $key a unique key identifying the cached value
-	 * @return string the value stored in cache, false if the value is not in the cache or expired.
-	 */
-	protected function getValue($key)
-	{
-		return xcache_isset($key) ? xcache_get($key) : false;
-	}
-
-	/**
-	 * Stores a value identified by a key in cache.
-	 * This is the implementation of the method declared in the parent class.
-	 *
-	 * @param string $key the key identifying the value to be cached
-	 * @param string $value the value to be cached
-	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
-	 * @return boolean true if the value is successfully stored into cache, false otherwise
-	 */
-	protected function setValue($key, $value, $expire)
-	{
-		return xcache_set($key, $value, $expire);
-	}
-
-	/**
-	 * Stores a value identified by a key into cache if the cache does not contain this key.
-	 * This is the implementation of the method declared in the parent class.
-	 *
-	 * @param string $key the key identifying the value to be cached
-	 * @param string $value the value to be cached
-	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
-	 * @return boolean true if the value is successfully stored into cache, false otherwise
-	 */
-	protected function addValue($key, $value, $expire)
-	{
-		return !xcache_isset($key) ? $this->setValue($key, $value, $expire) : false;
-	}
-
-	/**
-	 * Deletes a value with the specified key from cache
-	 * This is the implementation of the method declared in the parent class.
-	 * @param string $key the key of the value to be deleted
-	 * @return boolean if no error happens during deletion
-	 */
-	protected function deleteValue($key)
-	{
-		return xcache_unset($key);
-	}
-
-	/**
-	 * Deletes all values from cache.
-	 * This is the implementation of the method declared in the parent class.
-	 * @return boolean whether the flush operation was successful.
-	 */
-	protected function flushValues()
-	{
-		for ($i = 0, $max = xcache_count(XC_TYPE_VAR); $i < $max; $i++) {
-			if (xcache_clear_cache(XC_TYPE_VAR, $i) === false) {
-				return false;
-			}
-		}
-		return true;
-	}
-}
-
diff --git a/framework/caching/ZendDataCache.php b/framework/caching/ZendDataCache.php
deleted file mode 100644
index 5b41a8d..0000000
--- a/framework/caching/ZendDataCache.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\caching;
-
-/**
- * ZendDataCache provides Zend data caching in terms of an application component.
- *
- * To use this application component, the [Zend Data Cache PHP extension](http://www.zend.com/en/products/server/)
- * must be loaded.
- *
- * See [[Cache]] for common cache operations that ZendDataCache supports.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class ZendDataCache extends Cache
-{
-	/**
-	 * Retrieves a value from cache with a specified key.
-	 * This is the implementation of the method declared in the parent class.
-	 * @param string $key a unique key identifying the cached value
-	 * @return string the value stored in cache, false if the value is not in the cache or expired.
-	 */
-	protected function getValue($key)
-	{
-		$result = zend_shm_cache_fetch($key);
-		return $result === null ? false : $result;
-	}
-
-	/**
-	 * Stores a value identified by a key in cache.
-	 * This is the implementation of the method declared in the parent class.
-	 *
-	 * @param string $key the key identifying the value to be cached
-	 * @param string $value the value to be cached
-	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
-	 * @return boolean true if the value is successfully stored into cache, false otherwise
-	 */
-	protected function setValue($key, $value, $expire)
-	{
-		return zend_shm_cache_store($key, $value, $expire);
-	}
-
-	/**
-	 * Stores a value identified by a key into cache if the cache does not contain this key.
-	 * This is the implementation of the method declared in the parent class.
-	 *
-	 * @param string $key the key identifying the value to be cached
-	 * @param string $value the value to be cached
-	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
-	 * @return boolean true if the value is successfully stored into cache, false otherwise
-	 */
-	protected function addValue($key, $value, $expire)
-	{
-		return zend_shm_cache_fetch($key) === null ? $this->setValue($key, $value, $expire) : false;
-	}
-
-	/**
-	 * Deletes a value with the specified key from cache
-	 * This is the implementation of the method declared in the parent class.
-	 * @param string $key the key of the value to be deleted
-	 * @return boolean if no error happens during deletion
-	 */
-	protected function deleteValue($key)
-	{
-		return zend_shm_cache_delete($key);
-	}
-
-	/**
-	 * Deletes all values from cache.
-	 * This is the implementation of the method declared in the parent class.
-	 * @return boolean whether the flush operation was successful.
-	 */
-	protected function flushValues()
-	{
-		return zend_shm_cache_clear();
-	}
-}
diff --git a/framework/console/Application.php b/framework/console/Application.php
deleted file mode 100644
index 2f28cac..0000000
--- a/framework/console/Application.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-/**
- * Console Application class file.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\console;
-
-use yii\base\InvalidRouteException;
-
-/**
- * Application represents a console application.
- *
- * Application extends from [[yii\base\Application]] by providing functionalities that are
- * specific to console requests. In particular, it deals with console requests
- * through a command-based approach:
- *
- * - A console application consists of one or several possible user commands;
- * - Each user command is implemented as a class extending [[\yii\console\Controller]];
- * - User specifies which command to run on the command line;
- * - The command processes the user request with the specified parameters.
- *
- * The command classes reside in the directory specified by [[controllerPath]].
- * Their naming should follow the same naming convention as controllers. For example, the `help` command
- * is implemented using the `HelpController` class.
- *
- * To run the console application, enter the following on the command line:
- *
- * ~~~
- * yiic <route> [--param1=value1 --param2 ...]
- * ~~~
- *
- * where `<route>` refers to a controller route in the form of `ModuleID/ControllerID/ActionID`
- * (e.g. `sitemap/create`), and `param1`, `param2` refers to a set of named parameters that
- * will be used to initialize the controller action (e.g. `--since=0` specifies a `since` parameter
- * whose value is 0 and a corresponding `$since` parameter is passed to the action method).
- *
- * A `help` command is provided by default, which lists available commands and shows their usage.
- * To use this command, simply type:
- *
- * ~~~
- * yiic help
- * ~~~
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Application extends \yii\base\Application
-{
-	/**
-	 * @var string the default route of this application. Defaults to 'help',
-	 * meaning the `help` command.
-	 */
-	public $defaultRoute = 'help';
-	/**
-	 * @var boolean whether to enable the commands provided by the core framework.
-	 * Defaults to true.
-	 */
-	public $enableCoreCommands = true;
-
-	/**
-	 * Initialize the application.
-	 */
-	public function init()
-	{
-		parent::init();
-		if ($this->enableCoreCommands) {
-			foreach ($this->coreCommands() as $id => $command) {
-				if (!isset($this->controllerMap[$id])) {
-					$this->controllerMap[$id] = $command;
-				}
-			}
-		}
-		// ensure we have the 'help' command so that we can list the available commands
-		if (!isset($this->controllerMap['help'])) {
-			$this->controllerMap['help'] = 'yii\console\controllers\HelpController';
-		}
-	}
-
-	/**
-	 * Processes the request.
-	 * The request is represented in terms of a controller route and action parameters.
-	 * @return integer the exit status of the controller action (0 means normal, non-zero values mean abnormal)
-	 * @throws Exception if the script is not running from the command line
-	 */
-	public function processRequest()
-	{
-		/** @var $request Request */
-		$request = $this->getRequest();
-		if ($request->getIsConsoleRequest()) {
-			list ($route, $params) = $request->resolve();
-			return $this->runAction($route, $params);
-		} else {
-			throw new Exception(\Yii::t('yii|This script must be run from the command line.'));
-		}
-	}
-
-	/**
-	 * Runs a controller action specified by a route.
-	 * This method parses the specified route and creates the corresponding child module(s), controller and action
-	 * instances. It then calls [[Controller::runAction()]] to run the action with the given parameters.
-	 * If the route is empty, the method will use [[defaultRoute]].
-	 * @param string $route the route that specifies the action.
-	 * @param array $params the parameters to be passed to the action
-	 * @return integer the status code returned by the action execution. 0 means normal, and other values mean abnormal.
-	 * @throws Exception if the route is invalid
-	 */
-	public function runAction($route, $params = array())
-	{
-		try {
-			return parent::runAction($route, $params);
-		} catch (InvalidRouteException $e) {
-			throw new Exception(\Yii::t('yii|Unknown command "{command}".', array('{command}' => $route)));
-		}
-	}
-
-	/**
-	 * Returns the configuration of the built-in commands.
-	 * @return array the configuration of the built-in commands.
-	 */
-	public function coreCommands()
-	{
-		return array(
-			'message' => 'yii\console\controllers\MessageController',
-			'help' => 'yii\console\controllers\HelpController',
-			'migrate' => 'yii\console\controllers\MigrateController',
-			'app' => 'yii\console\controllers\AppController',
-			'cache' => 'yii\console\controllers\CacheController',
-			'asset' => 'yii\console\controllers\AssetController',
-		);
-	}
-
-	/**
-	 * Registers the core application components.
-	 * @see setComponents
-	 */
-	public function registerCoreComponents()
-	{
-		parent::registerCoreComponents();
-		$this->setComponents(array(
-			'request' => array(
-				'class' => 'yii\console\Request',
-			),
-			'response' => array(
-				'class' => 'yii\console\Response',
-			),
-		));
-	}
-}
diff --git a/framework/console/Controller.php b/framework/console/Controller.php
deleted file mode 100644
index c07d92d..0000000
--- a/framework/console/Controller.php
+++ /dev/null
@@ -1,264 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\console;
-
-use Yii;
-use yii\base\Action;
-use yii\base\InlineAction;
-use yii\base\InvalidRouteException;
-use yii\helpers\Console;
-
-/**
- * Controller is the base class of console command classes.
- *
- * A controller consists of one or several actions known as sub-commands.
- * Users call a console command by specifying the corresponding route which identifies a controller action.
- * The `yiic` program is used when calling a console command, like the following:
- *
- * ~~~
- * yiic <route> [--param1=value1 --param2 ...]
- * ~~~
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Controller extends \yii\base\Controller
-{
-	/**
-	 * @var boolean whether the call of [[confirm()]] requires a user input.
-	 * If false, [[confirm()]] will always return true no matter what user enters or not.
-	 */
-	public $interactive = true;
-
-	/**
-	 * @var bool whether to enable ANSI style in output.
-	 * Setting this will affect [[ansiFormat()]], [[stdout()]] and [[stderr()]].
-	 * If not set it will be auto detected using [[yii\helpers\Console::streamSupportsAnsiColors()]] with STDOUT
-	 * for [[ansiFormat()]] and [[stdout()]] and STDERR for [[stderr()]].
-	 */
-	public $colors;
-
-	/**
-	 * Runs an action with the specified action ID and parameters.
-	 * If the action ID is empty, the method will use [[defaultAction]].
-	 * @param string $id the ID of the action to be executed.
-	 * @param array $params the parameters (name-value pairs) to be passed to the action.
-	 * @return integer the status of the action execution. 0 means normal, other values mean abnormal.
-	 * @throws InvalidRouteException if the requested action ID cannot be resolved into an action successfully.
-	 * @see createAction
-	 */
-	public function runAction($id, $params = array())
-	{
-		if (!empty($params)) {
-			$options = $this->globalOptions();
-			foreach ($params as $name => $value) {
-				if (in_array($name, $options, true)) {
-					$this->$name = $value;
-					unset($params[$name]);
-				}
-			}
-		}
-		return parent::runAction($id, $params);
-	}
-
-	/**
-	 * Binds the parameters to the action.
-	 * This method is invoked by [[Action]] when it begins to run with the given parameters.
-	 * This method will first bind the parameters with the [[globalOptions()|global options]]
-	 * available to the action. It then validates the given arguments.
-	 * @param Action $action the action to be bound with parameters
-	 * @param array $params the parameters to be bound to the action
-	 * @return array the valid parameters that the action can run with.
-	 * @throws Exception if there are unknown options or missing arguments
-	 */
-	public function bindActionParams($action, $params)
-	{
-		if (!empty($params)) {
-			$options = $this->globalOptions();
-			foreach ($params as $name => $value) {
-				if (in_array($name, $options, true)) {
-					$this->$name = $value;
-					unset($params[$name]);
-				}
-			}
-		}
-
-		$args = isset($params[Request::ANONYMOUS_PARAMS]) ? $params[Request::ANONYMOUS_PARAMS] : array();
-		unset($params[Request::ANONYMOUS_PARAMS]);
-		if (!empty($params)) {
-			throw new Exception(Yii::t('yii|Unknown options: {params}', array(
-				'{params}' => implode(', ', array_keys($params)),
-			)));
-		}
-
-		if ($action instanceof InlineAction) {
-			$method = new \ReflectionMethod($this, $action->actionMethod);
-		} else {
-			$method = new \ReflectionMethod($action, 'run');
-		}
-
-		$missing = array();
-		foreach ($method->getParameters() as $i => $param) {
-			$name = $param->getName();
-			if (!isset($args[$i])) {
-				if ($param->isDefaultValueAvailable()) {
-					$args[$i] = $param->getDefaultValue();
-				} else {
-					$missing[] = $name;
-				}
-			}
-		}
-
-		if (!empty($missing)) {
-			throw new Exception(Yii::t('yii|Missing required arguments: {params}', array(
-				'{params}' => implode(', ', $missing),
-			)));
-		}
-
-		return $args;
-	}
-
-	/**
-	 * Formats a string with ANSI codes
-	 *
-	 * You may pass additional parameters using the constants defined in [[yii\helpers\base\Console]].
-	 *
-	 * Example:
-	 * ~~~
-	 * $this->ansiFormat('This will be red and underlined.', Console::FG_RED, Console::UNDERLINE);
-	 * ~~~
-	 *
-	 * @param string $string the string to be formatted
-	 * @return string
-	 */
-	public function ansiFormat($string)
-	{
-		if ($this->ansi === true || $this->ansi === null && Console::streamSupportsAnsiColors(STDOUT)) {
-			$args = func_get_args();
-			array_shift($args);
-			$string = Console::ansiFormat($string, $args);
-		}
-		return $string;
-	}
-
-	/**
-	 * Prints a string to STDOUT
-	 *
-	 * You may optionally format the string with ANSI codes by
-	 * passing additional parameters using the constants defined in [[yii\helpers\base\Console]].
-	 *
-	 * Example:
-	 * ~~~
-	 * $this->stdout('This will be red and underlined.', Console::FG_RED, Console::UNDERLINE);
-	 * ~~~
-	 *
-	 * @param string $string the string to print
-	 * @return int|boolean Number of bytes printed or false on error
-	 */
-	public function stdout($string)
-	{
-		if ($this->ansi === true || $this->ansi === null && Console::streamSupportsAnsiColors(STDOUT)) {
-			$args = func_get_args();
-			array_shift($args);
-			$string = Console::ansiFormat($string, $args);
-		}
-		return Console::stdout($string);
-	}
-
-	/**
-	 * Prints a string to STDERR
-	 *
-	 * You may optionally format the string with ANSI codes by
-	 * passing additional parameters using the constants defined in [[yii\helpers\base\Console]].
-	 *
-	 * Example:
-	 * ~~~
-	 * $this->stderr('This will be red and underlined.', Console::FG_RED, Console::UNDERLINE);
-	 * ~~~
-	 *
-	 * @param string $string the string to print
-	 * @return int|boolean Number of bytes printed or false on error
-	 */
-	public function stderr($string)
-	{
-		if ($this->ansi === true || $this->ansi === null && Console::streamSupportsAnsiColors(STDERR)) {
-			$args = func_get_args();
-			array_shift($args);
-			$string = Console::ansiFormat($string, $args);
-		}
-		return fwrite(STDERR, $string);
-	}
-
-	/**
-	 * Prompts the user for input and validates it
-	 *
-	 * @param string $text prompt string
-	 * @param array $options the options to validate the input:
-	 *  - required: whether it is required or not
-	 *  - default: default value if no input is inserted by the user
-	 *  - pattern: regular expression pattern to validate user input
-	 *  - validator: a callable function to validate input. The function must accept two parameters:
-	 *      - $input: the user input to validate
-	 *      - $error: the error value passed by reference if validation failed.
-	 * @return string the user input
-	 */
-	public function prompt($text, $options = array())
-	{
-		if ($this->interactive) {
-			return Console::prompt($text, $options);
-		} else {
-			return isset($options['default']) ? $options['default'] : '';
-		}
-	}
-
-	/**
-	 * Asks user to confirm by typing y or n.
-	 *
-	 * @param string $message to echo out before waiting for user input
-	 * @param boolean $default this value is returned if no selection is made.
-	 * @return boolean whether user confirmed
-	 */
-	public function confirm($message, $default = false)
-	{
-		if ($this->interactive) {
-			return Console::confirm($message, $default);
-		} else {
-			return true;
-		}
-	}
-
-	/**
-	 * Gives the user an option to choose from. Giving '?' as an input will show
-	 * a list of options to choose from and their explanations.
-	 *
-	 * @param string $prompt the prompt message
-	 * @param array  $options Key-value array of options to choose from
-	 *
-	 * @return string An option character the user chose
-	 */
-	public function select($prompt, $options = array())
-	{
-		return Console::select($prompt, $options);
-	}
-
-	/**
-	 * Returns the names of the global options for this command.
-	 * A global option requires the existence of a public member variable whose
-	 * name is the option name.
-	 * Child classes may override this method to specify possible global options.
-	 *
-	 * Note that the values setting via global options are not available
-	 * until [[beforeAction()]] is being called.
-	 *
-	 * @return array the names of the global options for this command.
-	 */
-	public function globalOptions()
-	{
-		return array();
-	}
-}
diff --git a/framework/console/Exception.php b/framework/console/Exception.php
deleted file mode 100644
index cb10c19..0000000
--- a/framework/console/Exception.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\console;
-
-use yii\base\UserException;
-
-/**
- * Exception represents an exception caused by incorrect usage of a console command.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Exception extends UserException
-{
-	/**
-	 * @return string the user-friendly name of this exception
-	 */
-	public function getName()
-	{
-		return \Yii::t('yii|Error');
-	}
-}
-
diff --git a/framework/console/Request.php b/framework/console/Request.php
deleted file mode 100644
index ed477e9..0000000
--- a/framework/console/Request.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\console;
-
-/**
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Request extends \yii\base\Request
-{
-	const ANONYMOUS_PARAMS = '-args';
-
-	public function getRawParams()
-	{
-		return isset($_SERVER['argv']) ? $_SERVER['argv'] : array();
-	}
-
-	/**
-	 * Resolves the current request into a route and the associated parameters.
-	 * @return array the first element is the route, and the second is the associated parameters.
-	 */
-	public function resolve()
-	{
-		$rawParams = $this->getRawParams();
-		array_shift($rawParams);  // the 1st argument is the yiic script name
-
-		if (isset($rawParams[0])) {
-			$route = $rawParams[0];
-			array_shift($rawParams);
-		} else {
-			$route = '';
-		}
-
-		$params = array(self::ANONYMOUS_PARAMS => array());
-		foreach ($rawParams as $param) {
-			if (preg_match('/^--(\w+)(=(.*))?$/', $param, $matches)) {
-				$name = $matches[1];
-				$params[$name] = isset($matches[3]) ? $matches[3] : true;
-			} else {
-				$params[self::ANONYMOUS_PARAMS][] = $param;
-			}
-		}
-
-		return array($route, $params);
-	}
-}
diff --git a/framework/console/controllers/AppController.php b/framework/console/controllers/AppController.php
deleted file mode 100644
index 17f7420..0000000
--- a/framework/console/controllers/AppController.php
+++ /dev/null
@@ -1,324 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\console\controllers;
-
-use yii\console\Controller;
-use yii\helpers\FileHelper;
-use yii\base\Exception;
-
-/**
- * This command creates an Yii Web application at the specified location.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @author Alexander Makarov <sam@rmcreative.ru>
- * @since 2.0
- */
-class AppController extends Controller
-{
-	private $_rootPath;
-	private $_config;
-
-	/**
-	 * @var string custom template path. If specified, templates will be
-	 * searched there additionally to `framework/console/webapp`.
-	 */
-	public $templatesPath;
-
-	/**
-	 * @var string application type. If not specified default application
-	 * skeleton will be used.
-	 */
-	public $type = 'default';
-
-	public function init()
-	{
-		parent::init();
-
-		if($this->templatesPath && !is_dir($this->templatesPath)) {
-			throw new Exception('--templatesPath "'.$this->templatesPath.'" does not exist or can not be read.');
-		}
-	}
-
-	public function globalOptions()
-	{
-		return array('templatesPath', 'type');
-	}
-
-	public function actionIndex()
-	{
-		$this->forward('help/index', array('-args' => array('app/create')));
-	}
-
-	/**
-	 * Generates Yii application at the path specified via appPath parameter.
-	 *
-	 * @param string $path the directory where the new application will be created.
-	 * If the directory does not exist, it will be created. After the application
-	 * is created, please make sure the directory has enough permissions.
-	 *
-	 * @throws \yii\base\Exception if path specified is not valid
-	 * @return integer the exit status
-	 */
-	public function actionCreate($path)
-	{
-		$path = strtr($path, '/\\', DIRECTORY_SEPARATOR);
-		if(strpos($path, DIRECTORY_SEPARATOR) === false) {
-			$path = '.'.DIRECTORY_SEPARATOR.$path;
-		}
-		$dir = rtrim(realpath(dirname($path)), '\\/');
-		if($dir === false || !is_dir($dir)) {
-			throw new Exception("The directory '$path' is not valid. Please make sure the parent directory exists.");
-		}
-
-		if(basename($path) === '.') {
-			$this->_rootPath = $path = $dir;
-		}
-		else {
-			$this->_rootPath = $path = $dir.DIRECTORY_SEPARATOR.basename($path);
-		}
-
-		if($this->confirm("Create \"$this->type\" application under '$path'?")) {
-			$sourceDir = $this->getSourceDir();
-			$config = $this->getConfig();
-
-			$list = $this->buildFileList($sourceDir, $path);
-
-			if(is_array($config)) {
-				foreach($config as $file => $settings) {
-					if(isset($settings['handler'])) {
-						$list[$file]['callback'] = $settings['handler'];
-					}
-				}
-			}
-
-			$this->copyFiles($list);
-
-			if(is_array($config)) {
-				foreach($config as $file => $settings) {
-					if(isset($settings['permissions'])) {
-						@chmod($path.'/'.$file, $settings['permissions']);
-					}
-				}
-			}
-
-			echo "\nYour application has been created successfully under {$path}.\n";
-		}
-	}
-
-	/**
-	 * @throws \yii\base\Exception if source directory wasn't located
-	 * @return string
-	 */
-	protected function getSourceDir()
-	{
-		$customSource = realpath($this->templatesPath.'/'.$this->type);
-		$defaultSource = realpath($this->getDefaultTemplatesPath().'/'.$this->type);
-
-		if($customSource) {
-			return $customSource;
-		}
-		elseif($defaultSource) {
-			return $defaultSource;
-		}
-		else {
-			throw new Exception('Unable to locate the source directory for "'.$this->type.'".');
-		}
-	}
-
-	/**
-	 * @return string default templates path
-	 */
-	protected function getDefaultTemplatesPath()
-	{
-		return realpath(__DIR__.'/../webapp');
-	}
-
-	/**
-	 * @return array|null template configuration
-	 */
-	protected function getConfig()
-	{
-		if($this->_config===null) {
-			$this->_config = require $this->getDefaultTemplatesPath().'/config.php';
-			if($this->templatesPath && file_exists($this->templatesPath)) {
-				$this->_config = array_merge($this->_config, require $this->templatesPath.'/config.php');
-			}
-		}
-		if(isset($this->_config[$this->type])) {
-			return $this->_config[$this->type];
-		}
-	}
-
-	/**
-	 * @param string $source path to source file
-	 * @param string $pathTo path to file we want to get relative path for
-	 * @param string $varName variable name w/o $ to replace value with relative path for
-	 *
-	 * @return string target file contents
-	 */
-	public function replaceRelativePath($source, $pathTo, $varName)
-	{
-		$content = file_get_contents($source);
-		$relativeFile = str_replace($this->getSourceDir(), '', $source);
-
-		$relativePath = $this->getRelativePath($pathTo, $this->_rootPath.$relativeFile);
-		$relativePath = str_replace('\\', '\\\\', $relativePath);
-
-		return preg_replace('/\$'.$varName.'\s*=(.*?);/', "\$".$varName."=$relativePath;", $content);
-	}
-
-	/**
-	 * @param string $path1 absolute path
-	 * @param string $path2 absolute path
-	 *
-	 * @return string relative path
-	 */
-	protected function getRelativePath($path1, $path2)
-	{
-		$segs1 = explode(DIRECTORY_SEPARATOR, $path1);
-		$segs2 = explode(DIRECTORY_SEPARATOR, $path2);
-		$n1 = count($segs1);
-		$n2 = count($segs2);
-
-		for($i=0; $i<$n1 && $i<$n2; ++$i) {
-			if($segs1[$i] !== $segs2[$i]) {
-				break;
-			}
-		}
-
-		if($i===0) {
-			return "'".$path1."'";
-		}
-		$up='';
-		for($j=$i;$j<$n2-1;++$j) {
-			$up.='/..';
-		}
-		for(; $i<$n1-1; ++$i) {
-			$up.='/'.$segs1[$i];
-		}
-
-		return '__DIR__.\''.$up.'/'.basename($path1).'\'';
-	}
-
-
-	/**
-	 * Copies a list of files from one place to another.
-	 * @param array $fileList the list of files to be copied (name=>spec).
-	 * The array keys are names displayed during the copy process, and array values are specifications
-	 * for files to be copied. Each array value must be an array of the following structure:
-	 * <ul>
-	 * <li>source: required, the full path of the file/directory to be copied from</li>
-	 * <li>target: required, the full path of the file/directory to be copied to</li>
-	 * <li>callback: optional, the callback to be invoked when copying a file. The callback function
-	 *   should be declared as follows:
-	 *   <pre>
-	 *   function foo($source,$params)
-	 *   </pre>
-	 *   where $source parameter is the source file path, and the content returned
-	 *   by the function will be saved into the target file.</li>
-	 * <li>params: optional, the parameters to be passed to the callback</li>
-	 * </ul>
-	 * @see buildFileList
-	 */
-	protected function copyFiles($fileList)
-	{
-		$overwriteAll = false;
-		foreach($fileList as $name=>$file) {
-			$source = strtr($file['source'], '/\\', DIRECTORY_SEPARATOR);
-			$target = strtr($file['target'], '/\\', DIRECTORY_SEPARATOR);
-			$callback = isset($file['callback']) ? $file['callback'] : null;
-			$params = isset($file['params']) ? $file['params'] : null;
-
-			if(is_dir($source)) {
-				if (!is_dir($target)) {
-					mkdir($target, 0777, true);
-				}
-				continue;
-			}
-
-			if($callback !== null) {
-				$content = call_user_func($callback, $source, $params);
-			}
-			else {
-				$content = file_get_contents($source);
-			}
-			if(is_file($target)) {
-				if($content === file_get_contents($target)) {
-					echo "  unchanged $name\n";
-					continue;
-				}
-				if($overwriteAll) {
-					echo "  overwrite $name\n";
-				}
-				else {
-					echo "      exist $name\n";
-					echo "            ...overwrite? [Yes|No|All|Quit] ";
-					$answer = trim(fgets(STDIN));
-					if(!strncasecmp($answer, 'q', 1)) {
-						return;
-					}
-					elseif(!strncasecmp($answer, 'y', 1)) {
-						echo "  overwrite $name\n";
-					}
-					elseif(!strncasecmp($answer, 'a', 1)) {
-						echo "  overwrite $name\n";
-						$overwriteAll = true;
-					}
-					else {
-						echo "       skip $name\n";
-						continue;
-					}
-				}
-			}
-			else {
-				if (!is_dir(dirname($target))) {
-					mkdir(dirname($target), 0777, true);
-				}
-				echo "   generate $name\n";
-			}
-			file_put_contents($target, $content);
-		}
-	}
-
-	/**
-	 * Builds the file list of a directory.
-	 * This method traverses through the specified directory and builds
-	 * a list of files and subdirectories that the directory contains.
-	 * The result of this function can be passed to {@link copyFiles}.
-	 * @param string $sourceDir the source directory
-	 * @param string $targetDir the target directory
-	 * @param string $baseDir base directory
-	 * @param array $ignoreFiles list of the names of files that should
-	 * be ignored in list building process.
-	 * @param array $renameMap hash array of file names that should be
-	 * renamed. Example value: array('1.old.txt'=>'2.new.txt').
-	 * @return array the file list (see {@link copyFiles})
-	 */
-	protected function buildFileList($sourceDir, $targetDir, $baseDir='', $ignoreFiles=array(), $renameMap=array())
-	{
-		$list = array();
-		$handle = opendir($sourceDir);
-		while(($file = readdir($handle)) !== false) {
-			if(in_array($file, array('.', '..', '.svn', '.gitignore', '.hgignore')) || in_array($file, $ignoreFiles)) {
-				continue;
-			}
-			$sourcePath = $sourceDir.DIRECTORY_SEPARATOR.$file;
-			$targetPath = $targetDir.DIRECTORY_SEPARATOR.strtr($file, $renameMap);
-			$name = $baseDir === '' ? $file : $baseDir.'/'.$file;
-			$list[$name] = array(
-				'source' => $sourcePath,
-				'target' => $targetPath,
-			);
-			if(is_dir($sourcePath)) {
-				$list = array_merge($list, self::buildFileList($sourcePath, $targetPath, $name, $ignoreFiles, $renameMap));
-			}
-		}
-		closedir($handle);
-		return $list;
-	}
-}
diff --git a/framework/console/controllers/AssetController.php b/framework/console/controllers/AssetController.php
deleted file mode 100644
index aab489b..0000000
--- a/framework/console/controllers/AssetController.php
+++ /dev/null
@@ -1,353 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\console\controllers;
-
-use Yii;
-use yii\console\Exception;
-use yii\console\Controller;
-
-/**
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class AssetController extends Controller
-{
-	public $defaultAction = 'compress';
-
-	public $bundles = array();
-	public $extensions = array();
-	/**
-	 * @var array
-	 * ~~~
-	 * 'all' => array(
-	 *     'css' => 'all.css',
-	 *     'js' => 'js.css',
-	 *     'depends' => array( ... ),
-	 * )
-	 * ~~~
-	 */
-	public $targets = array();
-	public $assetManager = array();
-	public $jsCompressor = 'java -jar compiler.jar --js {from} --js_output_file {to}';
-	public $cssCompressor = 'java -jar yuicompressor.jar {from} -o {to}';
-
-	public function actionCompress($configFile, $bundleFile)
-	{
-		$this->loadConfiguration($configFile);
-		$bundles = $this->loadBundles($this->bundles, $this->extensions);
-		$targets = $this->loadTargets($this->targets, $bundles);
-		$this->publishBundles($bundles, $this->publishOptions);
-		$timestamp = time();
-		foreach ($targets as $target) {
-			if (!empty($target->js)) {
-				$this->buildTarget($target, 'js', $bundles, $timestamp);
-			}
-			if (!empty($target->css)) {
-				$this->buildTarget($target, 'css', $bundles, $timestamp);
-			}
-		}
-
-		$targets = $this->adjustDependency($targets, $bundles);
-		$this->saveTargets($targets, $bundleFile);
-	}
-
-	protected function loadConfiguration($configFile)
-	{
-		foreach (require($configFile) as $name => $value) {
-			if (property_exists($this, $name)) {
-				$this->$name = $value;
-			} else {
-				throw new Exception("Unknown configuration option: $name");
-			}
-		}
-
-		if (!isset($this->assetManager['basePath'])) {
-			throw new Exception("Please specify 'basePath' for the 'assetManager' option.");
-		}
-		if (!isset($this->assetManager['baseUrl'])) {
-			throw new Exception("Please specify 'baseUrl' for the 'assetManager' option.");
-		}
-	}
-
-	protected function loadBundles($bundles, $extensions)
-	{
-		$result = array();
-		foreach ($bundles as $name => $bundle) {
-			$bundle['class'] = 'yii\\web\\AssetBundle';
-			$result[$name] = Yii::createObject($bundle);
-		}
-		foreach ($extensions as $path) {
-			$manifest = $path . '/assets.php';
-			if (!is_file($manifest)) {
-				continue;
-			}
-			foreach (require($manifest) as $name => $bundle) {
-				if (!isset($result[$name])) {
-					$bundle['class'] = 'yii\\web\\AssetBundle';
-					$result[$name] = Yii::createObject($bundle);
-				}
-			}
-		}
-		return $result;
-	}
-
-	protected function loadTargets($targets, $bundles)
-	{
-		// build the dependency order of bundles
-		$registered = array();
-		foreach ($bundles as $name => $bundle) {
-			$this->registerBundle($bundles, $name, $registered);
-		}
-		$bundleOrders = array_combine(array_keys($registered), range(0, count($bundles) - 1));
-
-		// fill up the target which has empty 'depends'.
-		$referenced = array();
-		foreach ($targets as $name => $target) {
-			if (empty($target['depends'])) {
-				if (!isset($all)) {
-					$all = $name;
-				} else {
-					throw new Exception("Only one target can have empty 'depends' option. Found two now: $all, $name");
-				}
-			} else {
-				foreach ($target['depends'] as $bundle) {
-					if (!isset($referenced[$bundle])) {
-						$referenced[$bundle] = $name;
-					} else {
-						throw new Exception("Target '{$referenced[$bundle]}' and '$name' cannot contain the bundle '$bundle' at the same time.");
-					}
-				}
-			}
-		}
-		if (isset($all)) {
-			$targets[$all]['depends'] = array_diff(array_keys($registered), array_keys($referenced));
-		}
-
-		// adjust the 'depends' order for each target according to the dependency order of bundles
-		// create an AssetBundle object for each target
-		foreach ($targets as $name => $target) {
-			if (!isset($target['basePath'])) {
-				throw new Exception("Please specify 'basePath' for the '$name' target.");
-			}
-			if (!isset($target['baseUrl'])) {
-				throw new Exception("Please specify 'baseUrl' for the '$name' target.");
-			}
-			usort($target['depends'], function ($a, $b) use ($bundleOrders) {
-				if ($bundleOrders[$a] == $bundleOrders[$b]) {
-					return 0;
-				} else {
-					return $bundleOrders[$a] > $bundleOrders[$b] ? 1 : -1;
-				}
-			});
-			$target['class'] = 'yii\\web\\AssetBundle';
-			$targets[$name] = Yii::createObject($target);
-		}
-		return $targets;
-	}
-
-	/**
-	 * @param \yii\web\AssetBundle[] $bundles
-	 * @param array $options
-	 */
-	protected function publishBundles($bundles, $options)
-	{
-		if (!isset($options['class'])) {
-			$options['class'] = 'yii\\web\\AssetManager';
-		}
-		$am = Yii::createObject($options);
-		foreach ($bundles as $bundle) {
-			$bundle->publish($am);
-		}
-	}
-
-	/**
-	 * @param \yii\web\AssetBundle $target
-	 * @param string $type either "js" or "css"
-	 * @param \yii\web\AssetBundle[] $bundles
-	 * @param integer $timestamp
-	 * @throws Exception
-	 */
-	protected function buildTarget($target, $type, $bundles, $timestamp)
-	{
-		$outputFile = strtr($target->$type, array(
-			'{ts}' => $timestamp,
-		));
-		$inputFiles = array();
-
-		foreach ($target->depends as $name) {
-			if (isset($bundles[$name])) {
-				foreach ($bundles[$name]->$type as $file) {
-					$inputFiles[] = $bundles[$name]->basePath . '/' . $file;
-				}
-			} else {
-				throw new Exception("Unknown bundle: $name");
-			}
-		}
-		if ($type === 'js') {
-			$this->compressJsFiles($inputFiles, $target->basePath . '/' . $outputFile);
-		} else {
-			$this->compressCssFiles($inputFiles, $target->basePath . '/' . $outputFile);
-		}
-		$target->$type = array($outputFile);
-	}
-
-	protected function adjustDependency($targets, $bundles)
-	{
-		$map = array();
-		foreach ($targets as $name => $target) {
-			foreach ($target->depends as $bundle) {
-				$map[$bundle] = $name;
-			}
-		}
-
-		foreach ($targets as $name => $target) {
-			$depends = array();
-			foreach ($target->depends as $bn) {
-				foreach ($bundles[$bn]->depends as $bundle) {
-					$depends[$map[$bundle]] = true;
-				}
-			}
-			unset($depends[$name]);
-			$target->depends = array_keys($depends);
-		}
-
-		// detect possible circular dependencies
-		foreach ($targets as $name => $target) {
-			$registered = array();
-			$this->registerBundle($targets, $name, $registered);
-		}
-
-		foreach ($map as $bundle => $target) {
-			$targets[$bundle] = Yii::createObject(array(
-				'class' => 'yii\\web\\AssetBundle',
-				'depends' => array($target),
-			));
-		}
-		return $targets;
-	}
-
-	protected function registerBundle($bundles, $name, &$registered)
-	{
-		if (!isset($registered[$name])) {
-			$registered[$name] = false;
-			$bundle = $bundles[$name];
-			foreach ($bundle->depends as $depend) {
-				$this->registerBundle($bundles, $depend, $registered);
-			}
-			unset($registered[$name]);
-			$registered[$name] = true;
-		} elseif ($registered[$name] === false) {
-			throw new Exception("A circular dependency is detected for target '$name'.");
-		}
-	}
-
-	protected function saveTargets($targets, $bundleFile)
-	{
-		$array = array();
-		foreach ($targets as $name => $target) {
-			foreach (array('js', 'css', 'depends', 'basePath', 'baseUrl') as $prop) {
-				if (!empty($target->$prop)) {
-					$array[$name][$prop] = $target->$prop;
-				}
-			}
-		}
-		$array = var_export($array, true);
-		$version = date('Y-m-d H:i:s', time());
-		file_put_contents($bundleFile, <<<EOD
-<?php
-/**
- * This file is generated by the "yiic script" command.
- * DO NOT MODIFY THIS FILE DIRECTLY.
- * @version $version
- */
-return $array;
-EOD
-		);
-	}
-
-	protected function compressJsFiles($inputFiles, $outputFile)
-	{
-		if (is_string($this->jsCompressor)) {
-			$tmpFile = $outputFile . '.tmp';
-			$this->combineJsFiles($inputFiles, $tmpFile);
-			$log = shell_exec(strtr($this->jsCompressor, array(
-				'{from}' => $tmpFile,
-				'{to}' => $outputFile,
-			)));
-			@unlink($tmpFile);
-		} else {
-			$log = call_user_func($this->jsCompressor, $this, $inputFiles, $outputFile);
-		}
-	}
-
-	protected function compressCssFiles($inputFiles, $outputFile)
-	{
-		if (is_string($this->cssCompressor)) {
-			$tmpFile = $outputFile . '.tmp';
-			$this->combineCssFiles($inputFiles, $tmpFile);
-			$log = shell_exec(strtr($this->cssCompressor, array(
-				'{from}' => $inputFiles,
-				'{to}' => $outputFile,
-			)));
-		} else {
-			$log = call_user_func($this->cssCompressor, $this, $inputFiles, $outputFile);
-		}
-	}
-
-	public function combineJsFiles($files, $tmpFile)
-	{
-		$content = '';
-		foreach ($files as $file) {
-			$content .= "/*** BEGIN FILE: $file ***/\n"
-				. file_get_contents($file)
-				. "/*** END FILE: $file ***/\n";
-		}
-		file_put_contents($tmpFile, $content);
-	}
-
-	public function combineCssFiles($files, $tmpFile)
-	{
-		// todo: adjust url() references in CSS files
-		$content = '';
-		foreach ($files as $file) {
-			$content .= "/*** BEGIN FILE: $file ***/\n"
-				. file_get_contents($file)
-				. "/*** END FILE: $file ***/\n";
-		}
-		file_put_contents($tmpFile, $content);
-	}
-
-	public function actionTemplate($configFile)
-	{
-		$template = <<<EOD
-<?php
-
-return array(
-	//
-	'bundles' => require('path/to/bundles.php'),
-	//
-	'extensions' => require('path/to/namespaces.php'),
-	//
-	'targets' => array(
-		'all' => array(
-			'basePath' => __DIR__,
-			'baseUrl' => '/test',
-			'js' => 'all-{ts}.js',
-			'css' => 'all-{ts}.css',
-		),
-	),
-
-	'assetManager' => array(
-		'basePath' => __DIR__,
-		'baseUrl' => '/test',
-	),
-);
-EOD;
-		file_put_contents($configFile, $template);
-	}
-}
diff --git a/framework/console/controllers/CacheController.php b/framework/console/controllers/CacheController.php
deleted file mode 100644
index 6765f9b..0000000
--- a/framework/console/controllers/CacheController.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\console\controllers;
-
-use yii\console\Controller;
-use yii\console\Exception;
-use yii\caching\Cache;
-
-/**
- * This command allows you to flush cache.
- *
- * @author Alexander Makarov <sam@rmcreative.ru>
- * @since 2.0
- */
-class CacheController extends Controller
-{
-	public function actionIndex()
-	{
-		$this->forward('help/index', array('-args' => array('cache/flush')));
-	}
-
-	/**
-	 * Flushes cache.
-	 * @param string $component Name of the cache application component to use.
-	 *
-	 * @throws \yii\console\Exception
-	 */
-	public function actionFlush($component = 'cache')
-	{
-		/** @var $cache Cache */
-		$cache = \Yii::$app->getComponent($component);
-		if(!$cache || !$cache instanceof Cache) {
-			throw new Exception('Application component "'.$component.'" is not defined or not a cache.');
-		}
-
-		if(!$cache->flush()) {
-			throw new Exception('Unable to flush cache.');
-		}
-
-		echo "\nDone.\n";
-	}
-}
diff --git a/framework/console/controllers/HelpController.php b/framework/console/controllers/HelpController.php
deleted file mode 100644
index 6a66fd0..0000000
--- a/framework/console/controllers/HelpController.php
+++ /dev/null
@@ -1,421 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\console\controllers;
-
-use Yii;
-use yii\base\Application;
-use yii\base\InlineAction;
-use yii\console\Controller;
-use yii\console\Exception;
-use yii\console\Request;
-use yii\helpers\StringHelper;
-
-/**
- * This command provides help information about console commands.
- *
- * This command displays the available command list in
- * the application or the detailed instructions about using
- * a specific command.
- *
- * This command can be used as follows on command line:
- *
- * ~~~
- * yiic help [command name]
- * ~~~
- *
- * In the above, if the command name is not provided, all
- * available commands will be displayed.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class HelpController extends Controller
-{
-	/**
-	 * Displays available commands or the detailed information
-	 * about a particular command. For example,
-	 *
-	 * ~~~
-	 * yiic help          # list available commands
-	 * yiic help message  # display help info about "message"
-	 * ~~~
-	 *
-	 * @param string $command The name of the command to show help about.
-	 * If not provided, all available commands will be displayed.
-	 * @return integer the exit status
-	 * @throws Exception if the command for help is unknown
-	 */
-	public function actionIndex($command = null)
-	{
-		if ($command !== null) {
-			$result = Yii::$app->createController($command);
-			if ($result === false) {
-				throw new Exception(Yii::t('yii|No help for unknown command "{command}".', array(
-					'{command}' => $command,
-				)));
-			}
-
-			list($controller, $actionID) = $result;
-
-			$actions = $this->getActions($controller);
-			if ($actionID !== '' || count($actions) === 1 && $actions[0] === $controller->defaultAction) {
-				$this->getActionHelp($controller, $actionID);
-			} else {
-				$this->getControllerHelp($controller);
-			}
-		} else {
-			$this->getHelp();
-		}
-	}
-
-	/**
-	 * Returns all available command names.
-	 * @return array all available command names
-	 */
-	public function getCommands()
-	{
-		$commands = $this->getModuleCommands(Yii::$app);
-		sort($commands);
-		return array_unique($commands);
-	}
-
-	/**
-	 * Returns all available actions of the specified controller.
-	 * @param Controller $controller the controller instance
-	 * @return array all available action IDs.
-	 */
-	public function getActions($controller)
-	{
-		$actions = array_keys($controller->actions());
-		$class = new \ReflectionClass($controller);
-		foreach ($class->getMethods() as $method) {
-			$name = $method->getName();
-			if ($method->isPublic() && !$method->isStatic() && strpos($name, 'action') === 0 && $name !== 'actions') {
-				$actions[] = StringHelper::camel2id(substr($name, 6));
-			}
-		}
-		sort($actions);
-		return array_unique($actions);
-	}
-
-	/**
-	 * Returns available commands of a specified module.
-	 * @param \yii\base\Module $module the module instance
-	 * @return array the available command names
-	 */
-	protected function getModuleCommands($module)
-	{
-		$prefix = $module instanceof Application ? '' : $module->getUniqueID() . '/';
-
-		$commands = array();
-		foreach (array_keys($module->controllerMap) as $id) {
-			$commands[] = $prefix . $id;
-		}
-
-		foreach ($module->getModules() as $id => $child) {
-			if (($child = $module->getModule($id)) === null) {
-				continue;
-			}
-			foreach ($this->getModuleCommands($child) as $command) {
-				$commands[] = $prefix . $id . '/' . $command;
-			}
-		}
-
-		$files = scandir($module->getControllerPath());
-		foreach ($files as $file) {
-			if (strcmp(substr($file, -14), 'Controller.php') === 0) {
-				$commands[] = $prefix . lcfirst(substr(basename($file), 0, -14));
-			}
-		}
-
-		return $commands;
-	}
-
-	/**
-	 * Displays all available commands.
-	 */
-	protected function getHelp()
-	{
-		$commands = $this->getCommands();
-		if (!empty($commands)) {
-			echo "The following commands are available:\n\n";
-			foreach ($commands as $command) {
-				echo "* $command\n";
-			}
-			echo "\nTo see the help of each command, enter:\n";
-			echo "\n  yiic help <command-name>\n\n";
-		} else {
-			echo "\nNo commands are found.\n";
-		}
-	}
-
-	/**
-	 * Displays the overall information of the command.
-	 * @param Controller $controller the controller instance
-	 */
-	protected function getControllerHelp($controller)
-	{
-		$class = new \ReflectionClass($controller);
-		$comment = strtr(trim(preg_replace('/^\s*\**( |\t)?/m', '', trim($class->getDocComment(), '/'))), "\r", '');
-		if (preg_match('/^\s*@\w+/m', $comment, $matches, PREG_OFFSET_CAPTURE)) {
-			$comment = trim(substr($comment, 0, $matches[0][1]));
-		}
-
-		if ($comment !== '') {
-			echo "\nDESCRIPTION\n";
-			echo "\n" . $comment . "\n\n";
-		}
-
-		$actions = $this->getActions($controller);
-		if (!empty($actions)) {
-			echo "\nSUB-COMMANDS\n\n";
-			$prefix = $controller->getUniqueId();
-			foreach ($actions as $action) {
-				if ($action === $controller->defaultAction) {
-					echo "* $prefix/$action (default)";
-				} else {
-					echo "* $prefix/$action";
-				}
-				$summary = $this->getActionSummary($controller, $action);
-				if ($summary !== '') {
-					echo ': ' . $summary;
-				}
-				echo "\n";
-			}
-			echo "\n\nTo see the detailed information about individual sub-commands, enter:\n";
-			echo "\n  yiic help <sub-command>\n\n";
-		}
-	}
-
-	/**
-	 * Returns the short summary of the action.
-	 * @param Controller $controller the controller instance
-	 * @param string $actionID action ID
-	 * @return string the summary about the action
-	 */
-	protected function getActionSummary($controller, $actionID)
-	{
-		$action = $controller->createAction($actionID);
-		if ($action === null) {
-			return '';
-		}
-		if ($action instanceof InlineAction) {
-			$reflection = new \ReflectionMethod($controller, $action->actionMethod);
-		} else {
-			$reflection = new \ReflectionClass($action);
-		}
-		$tags = $this->parseComment($reflection->getDocComment());
-		if ($tags['description'] !== '') {
-			$limit = 73 - strlen($action->getUniqueId());
-			if ($actionID === $controller->defaultAction) {
-				$limit -= 10;
-			}
-			if ($limit < 0) {
-				$limit = 50;
-			}
-			$description = $tags['description'];
-			if (($pos = strpos($tags['description'], "\n")) !== false) {
-				$description = substr($description, 0, $pos);
-			}
-			$text = substr($description, 0, $limit);
-			return strlen($description) > $limit ? $text . '...' : $text;
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Displays the detailed information of a command action.
-	 * @param Controller $controller the controller instance
-	 * @param string $actionID action ID
-	 * @throws Exception if the action does not exist
-	 */
-	protected function getActionHelp($controller, $actionID)
-	{
-		$action = $controller->createAction($actionID);
-		if ($action === null) {
-			throw new Exception(Yii::t('yii|No help for unknown sub-command "{command}".', array(
-				'{command}' => rtrim($controller->getUniqueId() . '/' . $actionID, '/'),
-			)));
-		}
-		if ($action instanceof InlineAction) {
-			$method = new \ReflectionMethod($controller, $action->actionMethod);
-		} else {
-			$method = new \ReflectionMethod($action, 'run');
-		}
-
-		$tags = $this->parseComment($method->getDocComment());
-		$options = $this->getOptionHelps($controller);
-
-		if ($tags['description'] !== '') {
-			echo "\nDESCRIPTION";
-			echo "\n\n" . $tags['description'] . "\n\n";
-		}
-
-		echo "\nUSAGE\n\n";
-		if ($action->id === $controller->defaultAction) {
-			echo 'yiic ' . $controller->getUniqueId();
-		} else {
-			echo "yiic " . $action->getUniqueId();
-		}
-		list ($required, $optional) = $this->getArgHelps($method, isset($tags['param']) ? $tags['param'] : array());
-		if (!empty($required)) {
-			echo ' <' . implode('> <', array_keys($required)) . '>';
-		}
-		if (!empty($optional)) {
-			echo ' [' . implode('] [', array_keys($optional)) . ']';
-		}
-		if (!empty($options)) {
-			echo ' [...options...]';
-		}
-		echo "\n\n";
-
-		if (!empty($required) || !empty($optional)) {
-			echo implode("\n\n", array_merge($required, $optional)) . "\n\n";
-		}
-
-		$options = $this->getOptionHelps($controller);
-		if (!empty($options)) {
-			echo "\nOPTIONS\n\n";
-			echo implode("\n\n", $options) . "\n\n";
-		}
-	}
-
-	/**
-	 * Returns the help information about arguments.
-	 * @param \ReflectionMethod $method
-	 * @param string $tags the parsed comment block related with arguments
-	 * @return array the required and optional argument help information
-	 */
-	protected function getArgHelps($method, $tags)
-	{
-		if (is_string($tags)) {
-			$tags = array($tags);
-		}
-		$params = $method->getParameters();
-		$optional = $required = array();
-		foreach ($params as $i => $param) {
-			$name = $param->getName();
-			$tag = isset($tags[$i]) ? $tags[$i] : '';
-			if (preg_match('/^([^\s]+)\s+(\$\w+\s+)?(.*)/s', $tag, $matches)) {
-				$type = $matches[1];
-				$comment = $matches[3];
-			} else {
-				$type = null;
-				$comment = $tag;
-			}
-			if ($param->isDefaultValueAvailable()) {
-				$optional[$name] = $this->formatOptionHelp('* ' . $name, false, $type, $param->getDefaultValue(), $comment);
-			} else {
-				$required[$name] = $this->formatOptionHelp('* ' . $name, true, $type, null, $comment);
-			}
-		}
-
-		return array($required, $optional);
-	}
-
-	/**
-	 * Returns the help information about the options available for a console controller.
-	 * @param Controller $controller the console controller
-	 * @return array the help information about the options
-	 */
-	protected function getOptionHelps($controller)
-	{
-		$optionNames = $controller->globalOptions();
-		if (empty($optionNames)) {
-			return array();
-		}
-
-		$class = new \ReflectionClass($controller);
-		$options = array();
-		foreach ($class->getProperties() as $property) {
-			$name = $property->getName();
-			if (!in_array($name, $optionNames, true)) {
-				continue;
-			}
-			$defaultValue = $property->getValue($controller);
-			$tags = $this->parseComment($property->getDocComment());
-			if (isset($tags['var']) || isset($tags['property'])) {
-				$doc = isset($tags['var']) ? $tags['var'] : $tags['property'];
-				if (is_array($doc)) {
-					$doc = reset($doc);
-				}
-				if (preg_match('/^([^\s]+)(.*)/s', $doc, $matches)) {
-					$type = $matches[1];
-					$comment = $matches[2];
-				} else {
-					$type = null;
-					$comment = $doc;
-				}
-				$options[$name] = $this->formatOptionHelp('--' . $name, false, $type, $defaultValue, $comment);
-			} else {
-				$options[$name] = $this->formatOptionHelp('--' . $name, false, null, $defaultValue, '');
-			}
-		}
-		ksort($options);
-		return $options;
-	}
-
-	/**
-	 * Parses the comment block into tags.
-	 * @param string $comment the comment block
-	 * @return array the parsed tags
-	 */
-	protected function parseComment($comment)
-	{
-		$tags = array();
-		$comment = "@description \n" . strtr(trim(preg_replace('/^\s*\**( |\t)?/m', '', trim($comment, '/'))), "\r", '');
-		$parts = preg_split('/^\s*@/m', $comment, -1, PREG_SPLIT_NO_EMPTY);
-		foreach ($parts as $part) {
-			if (preg_match('/^(\w+)(.*)/ms', trim($part), $matches)) {
-				$name = $matches[1];
-				if (!isset($tags[$name])) {
-					$tags[$name] = trim($matches[2]);
-				} elseif (is_array($tags[$name])) {
-					$tags[$name][] = trim($matches[2]);
-				} else {
-					$tags[$name] = array($tags[$name], trim($matches[2]));
-				}
-			}
-		}
-		return $tags;
-	}
-
-	/**
-	 * Generates a well-formed string for an argument or option.
-	 * @param string $name the name of the argument or option
-	 * @param boolean $required whether the argument is required
-	 * @param string $type the type of the option or argument
-	 * @param mixed $defaultValue the default value of the option or argument
-	 * @param string $comment comment about the option or argument
-	 * @return string the formatted string for the argument or option
-	 */
-	protected function formatOptionHelp($name, $required, $type, $defaultValue, $comment)
-	{
-		$doc = '';
-		$comment = trim($comment);
-
-		if ($defaultValue !== null && !is_array($defaultValue)) {
-			if ($type === null) {
-				$type = gettype($defaultValue);
-			}
-			$doc = "$type (defaults to " . var_export($defaultValue, true) . ")";
-		} elseif (trim($type) !== '') {
-			$doc = $type;
-		}
-
-		if ($doc === '') {
-			$doc = $comment;
-		} elseif ($comment !== '') {
-			$doc .= "\n" . preg_replace("/^/m", "  ", $comment);
-		}
-
-		$name = $required ? "$name (required)" : $name;
-		return $doc === '' ? $name : "$name: $doc";
-	}
-}
diff --git a/framework/console/controllers/MessageController.php b/framework/console/controllers/MessageController.php
deleted file mode 100644
index e010b55..0000000
--- a/framework/console/controllers/MessageController.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-/**
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\console\controllers;
-
-use yii\console\Controller;
-
-/**
- * This command extracts messages to be translated from source files.
- * The extracted messages are saved as PHP message source files
- * under the specified directory.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class MessageController extends Controller
-{
-	/**
-	 * Searches for messages to be translated in the specified
-	 * source files and compiles them into PHP arrays as message source.
-	 *
-	 * @param string $config the path of the configuration file. You can find
-	 * an example in framework/messages/config.php.
-	 *
-	 * The file can be placed anywhere and must be a valid PHP script which
-	 * returns an array of name-value pairs. Each name-value pair represents
-	 * a configuration option.
-	 *
-	 * The following options are available:
-	 *
-	 *  - sourcePath: string, root directory of all source files.
-	 *  - messagePath: string, root directory containing message translations.
-	 *  - languages: array, list of language codes that the extracted messages
-	 *    should be translated to. For example, array('zh_cn','en_au').
-	 *  - fileTypes: array, a list of file extensions (e.g. 'php', 'xml').
-	 *    Only the files whose extension name can be found in this list
-	 *    will be processed. If empty, all files will be processed.
-	 *  - exclude: array, a list of directory and file exclusions. Each
-	 *    exclusion can be either a name or a path. If a file or directory name
-	 *    or path matches the exclusion, it will not be copied. For example,
-	 *    an exclusion of '.svn' will exclude all files and directories whose
-	 *    name is '.svn'. And an exclusion of '/a/b' will exclude file or
-	 *    directory 'sourcePath/a/b'.
-	 *  - translator: the name of the function for translating messages.
-	 *    Defaults to 'Yii::t'. This is used as a mark to find messages to be
-	 *    translated.
-	 *  - overwrite: if message file must be overwritten with the merged messages.
-	 *  - removeOld: if message no longer needs translation it will be removed,
-	 *    instead of being enclosed between a pair of '@@' marks.
-	 *  - sort: sort messages by key when merging, regardless of their translation
-	 *    state (new, obsolete, translated.)
-	 */
-	public function actionIndex($config)
-	{
-		if(!is_file($config))
-			$this->usageError("the configuration file {$config} does not exist.");
-
-		$config=require_once($config);
-
-		$translator='Yii::t';
-		extract($config);
-
-		if(!isset($sourcePath,$messagePath,$languages))
-			$this->usageError('The configuration file must specify "sourcePath", "messagePath" and "languages".');
-		if(!is_dir($sourcePath))
-			$this->usageError("The source path $sourcePath is not a valid directory.");
-		if(!is_dir($messagePath))
-			$this->usageError("The message path $messagePath is not a valid directory.");
-		if(empty($languages))
-			$this->usageError("Languages cannot be empty.");
-
-		if(!isset($overwrite))
-			$overwrite = false;
-
-		if(!isset($removeOld))
-			$removeOld = false;
-
-		if(!isset($sort))
-			$sort = false;
-
-		$options=array();
-		if(isset($fileTypes))
-			$options['fileTypes']=$fileTypes;
-		if(isset($exclude))
-			$options['exclude']=$exclude;
-		$files=CFileHelper::findFiles(realpath($sourcePath),$options);
-
-		$messages=array();
-		foreach($files as $file)
-			$messages=array_merge_recursive($messages,$this->extractMessages($file,$translator));
-
-		foreach($languages as $language)
-		{
-			$dir=$messagePath.DIRECTORY_SEPARATOR.$language;
-			if(!is_dir($dir))
-				@mkdir($dir);
-			foreach($messages as $category=>$msgs)
-			{
-				$msgs=array_values(array_unique($msgs));
-				$this->generateMessageFile($msgs,$dir.DIRECTORY_SEPARATOR.$category.'.php',$overwrite,$removeOld,$sort);
-			}
-		}
-	}
-
-	protected function extractMessages($fileName,$translator)
-	{
-		echo "Extracting messages from $fileName...\n";
-		$subject=file_get_contents($fileName);
-		$n=preg_match_all('/\b'.$translator.'\s*\(\s*(\'.*?(?<!\\\\)\'|".*?(?<!\\\\)")\s*,\s*(\'.*?(?<!\\\\)\'|".*?(?<!\\\\)")\s*[,\)]/s',$subject,$matches,PREG_SET_ORDER);
-		$messages=array();
-		for($i=0;$i<$n;++$i)
-		{
-			if(($pos=strpos($matches[$i][1],'.'))!==false)
-				$category=substr($matches[$i][1],$pos+1,-1);
-			else
-				$category=substr($matches[$i][1],1,-1);
-			$message=$matches[$i][2];
-			$messages[$category][]=eval("return $message;");  // use eval to eliminate quote escape
-		}
-		return $messages;
-	}
-
-	protected function generateMessageFile($messages,$fileName,$overwrite,$removeOld,$sort)
-	{
-		echo "Saving messages to $fileName...";
-		if(is_file($fileName))
-		{
-			$translated=require($fileName);
-			sort($messages);
-			ksort($translated);
-			if(array_keys($translated)==$messages)
-			{
-				echo "nothing new...skipped.\n";
-				return;
-			}
-			$merged=array();
-			$untranslated=array();
-			foreach($messages as $message)
-			{
-				if(!empty($translated[$message]))
-					$merged[$message]=$translated[$message];
-				else
-					$untranslated[]=$message;
-			}
-			ksort($merged);
-			sort($untranslated);
-			$todo=array();
-			foreach($untranslated as $message)
-				$todo[$message]='';
-			ksort($translated);
-			foreach($translated as $message=>$translation)
-			{
-				if(!isset($merged[$message]) && !isset($todo[$message]) && !$removeOld)
-				{
-					if(substr($translation,0,2)==='@@' && substr($translation,-2)==='@@')
-						$todo[$message]=$translation;
-					else
-						$todo[$message]='@@'.$translation.'@@';
-				}
-			}
-			$merged=array_merge($todo,$merged);
-			if($sort)
-				ksort($merged);
-			if($overwrite === false)
-				$fileName.='.merged';
-			echo "translation merged.\n";
-		}
-		else
-		{
-			$merged=array();
-			foreach($messages as $message)
-				$merged[$message]='';
-			ksort($merged);
-			echo "saved.\n";
-		}
-		$array=str_replace("\r",'',var_export($merged,true));
-		$content=<<<EOD
-<?php
-/**
- * Message translations.
- *
- * This file is automatically generated by 'yiic message' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE, this file must be saved in UTF-8 encoding.
- */
-return $array;
-
-EOD;
-		file_put_contents($fileName, $content);
-	}
-}
diff --git a/framework/console/controllers/MigrateController.php b/framework/console/controllers/MigrateController.php
deleted file mode 100644
index fb06c66..0000000
--- a/framework/console/controllers/MigrateController.php
+++ /dev/null
@@ -1,633 +0,0 @@
-<?php
-/**
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\console\controllers;
-
-use Yii;
-use yii\console\Exception;
-use yii\console\Controller;
-use yii\db\Connection;
-use yii\db\Query;
-use yii\helpers\ArrayHelper;
-
-/**
- * This command manages application migrations.
- *
- * A migration means a set of persistent changes to the application environment
- * that is shared among different developers. For example, in an application
- * backed by a database, a migration may refer to a set of changes to
- * the database, such as creating a new table, adding a new table column.
- *
- * This command provides support for tracking the migration history, upgrading
- * or downloading with migrations, and creating new migration skeletons.
- *
- * The migration history is stored in a database table named
- * as [[migrationTable]]. The table will be automatically created the first time
- * this command is executed, if it does not exist. You may also manually
- * create it as follows:
- *
- * ~~~
- * CREATE TABLE tbl_migration (
- *     version varchar(255) PRIMARY KEY,
- *     apply_time integer
- * )
- * ~~~
- *
- * Below are some common usages of this command:
- *
- * ~~~
- * # creates a new migration named 'create_user_table'
- * yiic migrate/create create_user_table
- *
- * # applies ALL new migrations
- * yiic migrate
- *
- * # reverts the last applied migration
- * yiic migrate/down
- * ~~~
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class MigrateController extends Controller
-{
-	/**
-	 * The name of the dummy migration that marks the beginning of the whole migration history.
-	 */
-	const BASE_MIGRATION = 'm000000_000000_base';
-
-	/**
-	 * @var string the default command action.
-	 */
-	public $defaultAction = 'up';
-	/**
-	 * @var string the directory storing the migration classes. This can be either
-	 * a path alias or a directory.
-	 */
-	public $migrationPath = '@app/migrations';
-	/**
-	 * @var string the name of the table for keeping applied migration information.
-	 */
-	public $migrationTable = 'tbl_migration';
-	/**
-	 * @var string the template file for generating new migrations.
-	 * This can be either a path alias (e.g. "@app/migrations/template.php")
-	 * or a file path.
-	 */
-	public $templateFile = '@yii/views/migration.php';
-	/**
-	 * @var boolean whether to execute the migration in an interactive mode.
-	 */
-	public $interactive = true;
-	/**
-	 * @var Connection|string the DB connection object or the application
-	 * component ID of the DB connection.
-	 */
-	public $db = 'db';
-
-	/**
-	 * Returns the names of the global options for this command.
-	 * @return array the names of the global options for this command.
-	 */
-	public function globalOptions()
-	{
-		return array('migrationPath', 'migrationTable', 'db', 'templateFile', 'interactive');
-	}
-
-	/**
-	 * This method is invoked right before an action is to be executed (after all possible filters.)
-	 * It checks the existence of the [[migrationPath]].
-	 * @param \yii\base\Action $action the action to be executed.
-	 * @return boolean whether the action should continue to be executed.
-	 * @throws Exception if the migration directory does not exist.
-	 */
-	public function beforeAction($action)
-	{
-		if (parent::beforeAction($action)) {
-			$path = Yii::getAlias($this->migrationPath);
-			if (!is_dir($path)) {
-				throw new Exception("The migration directory \"{$this->migrationPath}\" does not exist.");
-			}
-			$this->migrationPath = $path;
-
-			if (is_string($this->db)) {
-				$this->db = Yii::$app->getComponent($this->db);
-			}
-			if (!$this->db instanceof Connection) {
-				throw new Exception("The 'db' option must refer to the application component ID of a DB connection.");
-			}
-
-			$version = Yii::getVersion();
-			echo "Yii Migration Tool (based on Yii v{$version})\n\n";
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Upgrades the application by applying new migrations.
-	 * For example,
-	 *
-	 * ~~~
-	 * yiic migrate     # apply all new migrations
-	 * yiic migrate 3   # apply the first 3 new migrations
-	 * ~~~
-	 *
-	 * @param integer $limit the number of new migrations to be applied. If 0, it means
-	 * applying all available new migrations.
-	 */
-	public function actionUp($limit = 0)
-	{
-		$migrations = $this->getNewMigrations();
-		if (empty($migrations)) {
-			echo "No new migration found. Your system is up-to-date.\n";
-			Yii::$app->end();
-		}
-
-		$total = count($migrations);
-		$limit = (int)$limit;
-		if ($limit > 0) {
-			$migrations = array_slice($migrations, 0, $limit);
-		}
-
-		$n = count($migrations);
-		if ($n === $total) {
-			echo "Total $n new " . ($n === 1 ? 'migration' : 'migrations') . " to be applied:\n";
-		} else {
-			echo "Total $n out of $total new " . ($total === 1 ? 'migration' : 'migrations') . " to be applied:\n";
-		}
-
-		foreach ($migrations as $migration) {
-			echo "    $migration\n";
-		}
-		echo "\n";
-
-		if ($this->confirm('Apply the above ' . ($n === 1 ? 'migration' : 'migrations') . "?")) {
-			foreach ($migrations as $migration) {
-				if (!$this->migrateUp($migration)) {
-					echo "\nMigration failed. The rest of the migrations are canceled.\n";
-					return;
-				}
-			}
-			echo "\nMigrated up successfully.\n";
-		}
-	}
-
-	/**
-	 * Downgrades the application by reverting old migrations.
-	 * For example,
-	 *
-	 * ~~~
-	 * yiic migrate/down     # revert the last migration
-	 * yiic migrate/down 3   # revert the last 3 migrations
-	 * ~~~
-	 *
-	 * @param integer $limit the number of migrations to be reverted. Defaults to 1,
-	 * meaning the last applied migration will be reverted.
-	 * @throws Exception if the number of the steps specified is less than 1.
-	 */
-	public function actionDown($limit = 1)
-	{
-		$limit = (int)$limit;
-		if ($limit < 1) {
-			throw new Exception("The step argument must be greater than 0.");
-		}
-
-		$migrations = $this->getMigrationHistory($limit);
-		if (empty($migrations)) {
-			echo "No migration has been done before.\n";
-			return;
-		}
-		$migrations = array_keys($migrations);
-
-		$n = count($migrations);
-		echo "Total $n " . ($n === 1 ? 'migration' : 'migrations') . " to be reverted:\n";
-		foreach ($migrations as $migration) {
-			echo "    $migration\n";
-		}
-		echo "\n";
-
-		if ($this->confirm('Revert the above ' . ($n === 1 ? 'migration' : 'migrations') . "?")) {
-			foreach ($migrations as $migration) {
-				if (!$this->migrateDown($migration)) {
-					echo "\nMigration failed. The rest of the migrations are canceled.\n";
-					return;
-				}
-			}
-			echo "\nMigrated down successfully.\n";
-		}
-	}
-
-	/**
-	 * Redoes the last few migrations.
-	 *
-	 * This command will first revert the specified migrations, and then apply
-	 * them again. For example,
-	 *
-	 * ~~~
-	 * yiic migrate/redo     # redo the last applied migration
-	 * yiic migrate/redo 3   # redo the last 3 applied migrations
-	 * ~~~
-	 *
-	 * @param integer $limit the number of migrations to be redone. Defaults to 1,
-	 * meaning the last applied migration will be redone.
-	 * @throws Exception if the number of the steps specified is less than 1.
-	 */
-	public function actionRedo($limit = 1)
-	{
-		$limit = (int)$limit;
-		if ($limit < 1) {
-			throw new Exception("The step argument must be greater than 0.");
-		}
-
-		$migrations = $this->getMigrationHistory($limit);
-		if (empty($migrations)) {
-			echo "No migration has been done before.\n";
-			return;
-		}
-		$migrations = array_keys($migrations);
-
-		$n = count($migrations);
-		echo "Total $n " . ($n === 1 ? 'migration' : 'migrations') . " to be redone:\n";
-		foreach ($migrations as $migration) {
-			echo "    $migration\n";
-		}
-		echo "\n";
-
-		if ($this->confirm('Redo the above ' . ($n === 1 ? 'migration' : 'migrations') . "?")) {
-			foreach ($migrations as $migration) {
-				if (!$this->migrateDown($migration)) {
-					echo "\nMigration failed. The rest of the migrations are canceled.\n";
-					return;
-				}
-			}
-			foreach (array_reverse($migrations) as $migration) {
-				if (!$this->migrateUp($migration)) {
-					echo "\nMigration failed. The rest of the migrations migrations are canceled.\n";
-					return;
-				}
-			}
-			echo "\nMigration redone successfully.\n";
-		}
-	}
-
-	/**
-	 * Upgrades or downgrades till the specified version.
-	 *
-	 * This command will first revert the specified migrations, and then apply
-	 * them again. For example,
-	 *
-	 * ~~~
-	 * yiic migrate/to 101129_185401                      # using timestamp
-	 * yiic migrate/to m101129_185401_create_user_table   # using full name
-	 * ~~~
-	 *
-	 * @param string $version the version name that the application should be migrated to.
-	 * This can be either the timestamp or the full name of the migration.
-	 * @throws Exception if the version argument is invalid
-	 */
-	public function actionTo($version)
-	{
-		$originalVersion = $version;
-		if (preg_match('/^m?(\d{6}_\d{6})(_.*?)?$/', $version, $matches)) {
-			$version = 'm' . $matches[1];
-		} else {
-			throw new Exception("The version argument must be either a timestamp (e.g. 101129_185401)\nor the full name of a migration (e.g. m101129_185401_create_user_table).");
-		}
-
-		// try migrate up
-		$migrations = $this->getNewMigrations();
-		foreach ($migrations as $i => $migration) {
-			if (strpos($migration, $version . '_') === 0) {
-				$this->actionUp($i + 1);
-				return;
-			}
-		}
-
-		// try migrate down
-		$migrations = array_keys($this->getMigrationHistory(-1));
-		foreach ($migrations as $i => $migration) {
-			if (strpos($migration, $version . '_') === 0) {
-				if ($i === 0) {
-					echo "Already at '$originalVersion'. Nothing needs to be done.\n";
-				} else {
-					$this->actionDown($i);
-				}
-				return;
-			}
-		}
-
-		throw new Exception("Unable to find the version '$originalVersion'.");
-	}
-
-	/**
-	 * Modifies the migration history to the specified version.
-	 *
-	 * No actual migration will be performed.
-	 *
-	 * ~~~
-	 * yiic migrate/mark 101129_185401                      # using timestamp
-	 * yiic migrate/mark m101129_185401_create_user_table   # using full name
-	 * ~~~
-	 *
-	 * @param string $version the version at which the migration history should be marked.
-	 * This can be either the timestamp or the full name of the migration.
-	 * @throws Exception if the version argument is invalid or the version cannot be found.
-	 */
-	public function actionMark($version)
-	{
-		$originalVersion = $version;
-		if (preg_match('/^m?(\d{6}_\d{6})(_.*?)?$/', $version, $matches)) {
-			$version = 'm' . $matches[1];
-		} else {
-			throw new Exception("The version argument must be either a timestamp (e.g. 101129_185401)\nor the full name of a migration (e.g. m101129_185401_create_user_table).");
-		}
-
-		// try mark up
-		$migrations = $this->getNewMigrations();
-		foreach ($migrations as $i => $migration) {
-			if (strpos($migration, $version . '_') === 0) {
-				if ($this->confirm("Set migration history at $originalVersion?")) {
-					$command = $this->db->createCommand();
-					for ($j = 0; $j <= $i; ++$j) {
-						$command->insert($this->migrationTable, array(
-							'version' => $migrations[$j],
-							'apply_time' => time(),
-						))->execute();
-					}
-					echo "The migration history is set at $originalVersion.\nNo actual migration was performed.\n";
-				}
-				return;
-			}
-		}
-
-		// try mark down
-		$migrations = array_keys($this->getMigrationHistory(-1));
-		foreach ($migrations as $i => $migration) {
-			if (strpos($migration, $version . '_') === 0) {
-				if ($i === 0) {
-					echo "Already at '$originalVersion'. Nothing needs to be done.\n";
-				} else {
-					if ($this->confirm("Set migration history at $originalVersion?")) {
-						$command = $this->db->createCommand();
-						for ($j = 0; $j < $i; ++$j) {
-							$command->delete($this->migrationTable, array(
-								'version' => $migrations[$j],
-							))->execute();
-						}
-						echo "The migration history is set at $originalVersion.\nNo actual migration was performed.\n";
-					}
-				}
-				return;
-			}
-		}
-
-		throw new Exception("Unable to find the version '$originalVersion'.");
-	}
-
-	/**
-	 * Displays the migration history.
-	 *
-	 * This command will show the list of migrations that have been applied
-	 * so far. For example,
-	 *
-	 * ~~~
-	 * yiic migrate/history     # showing the last 10 migrations
-	 * yiic migrate/history 5   # showing the last 5 migrations
-	 * yiic migrate/history 0   # showing the whole history
-	 * ~~~
-	 *
-	 * @param integer $limit the maximum number of migrations to be displayed.
-	 * If it is 0, the whole migration history will be displayed.
-	 */
-	public function actionHistory($limit = 10)
-	{
-		$limit = (int)$limit;
-		$migrations = $this->getMigrationHistory($limit);
-		if (empty($migrations)) {
-			echo "No migration has been done before.\n";
-		} else {
-			$n = count($migrations);
-			if ($limit > 0) {
-				echo "Showing the last $n applied " . ($n === 1 ? 'migration' : 'migrations') . ":\n";
-			} else {
-				echo "Total $n " . ($n === 1 ? 'migration has' : 'migrations have') . " been applied before:\n";
-			}
-			foreach ($migrations as $version => $time) {
-				echo "    (" . date('Y-m-d H:i:s', $time) . ') ' . $version . "\n";
-			}
-		}
-	}
-
-	/**
-	 * Displays the un-applied new migrations.
-	 *
-	 * This command will show the new migrations that have not been applied.
-	 * For example,
-	 *
-	 * ~~~
-	 * yiic migrate/new     # showing the first 10 new migrations
-	 * yiic migrate/new 5   # showing the first 5 new migrations
-	 * yiic migrate/new 0   # showing all new migrations
-	 * ~~~
-	 *
-	 * @param integer $limit the maximum number of new migrations to be displayed.
-	 * If it is 0, all available new migrations will be displayed.
-	 */
-	public function actionNew($limit = 10)
-	{
-		$limit = (int)$limit;
-		$migrations = $this->getNewMigrations();
-		if (empty($migrations)) {
-			echo "No new migrations found. Your system is up-to-date.\n";
-		} else {
-			$n = count($migrations);
-			if ($limit > 0 && $n > $limit) {
-				$migrations = array_slice($migrations, 0, $limit);
-				echo "Showing $limit out of $n new " . ($n === 1 ? 'migration' : 'migrations') . ":\n";
-			} else {
-				echo "Found $n new " . ($n === 1 ? 'migration' : 'migrations') . ":\n";
-			}
-
-			foreach ($migrations as $migration) {
-				echo "    " . $migration . "\n";
-			}
-		}
-	}
-
-	/**
-	 * Creates a new migration.
-	 *
-	 * This command creates a new migration using the available migration template.
-	 * After using this command, developers should modify the created migration
-	 * skeleton by filling up the actual migration logic.
-	 *
-	 * ~~~
-	 * yiic migrate/create create_user_table
-	 * ~~~
-	 *
-	 * @param string $name the name of the new migration. This should only contain
-	 * letters, digits and/or underscores.
-	 * @throws Exception if the name argument is invalid.
-	 */
-	public function actionCreate($name)
-	{
-		if (!preg_match('/^\w+$/', $name)) {
-			throw new Exception("The migration name should contain letters, digits and/or underscore characters only.");
-		}
-
-		$name = 'm' . gmdate('ymd_His') . '_' . $name;
-		$file = $this->migrationPath . DIRECTORY_SEPARATOR . $name . '.php';
-
-		if ($this->confirm("Create new migration '$file'?")) {
-			$content = $this->renderFile(Yii::getAlias($this->templateFile), array(
-				'className' => $name,
-			));
-			file_put_contents($file, $content);
-			echo "New migration created successfully.\n";
-		}
-	}
-
-	/**
-	 * Upgrades with the specified migration class.
-	 * @param string $class the migration class name
-	 * @return boolean whether the migration is successful
-	 */
-	protected function migrateUp($class)
-	{
-		if ($class === self::BASE_MIGRATION) {
-			return true;
-		}
-
-		echo "*** applying $class\n";
-		$start = microtime(true);
-		$migration = $this->createMigration($class);
-		if ($migration->up() !== false) {
-			$this->db->createCommand()->insert($this->migrationTable, array(
-				'version' => $class,
-				'apply_time' => time(),
-			))->execute();
-			$time = microtime(true) - $start;
-			echo "*** applied $class (time: " . sprintf("%.3f", $time) . "s)\n\n";
-			return true;
-		} else {
-			$time = microtime(true) - $start;
-			echo "*** failed to apply $class (time: " . sprintf("%.3f", $time) . "s)\n\n";
-			return false;
-		}
-	}
-
-	/**
-	 * Downgrades with the specified migration class.
-	 * @param string $class the migration class name
-	 * @return boolean whether the migration is successful
-	 */
-	protected function migrateDown($class)
-	{
-		if ($class === self::BASE_MIGRATION) {
-			return true;
-		}
-
-		echo "*** reverting $class\n";
-		$start = microtime(true);
-		$migration = $this->createMigration($class);
-		if ($migration->down() !== false) {
-			$this->db->createCommand()->delete($this->migrationTable, array(
-				'version' => $class,
-			))->execute();
-			$time = microtime(true) - $start;
-			echo "*** reverted $class (time: " . sprintf("%.3f", $time) . "s)\n\n";
-			return true;
-		} else {
-			$time = microtime(true) - $start;
-			echo "*** failed to revert $class (time: " . sprintf("%.3f", $time) . "s)\n\n";
-			return false;
-		}
-	}
-
-	/**
-	 * Creates a new migration instance.
-	 * @param string $class the migration class name
-	 * @return \yii\db\Migration the migration instance
-	 */
-	protected function createMigration($class)
-	{
-		$file = $this->migrationPath . DIRECTORY_SEPARATOR . $class . '.php';
-		require_once($file);
-		return new $class(array(
-			'db' => $this->db,
-		));
-	}
-
-	/**
-	 * Returns the migration history.
-	 * @param integer $limit the maximum number of records in the history to be returned
-	 * @return array the migration history
-	 */
-	protected function getMigrationHistory($limit)
-	{
-		if ($this->db->schema->getTableSchema($this->migrationTable) === null) {
-			$this->createMigrationHistoryTable();
-		}
-		$query = new Query;
-		$rows = $query->select(array('version', 'apply_time'))
-			->from($this->migrationTable)
-			->orderBy('version DESC')
-			->limit($limit)
-			->createCommand()
-			->queryAll();
-		$history = ArrayHelper::map($rows, 'version', 'apply_time');
-		unset($history[self::BASE_MIGRATION]);
-		return $history;
-	}
-
-	/**
-	 * Creates the migration history table.
-	 */
-	protected function createMigrationHistoryTable()
-	{
-		echo 'Creating migration history table "' . $this->migrationTable . '"...';
-		$this->db->createCommand()->createTable($this->migrationTable, array(
-			'version' => 'varchar(255) NOT NULL PRIMARY KEY',
-			'apply_time' => 'integer',
-		))->execute();
-		$this->db->createCommand()->insert($this->migrationTable, array(
-			'version' => self::BASE_MIGRATION,
-			'apply_time' => time(),
-		))->execute();
-		echo "done.\n";
-	}
-
-	/**
-	 * Returns the migrations that are not applied.
-	 * @return array list of new migrations
-	 */
-	protected function getNewMigrations()
-	{
-		$applied = array();
-		foreach ($this->getMigrationHistory(-1) as $version => $time) {
-			$applied[substr($version, 1, 13)] = true;
-		}
-
-		$migrations = array();
-		$handle = opendir($this->migrationPath);
-		while (($file = readdir($handle)) !== false) {
-			if ($file === '.' || $file === '..') {
-				continue;
-			}
-			$path = $this->migrationPath . DIRECTORY_SEPARATOR . $file;
-			if (preg_match('/^(m(\d{6}_\d{6})_.*?)\.php$/', $file, $matches) && is_file($path) && !isset($applied[$matches[2]])) {
-				$migrations[] = $matches[1];
-			}
-		}
-		closedir($handle);
-		sort($migrations);
-		return $migrations;
-	}
-}
diff --git a/framework/console/runtime/.gitignore b/framework/console/runtime/.gitignore
deleted file mode 100644
index f59ec20..0000000
--- a/framework/console/runtime/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*
\ No newline at end of file
diff --git a/framework/db/ActiveQuery.php b/framework/db/ActiveQuery.php
deleted file mode 100644
index dac94c8..0000000
--- a/framework/db/ActiveQuery.php
+++ /dev/null
@@ -1,380 +0,0 @@
-<?php
-/**
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\db;
-
-use yii\db\Connection;
-use yii\db\Command;
-use yii\db\QueryBuilder;
-use yii\db\Expression;
-
-/**
- * ActiveQuery represents a DB query associated with an Active Record class.
- *
- * ActiveQuery instances are usually created by [[ActiveRecord::find()]], [[ActiveRecord::findBySql()]]
- * and [[ActiveRecord::count()]].
- *
- * ActiveQuery mainly provides the following methods to retrieve the query results:
- *
- * - [[one()]]: returns a single record populated with the first row of data.
- * - [[all()]]: returns all records based on the query results.
- * - [[count()]]: returns the number of records.
- * - [[sum()]]: returns the sum over the specified column.
- * - [[average()]]: returns the average over the specified column.
- * - [[min()]]: returns the min over the specified column.
- * - [[max()]]: returns the max over the specified column.
- * - [[scalar()]]: returns the value of the first column in the first row of the query result.
- * - [[exists()]]: returns a value indicating whether the query result has data or not.
- *
- * Because ActiveQuery extends from [[Query]], one can use query methods, such as [[where()]],
- * [[orderBy()]] to customize the query options.
- *
- * ActiveQuery also provides the following additional query options:
- *
- * - [[with()]]: list of relations that this query should be performed with.
- * - [[indexBy()]]: the name of the column by which the query result should be indexed.
- * - [[asArray()]]: whether to return each record as an array.
- *
- * These options can be configured using methods of the same name. For example:
- *
- * ~~~
- * $customers = Customer::find()->with('orders')->asArray()->all();
- * ~~~
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class ActiveQuery extends Query
-{
-	/**
-	 * @var string the name of the ActiveRecord class.
-	 */
-	public $modelClass;
-	/**
-	 * @var array list of relations that this query should be performed with
-	 */
-	public $with;
-	/**
-	 * @var string the name of the column by which query results should be indexed by.
-	 * This is only used when the query result is returned as an array when calling [[all()]].
-	 */
-	public $indexBy;
-	/**
-	 * @var boolean whether to return each record as an array. If false (default), an object
-	 * of [[modelClass]] will be created to represent each record.
-	 */
-	public $asArray;
-	/**
-	 * @var string the SQL statement to be executed for retrieving AR records.
-	 * This is set by [[ActiveRecord::findBySql()]].
-	 */
-	public $sql;
-
-
-	/**
-	 * PHP magic method.
-	 * This method allows calling static method defined in [[modelClass]] via this query object.
-	 * It is mainly implemented for supporting the feature of scope.
-	 * @param string $name the method name to be called
-	 * @param array $params the parameters passed to the method
-	 * @return mixed the method return result
-	 */
-	public function __call($name, $params)
-	{
-		if (method_exists($this->modelClass, $name)) {
-			array_unshift($params, $this);
-			call_user_func_array(array($this->modelClass, $name), $params);
-			return $this;
-		} else {
-			return parent::__call($name, $params);
-		}
-	}
-
-	/**
-	 * Executes query and returns all results as an array.
-	 * @return array the query results. If the query results in nothing, an empty array will be returned.
-	 */
-	public function all()
-	{
-		$command = $this->createCommand();
-		$rows = $command->queryAll();
-		if (!empty($rows)) {
-			$models = $this->createModels($rows);
-			if (!empty($this->with)) {
-				$this->populateRelations($models, $this->with);
-			}
-			return $models;
-		} else {
-			return array();
-		}
-	}
-
-	/**
-	 * Executes query and returns a single row of result.
-	 * @return ActiveRecord|array|null a single row of query result. Depending on the setting of [[asArray]],
-	 * the query result may be either an array or an ActiveRecord object. Null will be returned
-	 * if the query results in nothing.
-	 */
-	public function one()
-	{
-		$command = $this->createCommand();
-		$row = $command->queryRow();
-		if ($row !== false && !$this->asArray) {
-			/** @var $class ActiveRecord */
-			$class = $this->modelClass;
-			$model = $class::create($row);
-			if (!empty($this->with)) {
-				$models = array($model);
-				$this->populateRelations($models, $this->with);
-				$model = $models[0];
-			}
-			return $model;
-		} else {
-			return $row === false ? null : $row;
-		}
-	}
-
-	/**
-	 * Returns the number of records.
-	 * @param string $q the COUNT expression. Defaults to '*'.
-	 * Make sure you properly quote column names.
-	 * @return integer number of records
-	 */
-	public function count($q = '*')
-	{
-		$this->select = array("COUNT($q)");
-		return $this->createCommand()->queryScalar();
-	}
-
-	/**
-	 * Returns the sum of the specified column values.
-	 * @param string $q the column name or expression.
-	 * Make sure you properly quote column names.
-	 * @return integer the sum of the specified column values
-	 */
-	public function sum($q)
-	{
-		$this->select = array("SUM($q)");
-		return $this->createCommand()->queryScalar();
-	}
-
-	/**
-	 * Returns the average of the specified column values.
-	 * @param string $q the column name or expression.
-	 * Make sure you properly quote column names.
-	 * @return integer the average of the specified column values.
-	 */
-	public function average($q)
-	{
-		$this->select = array("AVG($q)");
-		return $this->createCommand()->queryScalar();
-	}
-
-	/**
-	 * Returns the minimum of the specified column values.
-	 * @param string $q the column name or expression.
-	 * Make sure you properly quote column names.
-	 * @return integer the minimum of the specified column values.
-	 */
-	public function min($q)
-	{
-		$this->select = array("MIN($q)");
-		return $this->createCommand()->queryScalar();
-	}
-
-	/**
-	 * Returns the maximum of the specified column values.
-	 * @param string $q the column name or expression.
-	 * Make sure you properly quote column names.
-	 * @return integer the maximum of the specified column values.
-	 */
-	public function max($q)
-	{
-		$this->select = array("MAX($q)");
-		return $this->createCommand()->queryScalar();
-	}
-
-	/**
-	 * Returns the query result as a scalar value.
-	 * The value returned will be the first column in the first row of the query results.
-	 * @return string|boolean the value of the first column in the first row of the query result.
-	 * False is returned if the query result is empty.
-	 */
-	public function scalar()
-	{
-		return $this->createCommand()->queryScalar();
-	}
-
-	/**
-	 * Returns a value indicating whether the query result contains any row of data.
-	 * @return boolean whether the query result contains any row of data.
-	 */
-	public function exists()
-	{
-		$this->select = array(new Expression('1'));
-		return $this->scalar() !== false;
-	}
-
-	/**
-	 * Creates a DB command that can be used to execute this query.
-	 * @param Connection $db the DB connection used to create the DB command.
-	 * If null, the DB connection returned by [[modelClass]] will be used.
-	 * @return Command the created DB command instance.
-	 */
-	public function createCommand($db = null)
-	{
-		/** @var $modelClass ActiveRecord */
-		$modelClass = $this->modelClass;
-		if ($db === null) {
-			$db = $modelClass::getDb();
-		}
-		if ($this->sql === null) {
-			if ($this->from === null) {
-				$tableName = $modelClass::tableName();
-				$this->from = array($tableName);
-			}
-			/** @var $qb QueryBuilder */
-			$qb = $db->getQueryBuilder();
-			$this->sql = $qb->build($this);
-		}
-		return $db->createCommand($this->sql, $this->params);
-	}
-
-	/**
-	 * Sets the [[asArray]] property.
-	 * @param boolean $value whether to return the query results in terms of arrays instead of Active Records.
-	 * @return ActiveQuery the query object itself
-	 */
-	public function asArray($value = true)
-	{
-		$this->asArray = $value;
-		return $this;
-	}
-
-	/**
-	 * Specifies the relations with which this query should be performed.
-	 *
-	 * The parameters to this method can be either one or multiple strings, or a single array
-	 * of relation names and the optional callbacks to customize the relations.
-	 *
-	 * The followings are some usage examples:
-	 *
-	 * ~~~
-	 * // find customers together with their orders and country
-	 * Customer::find()->with('orders', 'country')->all();
-	 * // find customers together with their country and orders of status 1
-	 * Customer::find()->with(array(
-	 *     'orders' => function($query) {
-	 *         $query->andWhere('status = 1');
-	 *     },
-	 *     'country',
-	 * ))->all();
-	 * ~~~
-	 *
-	 * @return ActiveQuery the query object itself
-	 */
-	public function with()
-	{
-		$this->with = func_get_args();
-		if (isset($this->with[0]) && is_array($this->with[0])) {
-			// the parameter is given as an array
-			$this->with = $this->with[0];
-		}
-		return $this;
-	}
-
-	/**
-	 * Sets the [[indexBy]] property.
-	 * @param string $column the name of the column by which the query results should be indexed by.
-	 * @return ActiveQuery the query object itself
-	 */
-	public function indexBy($column)
-	{
-		$this->indexBy = $column;
-		return $this;
-	}
-
-	private function createModels($rows)
-	{
-		$models = array();
-		if ($this->asArray) {
-			if ($this->indexBy === null) {
-				return $rows;
-			}
-			foreach ($rows as $row) {
-				$models[$row[$this->indexBy]] = $row;
-			}
-		} else {
-			/** @var $class ActiveRecord */
-			$class = $this->modelClass;
-			if ($this->indexBy === null) {
-				foreach ($rows as $row) {
-					$models[] = $class::create($row);
-				}
-			} else {
-				foreach ($rows as $row) {
-					$model = $class::create($row);
-					$models[$model->{$this->indexBy}] = $model;
-				}
-			}
-		}
-		return $models;
-	}
-
-	private function populateRelations(&$models, $with)
-	{
-		$primaryModel = new $this->modelClass;
-		$relations = $this->normalizeRelations($primaryModel, $with);
-		foreach ($relations as $name => $relation) {
-			if ($relation->asArray === null) {
-				// inherit asArray from primary query
-				$relation->asArray = $this->asArray;
-			}
-			$relation->findWith($name, $models);
-		}
-	}
-
-	/**
-	 * @param ActiveRecord $model
-	 * @param array $with
-	 * @return ActiveRelation[]
-	 */
-	private function normalizeRelations($model, $with)
-	{
-		$relations = array();
-		foreach ($with as $name => $callback) {
-			if (is_integer($name)) {
-				$name = $callback;
-				$callback = null;
-			}
-			if (($pos = strpos($name, '.')) !== false) {
-				// with sub-relations
-				$childName = substr($name, $pos + 1);
-				$name = substr($name, 0, $pos);
-			} else {
-				$childName = null;
-			}
-
-			$t = strtolower($name);
-			if (!isset($relations[$t])) {
-				$relation = $model->getRelation($name);
-				$relation->primaryModel = null;
-				$relations[$t] = $relation;
-			} else {
-				$relation = $relations[$t];
-			}
-
-			if (isset($childName)) {
-				$relation->with[$childName] = $callback;
-			} elseif ($callback !== null) {
-				call_user_func($callback, $relation);
-			}
-		}
-		return $relations;
-	}
-}
diff --git a/framework/db/ActiveRecord.php b/framework/db/ActiveRecord.php
deleted file mode 100644
index 356819d..0000000
--- a/framework/db/ActiveRecord.php
+++ /dev/null
@@ -1,1339 +0,0 @@
-<?php
-/**
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\db;
-
-use yii\base\InvalidConfigException;
-use yii\base\Model;
-use yii\base\InvalidParamException;
-use yii\base\ModelEvent;
-use yii\base\UnknownMethodException;
-use yii\base\InvalidCallException;
-use yii\db\Connection;
-use yii\db\TableSchema;
-use yii\db\Expression;
-use yii\helpers\StringHelper;
-
-/**
- * ActiveRecord is the base class for classes representing relational data in terms of objects.
- *
- * @include @yii/db/ActiveRecord.md
- *
- * @property Connection $db the database connection used by this AR class.
- * @property TableSchema $tableSchema the schema information of the DB table associated with this AR class.
- * @property array $oldAttributes the old attribute values (name-value pairs).
- * @property array $dirtyAttributes the changed attribute values (name-value pairs).
- * @property boolean $isNewRecord whether the record is new and should be inserted when calling [[save()]].
- * @property mixed $primaryKey the primary key value.
- * @property mixed $oldPrimaryKey the old primary key value.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class ActiveRecord extends Model
-{
-	/**
-	 * @event Event an event that is triggered when the record is initialized via [[init()]].
-	 */
-	const EVENT_INIT = 'init';
-	/**
-	 * @event Event an event that is triggered after the record is created and populated with query result.
-	 */
-	const EVENT_AFTER_FIND = 'afterFind';
-	/**
-	 * @event ModelEvent an event that is triggered before inserting a record.
-	 * You may set [[ModelEvent::isValid]] to be false to stop the insertion.
-	 */
-	const EVENT_BEFORE_INSERT = 'beforeInsert';
-	/**
-	 * @event Event an event that is triggered after a record is inserted.
-	 */
-	const EVENT_AFTER_INSERT = 'afterInsert';
-	/**
-	 * @event ModelEvent an event that is triggered before updating a record.
-	 * You may set [[ModelEvent::isValid]] to be false to stop the update.
-	 */
-	const EVENT_BEFORE_UPDATE = 'beforeUpdate';
-	/**
-	 * @event Event an event that is triggered after a record is updated.
-	 */
-	const EVENT_AFTER_UPDATE = 'afterUpdate';
-	/**
-	 * @event ModelEvent an event that is triggered before deleting a record.
-	 * You may set [[ModelEvent::isValid]] to be false to stop the deletion.
-	 */
-	const EVENT_BEFORE_DELETE = 'beforeDelete';
-	/**
-	 * @event Event an event that is triggered after a record is deleted.
-	 */
-	const EVENT_AFTER_DELETE = 'afterDelete';
-
-	/**
-	 * @var array attribute values indexed by attribute names
-	 */
-	private $_attributes = array();
-	/**
-	 * @var array old attribute values indexed by attribute names.
-	 */
-	private $_oldAttributes;
-	/**
-	 * @var array related models indexed by the relation names
-	 */
-	private $_related;
-
-
-	/**
-	 * Returns the database connection used by this AR class.
-	 * By default, the "db" application component is used as the database connection.
-	 * You may override this method if you want to use a different database connection.
-	 * @return Connection the database connection used by this AR class.
-	 */
-	public static function getDb()
-	{
-		return \Yii::$app->getDb();
-	}
-
-	/**
-	 * Creates an [[ActiveQuery]] instance for query purpose.
-	 *
-	 * @include @yii/db/ActiveRecord-find.md
-	 *
-	 * @param mixed $q the query parameter. This can be one of the followings:
-	 *
-	 *  - a scalar value (integer or string): query by a single primary key value and return the
-	 *    corresponding record.
-	 *  - an array of name-value pairs: query by a set of column values and return a single record matching all of them.
-	 *  - null: return a new [[ActiveQuery]] object for further query purpose.
-	 *
-	 * @return ActiveQuery|ActiveRecord|null When `$q` is null, a new [[ActiveQuery]] instance
-	 * is returned; when `$q` is a scalar or an array, an ActiveRecord object matching it will be
-	 * returned (null will be returned if there is no matching).
-	 * @throws InvalidConfigException if the AR class does not have a primary key
-	 * @see createQuery()
-	 */
-	public static function find($q = null)
-	{
-		$query = static::createQuery();
-		if (is_array($q)) {
-			return $query->where($q)->one();
-		} elseif ($q !== null) {
-			// query by primary key
-			$primaryKey = static::primaryKey();
-			if (isset($primaryKey[0])) {
-				return $query->where(array($primaryKey[0] => $q))->one();
-			} else {
-				throw new InvalidConfigException(get_called_class() . ' must have a primary key.');
-			}
-		}
-		return $query;
-	}
-
-	/**
-	 * Creates an [[ActiveQuery]] instance with a given SQL statement.
-	 *
-	 * Note that because the SQL statement is already specified, calling additional
-	 * query modification methods (such as `where()`, `order()`) on the created [[ActiveQuery]]
-	 * instance will have no effect. However, calling `with()`, `asArray()` or `indexBy()` is
-	 * still fine.
-	 *
-	 * Below is an example:
-	 *
-	 * ~~~
-	 * $customers = Customer::findBySql('SELECT * FROM tbl_customer')->all();
-	 * ~~~
-	 *
-	 * @param string $sql the SQL statement to be executed
-	 * @param array $params parameters to be bound to the SQL statement during execution.
-	 * @return ActiveQuery the newly created [[ActiveQuery]] instance
-	 */
-	public static function findBySql($sql, $params = array())
-	{
-		$query = static::createQuery();
-		$query->sql = $sql;
-		return $query->params($params);
-	}
-
-	/**
-	 * Updates the whole table using the provided attribute values and conditions.
-	 * For example, to change the status to be 1 for all customers whose status is 2:
-	 *
-	 * ~~~
-	 * Customer::updateAll(array('status' => 1), 'status = 2');
-	 * ~~~
-	 *
-	 * @param array $attributes attribute values (name-value pairs) to be saved into the table
-	 * @param string|array $condition the conditions that will be put in the WHERE part of the UPDATE SQL.
-	 * Please refer to [[Query::where()]] on how to specify this parameter.
-	 * @param array $params the parameters (name=>value) to be bound to the query.
-	 * @return integer the number of rows updated
-	 */
-	public static function updateAll($attributes, $condition = '', $params = array())
-	{
-		$command = static::getDb()->createCommand();
-		$command->update(static::tableName(), $attributes, $condition, $params);
-		return $command->execute();
-	}
-
-	/**
-	 * Updates the whole table using the provided counter changes and conditions.
-	 * For example, to increment all customers' age by 1,
-	 *
-	 * ~~~
-	 * Customer::updateAllCounters(array('age' => 1));
-	 * ~~~
-	 *
-	 * @param array $counters the counters to be updated (attribute name => increment value).
-	 * Use negative values if you want to decrement the counters.
-	 * @param string|array $condition the conditions that will be put in the WHERE part of the UPDATE SQL.
-	 * Please refer to [[Query::where()]] on how to specify this parameter.
-	 * @param array $params the parameters (name=>value) to be bound to the query.
-	 * Do not name the parameters as `:bp0`, `:bp1`, etc., because they are used internally by this method.
-	 * @return integer the number of rows updated
-	 */
-	public static function updateAllCounters($counters, $condition = '', $params = array())
-	{
-		$n = 0;
-		foreach ($counters as $name => $value) {
-			$counters[$name] = new Expression("[[$name]]+:bp{$n}", array(":bp{$n}" => $value));
-			$n++;
-		}
-		$command = static::getDb()->createCommand();
-		$command->update(static::tableName(), $counters, $condition, $params);
-		return $command->execute();
-	}
-
-	/**
-	 * Deletes rows in the table using the provided conditions.
-	 * WARNING: If you do not specify any condition, this method will delete ALL rows in the table.
-	 *
-	 * For example, to delete all customers whose status is 3:
-	 *
-	 * ~~~
-	 * Customer::deleteAll('status = 3');
-	 * ~~~
-	 *
-	 * @param string|array $condition the conditions that will be put in the WHERE part of the DELETE SQL.
-	 * Please refer to [[Query::where()]] on how to specify this parameter.
-	 * @param array $params the parameters (name=>value) to be bound to the query.
-	 * @return integer the number of rows deleted
-	 */
-	public static function deleteAll($condition = '', $params = array())
-	{
-		$command = static::getDb()->createCommand();
-		$command->delete(static::tableName(), $condition, $params);
-		return $command->execute();
-	}
-
-	/**
-	 * Creates an [[ActiveQuery]] instance.
-	 * This method is called by [[find()]], [[findBySql()]] and [[count()]] to start a SELECT query.
-	 * You may override this method to return a customized query (e.g. `CustomerQuery` specified
-	 * written for querying `Customer` purpose.)
-	 * @return ActiveQuery the newly created [[ActiveQuery]] instance.
-	 */
-	public static function createQuery()
-	{
-		return new ActiveQuery(array(
-			'modelClass' => get_called_class(),
-		));
-	}
-
-	/**
-	 * Declares the name of the database table associated with this AR class.
-	 * By default this method returns the class name as the table name by calling [[StringHelper::camel2id()]]
-	 * with prefix 'tbl_'. For example, 'Customer' becomes 'tbl_customer', and 'OrderItem' becomes
-	 * 'tbl_order_item'. You may override this method if the table is not named after this convention.
-	 * @return string the table name
-	 */
-	public static function tableName()
-	{
-		return 'tbl_' . StringHelper::camel2id(StringHelper::basename(get_called_class()), '_');
-	}
-
-	/**
-	 * Returns the schema information of the DB table associated with this AR class.
-	 * @return TableSchema the schema information of the DB table associated with this AR class.
-	 */
-	public static function getTableSchema()
-	{
-		return static::getDb()->getTableSchema(static::tableName());
-	}
-
-	/**
-	 * Returns the primary key name(s) for this AR class.
-	 * The default implementation will return the primary key(s) as declared
-	 * in the DB table that is associated with this AR class.
-	 *
-	 * If the DB table does not declare any primary key, you should override
-	 * this method to return the attributes that you want to use as primary keys
-	 * for this AR class.
-	 *
-	 * Note that an array should be returned even for a table with single primary key.
-	 *
-	 * @return string[] the primary keys of the associated database table.
-	 */
-	public static function primaryKey()
-	{
-		return static::getTableSchema()->primaryKey;
-	}
-
-	/**
-	 * Returns the name of the column that stores the lock version for implementing optimistic locking.
-	 *
-	 * Optimistic locking allows multiple users to access the same record for edits and avoids
-	 * potential conflicts. In case when a user attempts to save the record upon some staled data
-	 * (because another user has modified the data), a [[StaleObjectException]] exception will be thrown,
-	 * and the update or deletion is skipped.
-	 *
-	 * Optimized locking is only supported by [[update()]] and [[delete()]].
-	 *
-	 * To use optimized locking:
-	 *
-	 * 1. Create a column to store the version number of each row. The column type should be `BIGINT DEFAULT 0`.
-	 *    Override this method to return the name of this column.
-	 * 2. In the Web form that collects the user input, add a hidden field that stores
-	 *    the lock version of the recording being updated.
-	 * 3. In the controller action that does the data updating, try to catch the [[StaleObjectException]]
-	 *    and implement necessary business logic (e.g. merging the changes, prompting stated data)
-	 *    to resolve the conflict.
-	 *
-	 * @return string the column name that stores the lock version of a table row.
-	 * If null is returned (default implemented), optimistic locking will not be supported.
-	 */
-	public function optimisticLock()
-	{
-		return null;
-	}
-
-	/**
-	 * PHP getter magic method.
-	 * This method is overridden so that attributes and related objects can be accessed like properties.
-	 * @param string $name property name
-	 * @return mixed property value
-	 * @see getAttribute
-	 */
-	public function __get($name)
-	{
-		if (isset($this->_attributes[$name]) || array_key_exists($name, $this->_attributes)) {
-			return $this->_attributes[$name];
-		} elseif (isset($this->getTableSchema()->columns[$name])) {
-			return null;
-		} else {
-			$t = strtolower($name);
-			if (isset($this->_related[$t]) || $this->_related !== null && array_key_exists($t, $this->_related)) {
-				return $this->_related[$t];
-			}
-			$value = parent::__get($name);
-			if ($value instanceof ActiveRelation) {
-				return $this->_related[$t] = $value->multiple ? $value->all() : $value->one();
-			} else {
-				return $value;
-			}
-		}
-	}
-
-	/**
-	 * PHP setter magic method.
-	 * This method is overridden so that AR attributes can be accessed like properties.
-	 * @param string $name property name
-	 * @param mixed $value property value
-	 */
-	public function __set($name, $value)
-	{
-		if (isset($this->_attributes[$name]) || isset($this->getTableSchema()->columns[$name])) {
-			$this->_attributes[$name] = $value;
-		} else {
-			parent::__set($name, $value);
-		}
-	}
-
-	/**
-	 * Checks if a property value is null.
-	 * This method overrides the parent implementation by checking if the named attribute is null or not.
-	 * @param string $name the property name or the event name
-	 * @return boolean whether the property value is null
-	 */
-	public function __isset($name)
-	{
-		try {
-			return $this->__get($name) !== null;
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Sets a component property to be null.
-	 * This method overrides the parent implementation by clearing
-	 * the specified attribute value.
-	 * @param string $name the property name or the event name
-	 */
-	public function __unset($name)
-	{
-		if (isset($this->getTableSchema()->columns[$name])) {
-			unset($this->_attributes[$name]);
-		} else {
-			$t = strtolower($name);
-			if (isset($this->_related[$t])) {
-				unset($this->_related[$t]);
-			} else {
-				parent::__unset($name);
-			}
-		}
-	}
-
-	/**
-	 * Declares a `has-one` relation.
-	 * The declaration is returned in terms of an [[ActiveRelation]] instance
-	 * through which the related record can be queried and retrieved back.
-	 *
-	 * A `has-one` relation means that there is at most one related record matching
-	 * the criteria set by this relation, e.g., a customer has one country.
-	 *
-	 * For example, to declare the `country` relation for `Customer` class, we can write
-	 * the following code in the `Customer` class:
-	 *
-	 * ~~~
-	 * public function getCountry()
-	 * {
-	 *     return $this->hasOne('Country', array('id' => 'country_id'));
-	 * }
-	 * ~~~
-	 *
-	 * Note that in the above, the 'id' key in the `$link` parameter refers to an attribute name
-	 * in the related class `Country`, while the 'country_id' value refers to an attribute name
-	 * in the current AR class.
-	 *
-	 * Call methods declared in [[ActiveRelation]] to further customize the relation.
-	 *
-	 * @param string $class the class name of the related record
-	 * @param array $link the primary-foreign key constraint. The keys of the array refer to
-	 * the columns in the table associated with the `$class` model, while the values of the
-	 * array refer to the corresponding columns in the table associated with this AR class.
-	 * @return ActiveRelation the relation object.
-	 */
-	public function hasOne($class, $link)
-	{
-		return new ActiveRelation(array(
-			'modelClass' => $this->getNamespacedClass($class),
-			'primaryModel' => $this,
-			'link' => $link,
-			'multiple' => false,
-		));
-	}
-
-	/**
-	 * Declares a `has-many` relation.
-	 * The declaration is returned in terms of an [[ActiveRelation]] instance
-	 * through which the related record can be queried and retrieved back.
-	 *
-	 * A `has-many` relation means that there are multiple related records matching
-	 * the criteria set by this relation, e.g., a customer has many orders.
-	 *
-	 * For example, to declare the `orders` relation for `Customer` class, we can write
-	 * the following code in the `Customer` class:
-	 *
-	 * ~~~
-	 * public function getOrders()
-	 * {
-	 *     return $this->hasMany('Order', array('customer_id' => 'id'));
-	 * }
-	 * ~~~
-	 *
-	 * Note that in the above, the 'customer_id' key in the `$link` parameter refers to
-	 * an attribute name in the related class `Order`, while the 'id' value refers to
-	 * an attribute name in the current AR class.
-	 *
-	 * @param string $class the class name of the related record
-	 * @param array $link the primary-foreign key constraint. The keys of the array refer to
-	 * the columns in the table associated with the `$class` model, while the values of the
-	 * array refer to the corresponding columns in the table associated with this AR class.
-	 * @return ActiveRelation the relation object.
-	 */
-	public function hasMany($class, $link)
-	{
-		return new ActiveRelation(array(
-			'modelClass' => $this->getNamespacedClass($class),
-			'primaryModel' => $this,
-			'link' => $link,
-			'multiple' => true,
-		));
-	}
-
-	/**
-	 * Populates the named relation with the related records.
-	 * Note that this method does not check if the relation exists or not.
-	 * @param string $name the relation name (case-insensitive)
-	 * @param ActiveRecord|array|null the related records to be populated into the relation.
-	 */
-	public function populateRelation($name, $records)
-	{
-		$this->_related[strtolower($name)] = $records;
-	}
-
-	/**
-	 * Returns the list of all attribute names of the model.
-	 * The default implementation will return all column names of the table associated with this AR class.
-	 * @return array list of attribute names.
-	 */
-	public function attributes()
-	{
-		return array_keys($this->getTableSchema()->columns);
-	}
-
-	/**
-	 * Returns the named attribute value.
-	 * If this record is the result of a query and the attribute is not loaded,
-	 * null will be returned.
-	 * @param string $name the attribute name
-	 * @return mixed the attribute value. Null if the attribute is not set or does not exist.
-	 * @see hasAttribute
-	 */
-	public function getAttribute($name)
-	{
-		return isset($this->_attributes[$name]) ? $this->_attributes[$name] : null;
-	}
-
-	/**
-	 * Sets the named attribute value.
-	 * @param string $name the attribute name
-	 * @param mixed $value the attribute value.
-	 * @see hasAttribute
-	 */
-	public function setAttribute($name, $value)
-	{
-		$this->_attributes[$name] = $value;
-	}
-
-	/**
-	 * Returns the old attribute values.
-	 * @return array the old attribute values (name-value pairs)
-	 */
-	public function getOldAttributes()
-	{
-		return $this->_oldAttributes === null ? array() : $this->_oldAttributes;
-	}
-
-	/**
-	 * Sets the old attribute values.
-	 * All existing old attribute values will be discarded.
-	 * @param array $values old attribute values to be set.
-	 */
-	public function setOldAttributes($values)
-	{
-		$this->_oldAttributes = $values;
-	}
-
-	/**
-	 * Returns the old value of the named attribute.
-	 * If this record is the result of a query and the attribute is not loaded,
-	 * null will be returned.
-	 * @param string $name the attribute name
-	 * @return mixed the old attribute value. Null if the attribute is not loaded before
-	 * or does not exist.
-	 * @see hasAttribute
-	 */
-	public function getOldAttribute($name)
-	{
-		return isset($this->_oldAttributes[$name]) ? $this->_oldAttributes[$name] : null;
-	}
-
-	/**
-	 * Sets the old value of the named attribute.
-	 * @param string $name the attribute name
-	 * @param mixed $value the old attribute value.
-	 * @see hasAttribute
-	 */
-	public function setOldAttribute($name, $value)
-	{
-		$this->_oldAttributes[$name] = $value;
-	}
-
-	/**
-	 * Returns a value indicating whether the named attribute has been changed.
-	 * @param string $name the name of the attribute
-	 * @return boolean whether the attribute has been changed
-	 */
-	public function isAttributeChanged($name)
-	{
-		if (isset($this->_attributes[$name], $this->_oldAttributes[$name])) {
-			return $this->_attributes[$name] !== $this->_oldAttributes[$name];
-		} else {
-			return isset($this->_attributes[$name]) || isset($this->_oldAttributes);
-		}
-	}
-
-	/**
-	 * Returns the attribute values that have been modified since they are loaded or saved most recently.
-	 * @param string[]|null $names the names of the attributes whose values may be returned if they are
-	 * changed recently. If null, [[attributes()]] will be used.
-	 * @return array the changed attribute values (name-value pairs)
-	 */
-	public function getDirtyAttributes($names = null)
-	{
-		if ($names === null) {
-			$names = $this->attributes();
-		}
-		$names = array_flip($names);
-		$attributes = array();
-		if ($this->_oldAttributes === null) {
-			foreach ($this->_attributes as $name => $value) {
-				if (isset($names[$name])) {
-					$attributes[$name] = $value;
-				}
-			}
-		} else {
-			foreach ($this->_attributes as $name => $value) {
-				if (isset($names[$name]) && (!array_key_exists($name, $this->_oldAttributes) || $value !== $this->_oldAttributes[$name])) {
-					$attributes[$name] = $value;
-				}
-			}
-		}
-		return $attributes;
-	}
-
-	/**
-	 * Saves the current record.
-	 *
-	 * This method will call [[insert()]] when [[isNewRecord]] is true, or [[update()]]
-	 * when [[isNewRecord]] is false.
-	 *
-	 * For example, to save a customer record:
-	 *
-	 * ~~~
-	 * $customer = new Customer;  // or $customer = Customer::find($id);
-	 * $customer->name = $name;
-	 * $customer->email = $email;
-	 * $customer->save();
-	 * ~~~
-	 *
-	 *
-	 * @param boolean $runValidation whether to perform validation before saving the record.
-	 * If the validation fails, the record will not be saved to database.
-	 * @param array $attributes list of attributes that need to be saved. Defaults to null,
-	 * meaning all attributes that are loaded from DB will be saved.
-	 * @return boolean whether the saving succeeds
-	 */
-	public function save($runValidation = true, $attributes = null)
-	{
-		if ($this->getIsNewRecord()) {
-			return $this->insert($runValidation, $attributes);
-		} else {
-			return $this->update($runValidation, $attributes) !== false;
-		}
-	}
-
-	/**
-	 * Inserts a row into the associated database table using the attribute values of this record.
-	 *
-	 * This method performs the following steps in order:
-	 *
-	 * 1. call [[beforeValidate()]] when `$runValidation` is true. If validation
-	 *    fails, it will skip the rest of the steps;
-	 * 2. call [[afterValidate()]] when `$runValidation` is true.
-	 * 3. call [[beforeSave()]]. If the method returns false, it will skip the
-	 *    rest of the steps;
-	 * 4. insert the record into database. If this fails, it will skip the rest of the steps;
-	 * 5. call [[afterSave()]];
-	 *
-	 * In the above step 1, 2, 3 and 5, events [[EVENT_BEFORE_VALIDATE]],
-	 * [[EVENT_BEFORE_INSERT]], [[EVENT_AFTER_INSERT]] and [[EVENT_AFTER_VALIDATE]]
-	 * will be raised by the corresponding methods.
-	 *
-	 * Only the [[changedAttributes|changed attribute values]] will be inserted into database.
-	 *
-	 * If the table's primary key is auto-incremental and is null during insertion,
-	 * it will be populated with the actual value after insertion.
-	 *
-	 * For example, to insert a customer record:
-	 *
-	 * ~~~
-	 * $customer = new Customer;
-	 * $customer->name = $name;
-	 * $customer->email = $email;
-	 * $customer->insert();
-	 * ~~~
-	 *
-	 * @param boolean $runValidation whether to perform validation before saving the record.
-	 * If the validation fails, the record will not be inserted into the database.
-	 * @param array $attributes list of attributes that need to be saved. Defaults to null,
-	 * meaning all attributes that are loaded from DB will be saved.
-	 * @return boolean whether the attributes are valid and the record is inserted successfully.
-	 */
-	public function insert($runValidation = true, $attributes = null)
-	{
-		if ($runValidation && !$this->validate($attributes) || !$this->beforeSave(true)) {
-			return false;
-		}
-		$values = $this->getDirtyAttributes($attributes);
-		if (empty($values)) {
-			foreach ($this->primaryKey() as $key) {
-				$values[$key] = isset($this->_attributes[$key]) ? $this->_attributes[$key] : null;
-			}
-		}
-		$db = static::getDb();
-		$command = $db->createCommand()->insert($this->tableName(), $values);
-		if ($command->execute()) {
-			$table = $this->getTableSchema();
-			if ($table->sequenceName !== null) {
-				foreach ($table->primaryKey as $name) {
-					if (!isset($this->_attributes[$name])) {
-						$this->_oldAttributes[$name] = $this->_attributes[$name] = $db->getLastInsertID($table->sequenceName);
-						break;
-					}
-				}
-			}
-			foreach ($values as $name => $value) {
-				$this->_oldAttributes[$name] = $value;
-			}
-			$this->afterSave(true);
-			return true;
-		}
-	}
-
-	/**
-	 * Saves the changes to this active record into the associated database table.
-	 *
-	 * This method performs the following steps in order:
-	 *
-	 * 1. call [[beforeValidate()]] when `$runValidation` is true. If validation
-	 *    fails, it will skip the rest of the steps;
-	 * 2. call [[afterValidate()]] when `$runValidation` is true.
-	 * 3. call [[beforeSave()]]. If the method returns false, it will skip the
-	 *    rest of the steps;
-	 * 4. save the record into database. If this fails, it will skip the rest of the steps;
-	 * 5. call [[afterSave()]];
-	 *
-	 * In the above step 1, 2, 3 and 5, events [[EVENT_BEFORE_VALIDATE]],
-	 * [[EVENT_BEFORE_UPDATE]], [[EVENT_AFTER_UPDATE]] and [[EVENT_AFTER_VALIDATE]]
-	 * will be raised by the corresponding methods.
-	 *
-	 * Only the [[changedAttributes|changed attribute values]] will be saved into database.
-	 *
-	 * For example, to update a customer record:
-	 *
-	 * ~~~
-	 * $customer = Customer::find($id);
-	 * $customer->name = $name;
-	 * $customer->email = $email;
-	 * $customer->update();
-	 * ~~~
-	 *
-	 * Note that it is possible the update does not affect any row in the table.
-	 * In this case, this method will return 0. For this reason, you should use the following
-	 * code to check if update() is successful or not:
-	 *
-	 * ~~~
-	 * if ($this->update() !== false) {
-	 *     // update successful
-	 * } else {
-	 *     // update failed
-	 * }
-	 * ~~~
-	 *
-	 * @param boolean $runValidation whether to perform validation before saving the record.
-	 * If the validation fails, the record will not be inserted into the database.
-	 * @param array $attributes list of attributes that need to be saved. Defaults to null,
-	 * meaning all attributes that are loaded from DB will be saved.
-	 * @return integer|boolean the number of rows affected, or false if validation fails
-	 * or [[beforeSave()]] stops the updating process.
-	 * @throws StaleObjectException if [[optimisticLock|optimistic locking]] is enabled and the data
-	 * being updated is outdated.
-	 */
-	public function update($runValidation = true, $attributes = null)
-	{
-		if ($runValidation && !$this->validate($attributes) || !$this->beforeSave(false)) {
-			return false;
-		}
-		$values = $this->getDirtyAttributes($attributes);
-		if (!empty($values)) {
-			$condition = $this->getOldPrimaryKey(true);
-			$lock = $this->optimisticLock();
-			if ($lock !== null) {
-				if (!isset($values[$lock])) {
-					$values[$lock] = $this->$lock + 1;
-				}
-				$condition[$lock] = $this->$lock;
-			}
-			// We do not check the return value of updateAll() because it's possible
-			// that the UPDATE statement doesn't change anything and thus returns 0.
-			$rows = $this->updateAll($values, $condition);
-
-			if ($lock !== null && !$rows) {
-				throw new StaleObjectException('The object being updated is outdated.');
-			}
-
-			foreach ($values as $name => $value) {
-				$this->_oldAttributes[$name] = $this->_attributes[$name];
-			}
-
-			$this->afterSave(false);
-			return $rows;
-		} else {
-			return 0;
-		}
-	}
-
-	/**
-	 * Updates one or several counter columns for the current AR object.
-	 * Note that this method differs from [[updateAllCounters()]] in that it only
-	 * saves counters for the current AR object.
-	 *
-	 * An example usage is as follows:
-	 *
-	 * ~~~
-	 * $post = Post::find($id);
-	 * $post->updateCounters(array('view_count' => 1));
-	 * ~~~
-	 *
-	 * @param array $counters the counters to be updated (attribute name => increment value)
-	 * Use negative values if you want to decrement the counters.
-	 * @return boolean whether the saving is successful
-	 * @see updateAllCounters()
-	 */
-	public function updateCounters($counters)
-	{
-		if ($this->updateAllCounters($counters, $this->getOldPrimaryKey(true)) > 0) {
-			foreach ($counters as $name => $value) {
-				$this->_attributes[$name] += $value;
-				$this->_oldAttributes[$name] = $this->_attributes[$name];
-			}
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Deletes the table row corresponding to this active record.
-	 *
-	 * This method performs the following steps in order:
-	 *
-	 * 1. call [[beforeDelete()]]. If the method returns false, it will skip the
-	 *    rest of the steps;
-	 * 2. delete the record from the database;
-	 * 3. call [[afterDelete()]].
-	 *
-	 * In the above step 1 and 3, events named [[EVENT_BEFORE_DELETE]] and [[EVENT_AFTER_DELETE]]
-	 * will be raised by the corresponding methods.
-	 *
-	 * @return integer|boolean the number of rows deleted, or false if the deletion is unsuccessful for some reason.
-	 * Note that it is possible the number of rows deleted is 0, even though the deletion execution is successful.
-	 * @throws StaleObjectException if [[optimisticLock|optimistic locking]] is enabled and the data
-	 * being deleted is outdated.
-	 */
-	public function delete()
-	{
-		if ($this->beforeDelete()) {
-			// we do not check the return value of deleteAll() because it's possible
-			// the record is already deleted in the database and thus the method will return 0
-			$condition = $this->getOldPrimaryKey(true);
-			$lock = $this->optimisticLock();
-			if ($lock !== null) {
-				$condition[$lock] = $this->$lock;
-			}
-			$rows = $this->deleteAll($condition);
-			if ($lock !== null && !$rows) {
-				throw new StaleObjectException('The object being deleted is outdated.');
-			}
-			$this->_oldAttributes = null;
-			$this->afterDelete();
-			return $rows;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Returns a value indicating whether the current record is new.
-	 * @return boolean whether the record is new and should be inserted when calling [[save()]].
-	 */
-	public function getIsNewRecord()
-	{
-		return $this->_oldAttributes === null;
-	}
-
-	/**
-	 * Initializes the object.
-	 * This method is called at the end of the constructor.
-	 * The default implementation will trigger an [[EVENT_INIT]] event.
-	 * If you override this method, make sure you call the parent implementation at the end
-	 * to ensure triggering of the event.
-	 */
-	public function init()
-	{
-		parent::init();
-		$this->trigger(self::EVENT_INIT);
-	}
-
-	/**
-	 * This method is called when the AR object is created and populated with the query result.
-	 * The default implementation will trigger an [[EVENT_AFTER_FIND]] event.
-	 * When overriding this method, make sure you call the parent implementation to ensure the
-	 * event is triggered.
-	 */
-	public function afterFind()
-	{
-		$this->trigger(self::EVENT_AFTER_FIND);
-	}
-
-	/**
-	 * Sets the value indicating whether the record is new.
-	 * @param boolean $value whether the record is new and should be inserted when calling [[save()]].
-	 * @see getIsNewRecord
-	 */
-	public function setIsNewRecord($value)
-	{
-		$this->_oldAttributes = $value ? null : $this->_attributes;
-	}
-
-	/**
-	 * This method is called at the beginning of inserting or updating a record.
-	 * The default implementation will trigger an [[EVENT_BEFORE_INSERT]] event when `$insert` is true,
-	 * or an [[EVENT_BEFORE_UPDATE]] event if `$insert` is false.
-	 * When overriding this method, make sure you call the parent implementation like the following:
-	 *
-	 * ~~~
-	 * public function beforeSave($insert)
-	 * {
-	 *     if (parent::beforeSave($insert)) {
-	 *         // ...custom code here...
-	 *         return true;
-	 *     } else {
-	 *         return false;
-	 *     }
-	 * }
-	 * ~~~
-	 *
-	 * @param boolean $insert whether this method called while inserting a record.
-	 * If false, it means the method is called while updating a record.
-	 * @return boolean whether the insertion or updating should continue.
-	 * If false, the insertion or updating will be cancelled.
-	 */
-	public function beforeSave($insert)
-	{
-		$event = new ModelEvent;
-		$this->trigger($insert ? self::EVENT_BEFORE_INSERT : self::EVENT_BEFORE_UPDATE, $event);
-		return $event->isValid;
-	}
-
-	/**
-	 * This method is called at the end of inserting or updating a record.
-	 * The default implementation will trigger an [[EVENT_AFTER_INSERT]] event when `$insert` is true,
-	 * or an [[EVENT_AFTER_UPDATE]] event if `$insert` is false.
-	 * When overriding this method, make sure you call the parent implementation so that
-	 * the event is triggered.
-	 * @param boolean $insert whether this method called while inserting a record.
-	 * If false, it means the method is called while updating a record.
-	 */
-	public function afterSave($insert)
-	{
-		$this->trigger($insert ? self::EVENT_AFTER_INSERT : self::EVENT_AFTER_UPDATE);
-	}
-
-	/**
-	 * This method is invoked before deleting a record.
-	 * The default implementation raises the [[EVENT_BEFORE_DELETE]] event.
-	 * When overriding this method, make sure you call the parent implementation like the following:
-	 *
-	 * ~~~
-	 * public function beforeDelete()
-	 * {
-	 *     if (parent::beforeDelete()) {
-	 *         // ...custom code here...
-	 *         return true;
-	 *     } else {
-	 *         return false;
-	 *     }
-	 * }
-	 * ~~~
-	 *
-	 * @return boolean whether the record should be deleted. Defaults to true.
-	 */
-	public function beforeDelete()
-	{
-		$event = new ModelEvent;
-		$this->trigger(self::EVENT_BEFORE_DELETE, $event);
-		return $event->isValid;
-	}
-
-	/**
-	 * This method is invoked after deleting a record.
-	 * The default implementation raises the [[EVENT_AFTER_DELETE]] event.
-	 * You may override this method to do postprocessing after the record is deleted.
-	 * Make sure you call the parent implementation so that the event is raised properly.
-	 */
-	public function afterDelete()
-	{
-		$this->trigger(self::EVENT_AFTER_DELETE);
-	}
-
-	/**
-	 * Repopulates this active record with the latest data.
-	 * @param array $attributes
-	 * @return boolean whether the row still exists in the database. If true, the latest data
-	 * will be populated to this active record.
-	 */
-	public function refresh($attributes = null)
-	{
-		$record = $this->find($this->getPrimaryKey(true));
-		if ($record === null) {
-			return false;
-		}
-		if ($attributes === null) {
-			foreach ($this->attributes() as $name) {
-				$this->_attributes[$name] = $record->_attributes[$name];
-			}
-			$this->_oldAttributes = $this->_attributes;
-		} else {
-			foreach ($attributes as $name) {
-				$this->_oldAttributes[$name] = $this->_attributes[$name] = $record->_attributes[$name];
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Returns a value indicating whether the given active record is the same as the current one.
-	 * The comparison is made by comparing the table names and the primary key values of the two active records.
-	 * @param ActiveRecord $record record to compare to
-	 * @return boolean whether the two active records refer to the same row in the same database table.
-	 */
-	public function equals($record)
-	{
-		return $this->tableName() === $record->tableName() && $this->getPrimaryKey() === $record->getPrimaryKey();
-	}
-
-	/**
-	 * Returns the primary key value(s).
-	 * @param boolean $asArray whether to return the primary key value as an array. If true,
-	 * the return value will be an array with column names as keys and column values as values.
-	 * Note that for composite primary keys, an array will always be returned regardless of this parameter value.
-	 * @return mixed the primary key value. An array (column name=>column value) is returned if the primary key
-	 * is composite or `$asArray` is true. A string is returned otherwise (null will be returned if
-	 * the key value is null).
-	 */
-	public function getPrimaryKey($asArray = false)
-	{
-		$keys = $this->primaryKey();
-		if (count($keys) === 1 && !$asArray) {
-			return isset($this->_attributes[$keys[0]]) ? $this->_attributes[$keys[0]] : null;
-		} else {
-			$values = array();
-			foreach ($keys as $name) {
-				$values[$name] = isset($this->_attributes[$name]) ? $this->_attributes[$name] : null;
-			}
-			return $values;
-		}
-	}
-
-	/**
-	 * Returns the old primary key value(s).
-	 * This refers to the primary key value that is populated into the record
-	 * after executing a find method (e.g. find(), findAll()).
-	 * The value remains unchanged even if the primary key attribute is manually assigned with a different value.
-	 * @param boolean $asArray whether to return the primary key value as an array. If true,
-	 * the return value will be an array with column name as key and column value as value.
-	 * If this is false (default), a scalar value will be returned for non-composite primary key.
-	 * @return mixed the old primary key value. An array (column name=>column value) is returned if the primary key
-	 * is composite or `$asArray` is true. A string is returned otherwise (null will be returned if
-	 * the key value is null).
-	 */
-	public function getOldPrimaryKey($asArray = false)
-	{
-		$keys = $this->primaryKey();
-		if (count($keys) === 1 && !$asArray) {
-			return isset($this->_oldAttributes[$keys[0]]) ? $this->_oldAttributes[$keys[0]] : null;
-		} else {
-			$values = array();
-			foreach ($keys as $name) {
-				$values[$name] = isset($this->_oldAttributes[$name]) ? $this->_oldAttributes[$name] : null;
-			}
-			return $values;
-		}
-	}
-
-	/**
-	 * Creates an active record object using a row of data.
-	 * This method is called by [[ActiveQuery]] to populate the query results
-	 * into Active Records.
-	 * @param array $row attribute values (name => value)
-	 * @return ActiveRecord the newly created active record.
-	 */
-	public static function create($row)
-	{
-		$record = static::instantiate($row);
-		$columns = static::getTableSchema()->columns;
-		foreach ($row as $name => $value) {
-			if (isset($columns[$name])) {
-				$record->_attributes[$name] = $value;
-			} else {
-				$record->$name = $value;
-			}
-		}
-		$record->_oldAttributes = $record->_attributes;
-		$record->afterFind();
-		return $record;
-	}
-
-	/**
-	 * Creates an active record instance.
-	 * This method is called by [[create()]].
-	 * You may override this method if the instance being created
-	 * depends on the row data to be populated into the record.
-	 * For example, by creating a record based on the value of a column,
-	 * you may implement the so-called single-table inheritance mapping.
-	 * @param array $row row data to be populated into the record.
-	 * @return ActiveRecord the newly created active record
-	 */
-	public static function instantiate($row)
-	{
-		return new static;
-	}
-
-	/**
-	 * Returns whether there is an element at the specified offset.
-	 * This method is required by the interface ArrayAccess.
-	 * @param mixed $offset the offset to check on
-	 * @return boolean whether there is an element at the specified offset.
-	 */
-	public function offsetExists($offset)
-	{
-		return $this->__isset($offset);
-	}
-
-	/**
-	 * Returns the relation object with the specified name.
-	 * A relation is defined by a getter method which returns an [[ActiveRelation]] object.
-	 * It can be declared in either the Active Record class itself or one of its behaviors.
-	 * @param string $name the relation name
-	 * @return ActiveRelation the relation object
-	 * @throws InvalidParamException if the named relation does not exist.
-	 */
-	public function getRelation($name)
-	{
-		$getter = 'get' . $name;
-		try {
-			$relation = $this->$getter();
-			if ($relation instanceof ActiveRelation) {
-				return $relation;
-			}
-		} catch (UnknownMethodException $e) {
-			throw new InvalidParamException(get_class($this) . ' has no relation named "' . $name . '".');
-		}
-	}
-
-	/**
-	 * Establishes the relationship between two models.
-	 *
-	 * The relationship is established by setting the foreign key value(s) in one model
-	 * to be the corresponding primary key value(s) in the other model.
-	 * The model with the foreign key will be saved into database without performing validation.
-	 *
-	 * If the relationship involves a pivot table, a new row will be inserted into the
-	 * pivot table which contains the primary key values from both models.
-	 *
-	 * Note that this method requires that the primary key value is not null.
-	 *
-	 * @param string $name the name of the relationship
-	 * @param ActiveRecord $model the model to be linked with the current one.
-	 * @param array $extraColumns additional column values to be saved into the pivot table.
-	 * This parameter is only meaningful for a relationship involving a pivot table
-	 * (i.e., a relation set with `[[ActiveRelation::via()]]` or `[[ActiveRelation::viaTable()]]`.)
-	 * @throws InvalidCallException if the method is unable to link two models.
-	 */
-	public function link($name, $model, $extraColumns = array())
-	{
-		$relation = $this->getRelation($name);
-
-		if ($relation->via !== null) {
-			if (is_array($relation->via)) {
-				/** @var $viaRelation ActiveRelation */
-				list($viaName, $viaRelation) = $relation->via;
-				/** @var $viaClass ActiveRecord */
-				$viaClass = $viaRelation->modelClass;
-				$viaTable = $viaClass::tableName();
-				// unset $viaName so that it can be reloaded to reflect the change
-				unset($this->_related[strtolower($viaName)]);
-			} else {
-				$viaRelation = $relation->via;
-				$viaTable = reset($relation->via->from);
-			}
-			$columns = array();
-			foreach ($viaRelation->link as $a => $b) {
-				$columns[$a] = $this->$b;
-			}
-			foreach ($relation->link as $a => $b) {
-				$columns[$b] = $model->$a;
-			}
-			foreach ($extraColumns as $k => $v) {
-				$columns[$k] = $v;
-			}
-			static::getDb()->createCommand()
-				->insert($viaTable, $columns)->execute();
-		} else {
-			$p1 = $model->isPrimaryKey(array_keys($relation->link));
-			$p2 = $this->isPrimaryKey(array_values($relation->link));
-			if ($p1 && $p2) {
-				if ($this->getIsNewRecord() && $model->getIsNewRecord()) {
-					throw new InvalidCallException('Unable to link models: both models are newly created.');
-				} elseif ($this->getIsNewRecord()) {
-					$this->bindModels(array_flip($relation->link), $this, $model);
-				} else {
-					$this->bindModels($relation->link, $model, $this);
-				}
-			} elseif ($p1) {
-				$this->bindModels(array_flip($relation->link), $this, $model);
-			} elseif ($p2) {
-				$this->bindModels($relation->link, $model, $this);
-			} else {
-				throw new InvalidCallException('Unable to link models: the link does not involve any primary key.');
-			}
-		}
-
-		// update lazily loaded related objects
-		if (!$relation->multiple) {
-			$this->_related[$name] = $model;
-		} elseif (isset($this->_related[$name])) {
-			if ($relation->indexBy !== null) {
-				$indexBy = $relation->indexBy;
-				$this->_related[$name][$model->$indexBy] = $model;
-			} else {
-				$this->_related[$name][] = $model;
-			}
-		}
-	}
-
-	/**
-	 * Destroys the relationship between two models.
-	 *
-	 * The model with the foreign key of the relationship will be deleted if `$delete` is true.
-	 * Otherwise, the foreign key will be set null and the model will be saved without validation.
-	 *
-	 * @param string $name the name of the relationship.
-	 * @param ActiveRecord $model the model to be unlinked from the current one.
-	 * @param boolean $delete whether to delete the model that contains the foreign key.
-	 * If false, the model's foreign key will be set null and saved.
-	 * If true, the model containing the foreign key will be deleted.
-	 * @throws InvalidCallException if the models cannot be unlinked
-	 */
-	public function unlink($name, $model, $delete = false)
-	{
-		$relation = $this->getRelation($name);
-
-		if ($relation->via !== null) {
-			if (is_array($relation->via)) {
-				/** @var $viaRelation ActiveRelation */
-				list($viaName, $viaRelation) = $relation->via;
-				/** @var $viaClass ActiveRecord */
-				$viaClass = $viaRelation->modelClass;
-				$viaTable = $viaClass::tableName();
-				unset($this->_related[strtolower($viaName)]);
-			} else {
-				$viaRelation = $relation->via;
-				$viaTable = reset($relation->via->from);
-			}
-			$columns = array();
-			foreach ($viaRelation->link as $a => $b) {
-				$columns[$a] = $this->$b;
-			}
-			foreach ($relation->link as $a => $b) {
-				$columns[$b] = $model->$a;
-			}
-			$command = static::getDb()->createCommand();
-			if ($delete) {
-				$command->delete($viaTable, $columns)->execute();
-			} else {
-				$nulls = array();
-				foreach (array_keys($columns) as $a) {
-					$nulls[$a] = null;
-				}
-				$command->update($viaTable, $nulls, $columns)->execute();
-			}
-		} else {
-			$p1 = $model->isPrimaryKey(array_keys($relation->link));
-			$p2 = $this->isPrimaryKey(array_values($relation->link));
-			if ($p1 && $p2 || $p2) {
-				foreach ($relation->link as $a => $b) {
-					$model->$a = null;
-				}
-				$delete ? $model->delete() : $model->save(false);
-			} elseif ($p1) {
-				foreach ($relation->link as $b) {
-					$this->$b = null;
-				}
-				$delete ? $this->delete() : $this->save(false);
-			} else {
-				throw new InvalidCallException('Unable to unlink models: the link does not involve any primary key.');
-			}
-		}
-
-		if (!$relation->multiple) {
-			unset($this->_related[$name]);
-		} elseif (isset($this->_related[$name])) {
-			/** @var $b ActiveRecord */
-			foreach ($this->_related[$name] as $a => $b) {
-				if ($model->getPrimaryKey() == $b->getPrimaryKey()) {
-					unset($this->_related[$name][$a]);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Changes the given class name into a namespaced one.
-	 * If the given class name is already namespaced, no change will be made.
-	 * Otherwise, the class name will be changed to use the same namespace as
-	 * the current AR class.
-	 * @param string $class the class name to be namespaced
-	 * @return string the namespaced class name
-	 */
-	protected function getNamespacedClass($class)
-	{
-		if (strpos($class, '\\') === false) {
-			$primaryClass = get_class($this);
-			if (($pos = strrpos($primaryClass, '\\')) !== false) {
-				return substr($primaryClass, 0, $pos + 1) . $class;
-			}
-		}
-		return $class;
-	}
-
-	/**
-	 * @param array $link
-	 * @param ActiveRecord $foreignModel
-	 * @param ActiveRecord $primaryModel
-	 * @throws InvalidCallException
-	 */
-	private function bindModels($link, $foreignModel, $primaryModel)
-	{
-		foreach ($link as $fk => $pk) {
-			$value = $primaryModel->$pk;
-			if ($value === null) {
-				throw new InvalidCallException('Unable to link models: the primary key of ' . get_class($primaryModel) . ' is null.');
-			}
-			$foreignModel->$fk = $value;
-		}
-		$foreignModel->save(false);
-	}
-
-	/**
-	 * @param array $keys
-	 * @return boolean
-	 */
-	private function isPrimaryKey($keys)
-	{
-		$pks = $this->primaryKey();
-		foreach ($keys as $key) {
-			if (!in_array($key, $pks, true)) {
-				return false;
-			}
-		}
-		return true;
-	}
-}
diff --git a/framework/db/ActiveRelation.php b/framework/db/ActiveRelation.php
deleted file mode 100644
index 42ae0e7..0000000
--- a/framework/db/ActiveRelation.php
+++ /dev/null
@@ -1,304 +0,0 @@
-<?php
-/**
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\db;
-
-use yii\db\Connection;
-use yii\db\Command;
-use yii\base\InvalidConfigException;
-
-/**
- * ActiveRelation represents a relation between two Active Record classes.
- *
- * ActiveRelation instances are usually created by calling [[ActiveRecord::hasOne()]] and
- * [[ActiveRecord::hasMany()]]. An Active Record class declares a relation by defining
- * a getter method which calls one of the above methods and returns the created ActiveRelation object.
- *
- * A relation is specified by [[link]] which represents the association between columns
- * of different tables; and the multiplicity of the relation is indicated by [[multiple]].
- *
- * If a relation involves a pivot table, it may be specified by [[via()]] or [[viaTable()]] method.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class ActiveRelation extends ActiveQuery
-{
-	/**
-	 * @var boolean whether this relation should populate all query results into AR instances.
-	 * If false, only the first row of the results will be retrieved.
-	 */
-	public $multiple;
-	/**
-	 * @var ActiveRecord the primary model that this relation is associated with.
-	 * This is used only in lazy loading with dynamic query options.
-	 */
-	public $primaryModel;
-	/**
-	 * @var array the columns of the primary and foreign tables that establish the relation.
-	 * The array keys must be columns of the table for this relation, and the array values
-	 * must be the corresponding columns from the primary table.
-	 * Do not prefix or quote the column names as they will be done automatically by Yii.
-	 */
-	public $link;
-	/**
-	 * @var array|ActiveRelation the query associated with the pivot table. Please call [[via()]]
-	 * or [[viaTable()]] to set this property instead of directly setting it.
-	 */
-	public $via;
-
-	/**
-	 * Specifies the relation associated with the pivot table.
-	 * @param string $relationName the relation name. This refers to a relation declared in [[primaryModel]].
-	 * @param callable $callable a PHP callback for customizing the relation associated with the pivot table.
-	 * Its signature should be `function($query)`, where `$query` is the query to be customized.
-	 * @return ActiveRelation the relation object itself.
-	 */
-	public function via($relationName, $callable = null)
-	{
-		$relation = $this->primaryModel->getRelation($relationName);
-		$this->via = array($relationName, $relation);
-		if ($callable !== null) {
-			call_user_func($callable, $relation);
-		}
-		return $this;
-	}
-
-	/**
-	 * Specifies the pivot table.
-	 * @param string $tableName the name of the pivot table.
-	 * @param array $link the link between the pivot table and the table associated with [[primaryModel]].
-	 * The keys of the array represent the columns in the pivot table, and the values represent the columns
-	 * in the [[primaryModel]] table.
-	 * @param callable $callable a PHP callback for customizing the relation associated with the pivot table.
-	 * Its signature should be `function($query)`, where `$query` is the query to be customized.
-	 * @return ActiveRelation
-	 */
-	public function viaTable($tableName, $link, $callable = null)
-	{
-		$relation = new ActiveRelation(array(
-			'modelClass' => get_class($this->primaryModel),
-			'from' => array($tableName),
-			'link' => $link,
-			'multiple' => true,
-			'asArray' => true,
-		));
-		$this->via = $relation;
-		if ($callable !== null) {
-			call_user_func($callable, $relation);
-		}
-		return $this;
-	}
-
-	/**
-	 * Creates a DB command that can be used to execute this query.
-	 * @param Connection $db the DB connection used to create the DB command.
-	 * If null, the DB connection returned by [[modelClass]] will be used.
-	 * @return Command the created DB command instance.
-	 */
-	public function createCommand($db = null)
-	{
-		if ($this->primaryModel !== null) {
-			// lazy loading
-			if ($this->via instanceof self) {
-				// via pivot table
-				$viaModels = $this->via->findPivotRows(array($this->primaryModel));
-				$this->filterByModels($viaModels);
-			} elseif (is_array($this->via)) {
-				// via relation
-				/** @var $viaQuery ActiveRelation */
-				list($viaName, $viaQuery) = $this->via;
-				if ($viaQuery->multiple) {
-					$viaModels = $viaQuery->all();
-					$this->primaryModel->populateRelation($viaName, $viaModels);
-				} else {
-					$model = $viaQuery->one();
-					$this->primaryModel->populateRelation($viaName, $model);
-					$viaModels = $model === null ? array() : array($model);
-				}
-				$this->filterByModels($viaModels);
-			} else {
-				$this->filterByModels(array($this->primaryModel));
-			}
-		}
-		return parent::createCommand($db);
-	}
-
-	/**
-	 * Finds the related records and populates them into the primary models.
-	 * This method is internally used by [[ActiveQuery]]. Do not call it directly.
-	 * @param string $name the relation name
-	 * @param array $primaryModels primary models
-	 * @return array the related models
-	 * @throws InvalidConfigException
-	 */
-	public function findWith($name, &$primaryModels)
-	{
-		if (!is_array($this->link)) {
-			throw new InvalidConfigException('Invalid link: it must be an array of key-value pairs.');
-		}
-
-		if ($this->via instanceof self) {
-			// via pivot table
-			/** @var $viaQuery ActiveRelation */
-			$viaQuery = $this->via;
-			$viaModels = $viaQuery->findPivotRows($primaryModels);
-			$this->filterByModels($viaModels);
-		} elseif (is_array($this->via)) {
-			// via relation
-			/** @var $viaQuery ActiveRelation */
-			list($viaName, $viaQuery) = $this->via;
-			$viaQuery->primaryModel = null;
-			$viaModels = $viaQuery->findWith($viaName, $primaryModels);
-			$this->filterByModels($viaModels);
-		} else {
-			$this->filterByModels($primaryModels);
-		}
-
-		if (count($primaryModels) === 1 && !$this->multiple) {
-			$model = $this->one();
-			foreach ($primaryModels as $i => $primaryModel) {
-				if ($primaryModel instanceof ActiveRecord) {
-					$primaryModel->populateRelation($name, $model);
-				} else {
-					$primaryModels[$i][$name] = $model;
-				}
-			}
-			return array($model);
-		} else {
-			$models = $this->all();
-			if (isset($viaModels, $viaQuery)) {
-				$buckets = $this->buildBuckets($models, $this->link, $viaModels, $viaQuery->link);
-			} else {
-				$buckets = $this->buildBuckets($models, $this->link);
-			}
-
-			$link = array_values(isset($viaQuery) ? $viaQuery->link : $this->link);
-			foreach ($primaryModels as $i => $primaryModel) {
-				$key = $this->getModelKey($primaryModel, $link);
-				$value = isset($buckets[$key]) ? $buckets[$key] : ($this->multiple ? array() : null);
-				if ($primaryModel instanceof ActiveRecord) {
-					$primaryModel->populateRelation($name, $value);
-				} else {
-					$primaryModels[$i][$name] = $value;
-				}
-			}
-			return $models;
-		}
-	}
-
-	/**
-	 * @param array $models
-	 * @param array $link
-	 * @param array $viaModels
-	 * @param array $viaLink
-	 * @return array
-	 */
-	private function buildBuckets($models, $link, $viaModels = null, $viaLink = null)
-	{
-		$buckets = array();
-		$linkKeys = array_keys($link);
-		foreach ($models as $i => $model) {
-			$key = $this->getModelKey($model, $linkKeys);
-			if ($this->indexBy !== null) {
-				$buckets[$key][$i] = $model;
-			} else {
-				$buckets[$key][] = $model;
-			}
-		}
-
-		if ($viaModels !== null) {
-			$viaBuckets = array();
-			$viaLinkKeys = array_keys($viaLink);
-			$linkValues = array_values($link);
-			foreach ($viaModels as $viaModel) {
-				$key1 = $this->getModelKey($viaModel, $viaLinkKeys);
-				$key2 = $this->getModelKey($viaModel, $linkValues);
-				if (isset($buckets[$key2])) {
-					foreach ($buckets[$key2] as $i => $bucket) {
-						if ($this->indexBy !== null) {
-							$viaBuckets[$key1][$i] = $bucket;
-						} else {
-							$viaBuckets[$key1][] = $bucket;
-						}
-					}
-				}
-			}
-			$buckets = $viaBuckets;
-		}
-
-		if (!$this->multiple) {
-			foreach ($buckets as $i => $bucket) {
-				$buckets[$i] = reset($bucket);
-			}
-		}
-		return $buckets;
-	}
-
-	/**
-	 * @param ActiveRecord|array $model
-	 * @param array $attributes
-	 * @return string
-	 */
-	private function getModelKey($model, $attributes)
-	{
-		if (count($attributes) > 1) {
-			$key = array();
-			foreach ($attributes as $attribute) {
-				$key[] = $model[$attribute];
-			}
-			return serialize($key);
-		} else {
-			$attribute = reset($attributes);
-			return $model[$attribute];
-		}
-	}
-
-	/**
-	 * @param array $models
-	 */
-	private function filterByModels($models)
-	{
-		$attributes = array_keys($this->link);
-		$values = array();
-		if (count($attributes) === 1) {
-			// single key
-			$attribute = reset($this->link);
-			foreach ($models as $model) {
-				$values[] = $model[$attribute];
-			}
-		} else {
-			// composite keys
-			foreach ($models as $model) {
-				$v = array();
-				foreach ($this->link as $attribute => $link) {
-					$v[$attribute] = $model[$link];
-				}
-				$values[] = $v;
-			}
-		}
-		$this->andWhere(array('in', $attributes, array_unique($values, SORT_REGULAR)));
-	}
-
-	/**
-	 * @param ActiveRecord[] $primaryModels
-	 * @return array
-	 */
-	private function findPivotRows($primaryModels)
-	{
-		if (empty($primaryModels)) {
-			return array();
-		}
-		$this->filterByModels($primaryModels);
-		/** @var $primaryModel ActiveRecord */
-		$primaryModel = reset($primaryModels);
-		$db = $primaryModel->getDb();
-		$sql = $db->getQueryBuilder()->build($this);
-		return $db->createCommand($sql, $this->params)->queryAll();
-	}
-}
diff --git a/framework/db/ColumnSchema.php b/framework/db/ColumnSchema.php
deleted file mode 100644
index ffdafd4..0000000
--- a/framework/db/ColumnSchema.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\db;
-
-/**
- * ColumnSchema class describes the metadata of a column in a database table.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class ColumnSchema extends \yii\base\Component
-{
-	/**
-	 * @var string name of this column (without quotes).
-	 */
-	public $name;
-	/**
-	 * @var boolean whether this column can be null.
-	 */
-	public $allowNull;
-	/**
-	 * @var string abstract type of this column. Possible abstract types include:
-	 * string, text, boolean, smallint, integer, bigint, float, decimal, datetime,
-	 * timestamp, time, date, binary, and money.
-	 */
-	public $type;
-	/**
-	 * @var string the PHP type of this column. Possible PHP types include:
-	 * string, boolean, integer, double.
-	 */
-	public $phpType;
-	/**
-	 * @var string the DB type of this column. Possible DB types vary according to the type of DBMS.
-	 */
-	public $dbType;
-	/**
-	 * @var mixed default value of this column
-	 */
-	public $defaultValue;
-	/**
-	 * @var array enumerable values. This is set only if the column is declared to be an enumerable type.
-	 */
-	public $enumValues;
-	/**
-	 * @var integer display size of the column.
-	 */
-	public $size;
-	/**
-	 * @var integer precision of the column data, if it is numeric.
-	 */
-	public $precision;
-	/**
-	 * @var integer scale of the column data, if it is numeric.
-	 */
-	public $scale;
-	/**
-	 * @var boolean whether this column is a primary key
-	 */
-	public $isPrimaryKey;
-	/**
-	 * @var boolean whether this column is auto-incremental
-	 */
-	public $autoIncrement = false;
-	/**
-	 * @var boolean whether this column is unsigned. This is only meaningful
-	 * when [[type]] is `smallint`, `integer` or `bigint`.
-	 */
-	public $unsigned;
-	/**
-	 * @var string comment of this column. Not all DBMS support this.
-	 */
-	public $comment;
-
-
-	/**
-	 * Converts the input value according to [[phpType]].
-	 * If the value is null or an [[Expression]], it will not be converted.
-	 * @param mixed $value input value
-	 * @return mixed converted value
-	 */
-	public function typecast($value)
-	{
-		if ($value === null || gettype($value) === $this->phpType || $value instanceof Expression) {
-			return $value;
-		}
-		switch ($this->phpType) {
-			case 'string':
-				return (string)$value;
-			case 'integer':
-				return (integer)$value;
-			case 'boolean':
-				return (boolean)$value;
-		}
-		return $value;
-	}
-}
diff --git a/framework/db/Command.php b/framework/db/Command.php
deleted file mode 100644
index a117685..0000000
--- a/framework/db/Command.php
+++ /dev/null
@@ -1,754 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\db;
-
-use Yii;
-use yii\base\NotSupportedException;
-use yii\caching\Cache;
-
-/**
- * Command represents a SQL statement to be executed against a database.
- *
- * A command object is usually created by calling [[Connection::createCommand()]].
- * The SQL statement it represents can be set via the [[sql]] property.
- *
- * To execute a non-query SQL (such as INSERT, DELETE, UPDATE), call [[execute()]].
- * To execute a SQL statement that returns result data set (such as SELECT),
- * use [[queryAll()]], [[queryRow()]], [[queryColumn()]], [[queryScalar()]], or [[query()]].
- * For example,
- *
- * ~~~
- * $users = $connection->createCommand('SELECT * FROM tbl_user')->queryAll();
- * ~~~
- *
- * Command supports SQL statement preparation and parameter binding.
- * Call [[bindValue()]] to bind a value to a SQL parameter;
- * Call [[bindParam()]] to bind a PHP variable to a SQL parameter.
- * When binding a parameter, the SQL statement is automatically prepared.
- * You may also call [[prepare()]] explicitly to prepare a SQL statement.
- *
- * Command also supports building SQL statements by providing methods such as [[insert()]],
- * [[update()]], etc. For example,
- *
- * ~~~
- * $connection->createCommand()->insert('tbl_user', array(
- *     'name' => 'Sam',
- *     'age' => 30,
- * ))->execute();
- * ~~~
- *
- * To build SELECT SQL statements, please use [[QueryBuilder]] instead.
- *
- * @property string $sql the SQL statement to be executed
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Command extends \yii\base\Component
-{
-	/**
-	 * @var Connection the DB connection that this command is associated with
-	 */
-	public $db;
-	/**
-	 * @var \PDOStatement the PDOStatement object that this command is associated with
-	 */
-	public $pdoStatement;
-	/**
-	 * @var mixed the default fetch mode for this command.
-	 * @see http://www.php.net/manual/en/function.PDOStatement-setFetchMode.php
-	 */
-	public $fetchMode = \PDO::FETCH_ASSOC;
-	/**
-	 * @var string the SQL statement that this command represents
-	 */
-	private $_sql;
-	/**
-	 * @var array the parameter log information (name=>value)
-	 */
-	private $_params = array();
-
-	/**
-	 * Returns the SQL statement for this command.
-	 * @return string the SQL statement to be executed
-	 */
-	public function getSql()
-	{
-		return $this->_sql;
-	}
-
-	/**
-	 * Specifies the SQL statement to be executed.
-	 * The previous SQL execution (if any) will be cancelled, and [[params]] will be cleared as well.
-	 * @param string $sql the SQL statement to be set.
-	 * @return Command this command instance
-	 */
-	public function setSql($sql)
-	{
-		if ($sql !== $this->_sql) {
-			$this->cancel();
-			$this->_sql = $this->db->quoteSql($sql);
-			$this->_params = array();
-		}
-		return $this;
-	}
-
-	/**
-	 * Returns the raw SQL by inserting parameter values into the corresponding placeholders in [[sql]].
-	 * Note that the return value of this method should mainly be used for logging purpose.
-	 * It is likely that this method returns an invalid SQL due to improper replacement of parameter placeholders.
-	 * @return string the raw SQL
-	 */
-	public function getRawSql()
-	{
-		if (empty($this->_params)) {
-			return $this->_sql;
-		} else {
-			$params = array();
-			foreach ($this->_params as $name => $value) {
-				if (is_string($value)) {
-					$params[$name] = $this->db->quoteValue($value);
-				} elseif ($value === null) {
-					$params[$name] = 'NULL';
-				} else {
-					$params[$name] = $value;
-				}
-			}
-			if (isset($params[1])) {
-				$sql = '';
-				foreach (explode('?', $this->_sql) as $i => $part) {
-					$sql .= (isset($params[$i]) ? $params[$i] : '') . $part;
-				}
-				return $sql;
-			} else {
-				return strtr($this->_sql, $params);
-			}
-		}
-	}
-
-	/**
-	 * Prepares the SQL statement to be executed.
-	 * For complex SQL statement that is to be executed multiple times,
-	 * this may improve performance.
-	 * For SQL statement with binding parameters, this method is invoked
-	 * automatically.
-	 * @throws Exception if there is any DB error
-	 */
-	public function prepare()
-	{
-		if ($this->pdoStatement == null) {
-			$sql = $this->getSql();
-			try {
-				$this->pdoStatement = $this->db->pdo->prepare($sql);
-			} catch (\Exception $e) {
-				Yii::error($e->getMessage() . "\nFailed to prepare SQL: $sql", __METHOD__);
-				$errorInfo = $e instanceof \PDOException ? $e->errorInfo : null;
-				throw new Exception($e->getMessage(), $errorInfo, (int)$e->getCode());
-			}
-		}
-	}
-
-	/**
-	 * Cancels the execution of the SQL statement.
-	 * This method mainly sets [[pdoStatement]] to be null.
-	 */
-	public function cancel()
-	{
-		$this->pdoStatement = null;
-	}
-
-	/**
-	 * Binds a parameter to the SQL statement to be executed.
-	 * @param string|integer $name parameter identifier. For a prepared statement
-	 * using named placeholders, this will be a parameter name of
-	 * the form `:name`. For a prepared statement using question mark
-	 * placeholders, this will be the 1-indexed position of the parameter.
-	 * @param mixed $value Name of the PHP variable to bind to the SQL statement parameter
-	 * @param integer $dataType SQL data type of the parameter. If null, the type is determined by the PHP type of the value.
-	 * @param integer $length length of the data type
-	 * @param mixed $driverOptions the driver-specific options
-	 * @return Command the current command being executed
-	 * @see http://www.php.net/manual/en/function.PDOStatement-bindParam.php
-	 */
-	public function bindParam($name, &$value, $dataType = null, $length = null, $driverOptions = null)
-	{
-		$this->prepare();
-		if ($dataType === null) {
-			$this->pdoStatement->bindParam($name, $value, $this->getPdoType($value));
-		} elseif ($length === null) {
-			$this->pdoStatement->bindParam($name, $value, $dataType);
-		} elseif ($driverOptions === null) {
-			$this->pdoStatement->bindParam($name, $value, $dataType, $length);
-		} else {
-			$this->pdoStatement->bindParam($name, $value, $dataType, $length, $driverOptions);
-		}
-		$this->_params[$name] =& $value;
-		return $this;
-	}
-
-	/**
-	 * Binds a value to a parameter.
-	 * @param string|integer $name Parameter identifier. For a prepared statement
-	 * using named placeholders, this will be a parameter name of
-	 * the form `:name`. For a prepared statement using question mark
-	 * placeholders, this will be the 1-indexed position of the parameter.
-	 * @param mixed $value The value to bind to the parameter
-	 * @param integer $dataType SQL data type of the parameter. If null, the type is determined by the PHP type of the value.
-	 * @return Command the current command being executed
-	 * @see http://www.php.net/manual/en/function.PDOStatement-bindValue.php
-	 */
-	public function bindValue($name, $value, $dataType = null)
-	{
-		$this->prepare();
-		if ($dataType === null) {
-			$this->pdoStatement->bindValue($name, $value, $this->getPdoType($value));
-		} else {
-			$this->pdoStatement->bindValue($name, $value, $dataType);
-		}
-		$this->_params[$name] = $value;
-		return $this;
-	}
-
-	/**
-	 * Binds a list of values to the corresponding parameters.
-	 * This is similar to [[bindValue()]] except that it binds multiple values at a time.
-	 * Note that the SQL data type of each value is determined by its PHP type.
-	 * @param array $values the values to be bound. This must be given in terms of an associative
-	 * array with array keys being the parameter names, and array values the corresponding parameter values,
-	 * e.g. `array(':name'=>'John', ':age'=>25)`. By default, the PDO type of each value is determined
-	 * by its PHP type. You may explicitly specify the PDO type by using an array: `array(value, type)`,
-	 * e.g. `array(':name'=>'John', ':profile'=>array($profile, \PDO::PARAM_LOB))`.
-	 * @return Command the current command being executed
-	 */
-	public function bindValues($values)
-	{
-		if (!empty($values)) {
-			$this->prepare();
-			foreach ($values as $name => $value) {
-				if (is_array($value)) {
-					$type = $value[1];
-					$value = $value[0];
-				} else {
-					$type = $this->getPdoType($value);
-				}
-				$this->pdoStatement->bindValue($name, $value, $type);
-				$this->_params[$name] = $value;
-			}
-		}
-		return $this;
-	}
-
-	/**
-	 * Determines the PDO type for the give PHP data value.
-	 * @param mixed $data the data whose PDO type is to be determined
-	 * @return integer the PDO type
-	 * @see http://www.php.net/manual/en/pdo.constants.php
-	 */
-	private function getPdoType($data)
-	{
-		static $typeMap = array(
-			'boolean' => \PDO::PARAM_BOOL,
-			'integer' => \PDO::PARAM_INT,
-			'string' => \PDO::PARAM_STR,
-			'resource' => \PDO::PARAM_LOB,
-			'NULL' => \PDO::PARAM_NULL,
-		);
-		$type = gettype($data);
-		return isset($typeMap[$type]) ? $typeMap[$type] : \PDO::PARAM_STR;
-	}
-
-	/**
-	 * Executes the SQL statement.
-	 * This method should only be used for executing non-query SQL statement, such as `INSERT`, `DELETE`, `UPDATE` SQLs.
-	 * No result set will be returned.
-	 * @return integer number of rows affected by the execution.
-	 * @throws Exception execution failed
-	 */
-	public function execute()
-	{
-		$sql = $this->getSql();
-
-		$rawSql = $this->getRawSql();
-
-		Yii::trace("Executing SQL: $rawSql", __METHOD__);
-
-		if ($sql == '') {
-			return 0;
-		}
-
-		try {
-			$token = "SQL: $sql";
-			if ($this->db->enableProfiling) {
-				Yii::beginProfile($token, __METHOD__);
-			}
-
-			$this->prepare();
-			$this->pdoStatement->execute();
-			$n = $this->pdoStatement->rowCount();
-
-			if ($this->db->enableProfiling) {
-				Yii::endProfile($token, __METHOD__);
-			}
-			return $n;
-		} catch (\Exception $e) {
-			if ($this->db->enableProfiling) {
-				Yii::endProfile($token, __METHOD__);
-			}
-			$message = $e->getMessage();
-
-			Yii::error("$message\nFailed to execute SQL: $rawSql", __METHOD__);
-
-			$errorInfo = $e instanceof \PDOException ? $e->errorInfo : null;
-			throw new Exception($message, $errorInfo, (int)$e->getCode());
-		}
-	}
-
-	/**
-	 * Executes the SQL statement and returns query result.
-	 * This method is for executing a SQL query that returns result set, such as `SELECT`.
-	 * @return DataReader the reader object for fetching the query result
-	 * @throws Exception execution failed
-	 */
-	public function query()
-	{
-		return $this->queryInternal('');
-	}
-
-	/**
-	 * Executes the SQL statement and returns ALL rows at once.
-	 * @param mixed $fetchMode the result fetch mode. Please refer to [PHP manual](http://www.php.net/manual/en/function.PDOStatement-setFetchMode.php)
-	 * for valid fetch modes. If this parameter is null, the value set in [[fetchMode]] will be used.
-	 * @return array all rows of the query result. Each array element is an array representing a row of data.
-	 * An empty array is returned if the query results in nothing.
-	 * @throws Exception execution failed
-	 */
-	public function queryAll($fetchMode = null)
-	{
-		return $this->queryInternal('fetchAll', $fetchMode);
-	}
-
-	/**
-	 * Executes the SQL statement and returns the first row of the result.
-	 * This method is best used when only the first row of result is needed for a query.
-	 * @param mixed $fetchMode the result fetch mode. Please refer to [PHP manual](http://www.php.net/manual/en/function.PDOStatement-setFetchMode.php)
-	 * for valid fetch modes. If this parameter is null, the value set in [[fetchMode]] will be used.
-	 * @return array|boolean the first row (in terms of an array) of the query result. False is returned if the query
-	 * results in nothing.
-	 * @throws Exception execution failed
-	 */
-	public function queryRow($fetchMode = null)
-	{
-		return $this->queryInternal('fetch', $fetchMode);
-	}
-
-	/**
-	 * Executes the SQL statement and returns the value of the first column in the first row of data.
-	 * This method is best used when only a single value is needed for a query.
-	 * @return string|boolean the value of the first column in the first row of the query result.
-	 * False is returned if there is no value.
-	 * @throws Exception execution failed
-	 */
-	public function queryScalar()
-	{
-		$result = $this->queryInternal('fetchColumn', 0);
-		if (is_resource($result) && get_resource_type($result) === 'stream') {
-			return stream_get_contents($result);
-		} else {
-			return $result;
-		}
-	}
-
-	/**
-	 * Executes the SQL statement and returns the first column of the result.
-	 * This method is best used when only the first column of result (i.e. the first element in each row)
-	 * is needed for a query.
-	 * @return array the first column of the query result. Empty array is returned if the query results in nothing.
-	 * @throws Exception execution failed
-	 */
-	public function queryColumn()
-	{
-		return $this->queryInternal('fetchAll', \PDO::FETCH_COLUMN);
-	}
-
-	/**
-	 * Performs the actual DB query of a SQL statement.
-	 * @param string $method method of PDOStatement to be called
-	 * @param mixed $fetchMode the result fetch mode. Please refer to [PHP manual](http://www.php.net/manual/en/function.PDOStatement-setFetchMode.php)
-	 * for valid fetch modes. If this parameter is null, the value set in [[fetchMode]] will be used.
-	 * @return mixed the method execution result
-	 * @throws Exception if the query causes any problem
-	 */
-	private function queryInternal($method, $fetchMode = null)
-	{
-		$db = $this->db;
-		$sql = $this->getSql();
-		$rawSql = $this->getRawSql();
-
-		Yii::trace("Querying SQL: $rawSql", __METHOD__);
-
-		/** @var $cache \yii\caching\Cache */
-		if ($db->enableQueryCache && $method !== '') {
-			$cache = is_string($db->queryCache) ? Yii::$app->getComponent($db->queryCache) : $db->queryCache;
-		}
-
-		if (isset($cache) && $cache instanceof Cache) {
-			$cacheKey = $cache->buildKey(array(
-				__CLASS__,
-				$db->dsn,
-				$db->username,
-				$rawSql,
-			));
-			if (($result = $cache->get($cacheKey)) !== false) {
-				Yii::trace('Query result served from cache', __METHOD__);
-				return $result;
-			}
-		}
-
-		try {
-			$token = "SQL: $sql";
-			if ($db->enableProfiling) {
-				Yii::beginProfile($token, __METHOD__);
-			}
-
-			$this->prepare();
-			$this->pdoStatement->execute();
-
-			if ($method === '') {
-				$result = new DataReader($this);
-			} else {
-				if ($fetchMode === null) {
-					$fetchMode = $this->fetchMode;
-				}
-				$result = call_user_func_array(array($this->pdoStatement, $method), (array)$fetchMode);
-				$this->pdoStatement->closeCursor();
-			}
-
-			if ($db->enableProfiling) {
-				Yii::endProfile($token, __METHOD__);
-			}
-
-			if (isset($cache, $cacheKey) && $cache instanceof Cache) {
-				$cache->set($cacheKey, $result, $db->queryCacheDuration, $db->queryCacheDependency);
-				Yii::trace('Saved query result in cache', __METHOD__);
-			}
-
-			return $result;
-		} catch (\Exception $e) {
-			if ($db->enableProfiling) {
-				Yii::endProfile($token, __METHOD__);
-			}
-			$message = $e->getMessage();
-			Yii::error("$message\nCommand::$method() failed: $rawSql", __METHOD__);
-			$errorInfo = $e instanceof \PDOException ? $e->errorInfo : null;
-			throw new Exception($message, $errorInfo, (int)$e->getCode());
-		}
-	}
-
-	/**
-	 * Creates an INSERT command.
-	 * For example,
-	 *
-	 * ~~~
-	 * $connection->createCommand()->insert('tbl_user', array(
-	 *     'name' => 'Sam',
-	 *     'age' => 30,
-	 * ))->execute();
-	 * ~~~
-	 *
-	 * The method will properly escape the column names, and bind the values to be inserted.
-	 *
-	 * Note that the created command is not executed until [[execute()]] is called.
-	 *
-	 * @param string $table the table that new rows will be inserted into.
-	 * @param array $columns the column data (name=>value) to be inserted into the table.
-	 * @return Command the command object itself
-	 */
-	public function insert($table, $columns)
-	{
-		$params = array();
-		$sql = $this->db->getQueryBuilder()->insert($table, $columns, $params);
-		return $this->setSql($sql)->bindValues($params);
-	}
-
-	/**
-	 * Creates a batch INSERT command.
-	 * For example,
-	 *
-	 * ~~~
-	 * $connection->createCommand()->batchInsert('tbl_user', array('name', 'age'), array(
-	 *     array('Tom', 30),
-	 *     array('Jane', 20),
-	 *     array('Linda', 25),
-	 * ))->execute();
-	 * ~~~
-	 *
-	 * Not that the values in each row must match the corresponding column names.
-	 *
-	 * @param string $table the table that new rows will be inserted into.
-	 * @param array $columns the column names
-	 * @param array $rows the rows to be batch inserted into the table
-	 * @return Command the command object itself
-	 */
-	public function batchInsert($table, $columns, $rows)
-	{
-		$sql = $this->db->getQueryBuilder()->batchInsert($table, $columns, $rows);
-		return $this->setSql($sql);
-	}
-
-	/**
-	 * Creates an UPDATE command.
-	 * For example,
-	 *
-	 * ~~~
-	 * $connection->createCommand()->update('tbl_user', array(
-	 *     'status' => 1,
-	 * ), 'age > 30')->execute();
-	 * ~~~
-	 *
-	 * The method will properly escape the column names and bind the values to be updated.
-	 *
-	 * Note that the created command is not executed until [[execute()]] is called.
-	 *
-	 * @param string $table the table to be updated.
-	 * @param array $columns the column data (name=>value) to be updated.
-	 * @param mixed $condition the condition that will be put in the WHERE part. Please
-	 * refer to [[Query::where()]] on how to specify condition.
-	 * @param array $params the parameters to be bound to the command
-	 * @return Command the command object itself
-	 */
-	public function update($table, $columns, $condition = '', $params = array())
-	{
-		$sql = $this->db->getQueryBuilder()->update($table, $columns, $condition, $params);
-		return $this->setSql($sql)->bindValues($params);
-	}
-
-	/**
-	 * Creates a DELETE command.
-	 * For example,
-	 *
-	 * ~~~
-	 * $connection->createCommand()->delete('tbl_user', 'status = 0')->execute();
-	 * ~~~
-	 *
-	 * The method will properly escape the table and column names.
-	 *
-	 * Note that the created command is not executed until [[execute()]] is called.
-	 *
-	 * @param string $table the table where the data will be deleted from.
-	 * @param mixed $condition the condition that will be put in the WHERE part. Please
-	 * refer to [[Query::where()]] on how to specify condition.
-	 * @param array $params the parameters to be bound to the command
-	 * @return Command the command object itself
-	 */
-	public function delete($table, $condition = '', $params = array())
-	{
-		$sql = $this->db->getQueryBuilder()->delete($table, $condition, $params);
-		return $this->setSql($sql)->bindValues($params);
-	}
-
-
-	/**
-	 * Creates a SQL command for creating a new DB table.
-	 *
-	 * The columns in the new table should be specified as name-definition pairs (e.g. 'name'=>'string'),
-	 * where name stands for a column name which will be properly quoted by the method, and definition
-	 * stands for the column type which can contain an abstract DB type.
-	 * The method [[QueryBuilder::getColumnType()]] will be called
-	 * to convert the abstract column types to physical ones. For example, `string` will be converted
-	 * as `varchar(255)`, and `string not null` becomes `varchar(255) not null`.
-	 *
-	 * If a column is specified with definition only (e.g. 'PRIMARY KEY (name, type)'), it will be directly
-	 * inserted into the generated SQL.
-	 *
-	 * @param string $table the name of the table to be created. The name will be properly quoted by the method.
-	 * @param array $columns the columns (name=>definition) in the new table.
-	 * @param string $options additional SQL fragment that will be appended to the generated SQL.
-	 * @return Command the command object itself
-	 */
-	public function createTable($table, $columns, $options = null)
-	{
-		$sql = $this->db->getQueryBuilder()->createTable($table, $columns, $options);
-		return $this->setSql($sql);
-	}
-
-	/**
-	 * Creates a SQL command for renaming a DB table.
-	 * @param string $table the table to be renamed. The name will be properly quoted by the method.
-	 * @param string $newName the new table name. The name will be properly quoted by the method.
-	 * @return Command the command object itself
-	 */
-	public function renameTable($table, $newName)
-	{
-		$sql = $this->db->getQueryBuilder()->renameTable($table, $newName);
-		return $this->setSql($sql);
-	}
-
-	/**
-	 * Creates a SQL command for dropping a DB table.
-	 * @param string $table the table to be dropped. The name will be properly quoted by the method.
-	 * @return Command the command object itself
-	 */
-	public function dropTable($table)
-	{
-		$sql = $this->db->getQueryBuilder()->dropTable($table);
-		return $this->setSql($sql);
-	}
-
-	/**
-	 * Creates a SQL command for truncating a DB table.
-	 * @param string $table the table to be truncated. The name will be properly quoted by the method.
-	 * @return Command the command object itself
-	 */
-	public function truncateTable($table)
-	{
-		$sql = $this->db->getQueryBuilder()->truncateTable($table);
-		return $this->setSql($sql);
-	}
-
-	/**
-	 * Creates a SQL command for adding a new DB column.
-	 * @param string $table the table that the new column will be added to. The table name will be properly quoted by the method.
-	 * @param string $column the name of the new column. The name will be properly quoted by the method.
-	 * @param string $type the column type. [[\yii\db\QueryBuilder::getColumnType()]] will be called
-	 * to convert the give column type to the physical one. For example, `string` will be converted
-	 * as `varchar(255)`, and `string not null` becomes `varchar(255) not null`.
-	 * @return Command the command object itself
-	 */
-	public function addColumn($table, $column, $type)
-	{
-		$sql = $this->db->getQueryBuilder()->addColumn($table, $column, $type);
-		return $this->setSql($sql);
-	}
-
-	/**
-	 * Creates a SQL command for dropping a DB column.
-	 * @param string $table the table whose column is to be dropped. The name will be properly quoted by the method.
-	 * @param string $column the name of the column to be dropped. The name will be properly quoted by the method.
-	 * @return Command the command object itself
-	 */
-	public function dropColumn($table, $column)
-	{
-		$sql = $this->db->getQueryBuilder()->dropColumn($table, $column);
-		return $this->setSql($sql);
-	}
-
-	/**
-	 * Creates a SQL command for renaming a column.
-	 * @param string $table the table whose column is to be renamed. The name will be properly quoted by the method.
-	 * @param string $oldName the old name of the column. The name will be properly quoted by the method.
-	 * @param string $newName the new name of the column. The name will be properly quoted by the method.
-	 * @return Command the command object itself
-	 */
-	public function renameColumn($table, $oldName, $newName)
-	{
-		$sql = $this->db->getQueryBuilder()->renameColumn($table, $oldName, $newName);
-		return $this->setSql($sql);
-	}
-
-	/**
-	 * Creates a SQL command for changing the definition of a column.
-	 * @param string $table the table whose column is to be changed. The table name will be properly quoted by the method.
-	 * @param string $column the name of the column to be changed. The name will be properly quoted by the method.
-	 * @param string $type the column type. [[\yii\db\QueryBuilder::getColumnType()]] will be called
-	 * to convert the give column type to the physical one. For example, `string` will be converted
-	 * as `varchar(255)`, and `string not null` becomes `varchar(255) not null`.
-	 * @return Command the command object itself
-	 */
-	public function alterColumn($table, $column, $type)
-	{
-		$sql = $this->db->getQueryBuilder()->alterColumn($table, $column, $type);
-		return $this->setSql($sql);
-	}
-
-	/**
-	 * Creates a SQL command for adding a foreign key constraint to an existing table.
-	 * The method will properly quote the table and column names.
-	 * @param string $name the name of the foreign key constraint.
-	 * @param string $table the table that the foreign key constraint will be added to.
-	 * @param string $columns the name of the column to that the constraint will be added on. If there are multiple columns, separate them with commas.
-	 * @param string $refTable the table that the foreign key references to.
-	 * @param string $refColumns the name of the column that the foreign key references to. If there are multiple columns, separate them with commas.
-	 * @param string $delete the ON DELETE option. Most DBMS support these options: RESTRICT, CASCADE, NO ACTION, SET DEFAULT, SET NULL
-	 * @param string $update the ON UPDATE option. Most DBMS support these options: RESTRICT, CASCADE, NO ACTION, SET DEFAULT, SET NULL
-	 * @return Command the command object itself
-	 */
-	public function addForeignKey($name, $table, $columns, $refTable, $refColumns, $delete = null, $update = null)
-	{
-		$sql = $this->db->getQueryBuilder()->addForeignKey($name, $table, $columns, $refTable, $refColumns, $delete, $update);
-		return $this->setSql($sql);
-	}
-
-	/**
-	 * Creates a SQL command for dropping a foreign key constraint.
-	 * @param string $name the name of the foreign key constraint to be dropped. The name will be properly quoted by the method.
-	 * @param string $table the table whose foreign is to be dropped. The name will be properly quoted by the method.
-	 * @return Command the command object itself
-	 */
-	public function dropForeignKey($name, $table)
-	{
-		$sql = $this->db->getQueryBuilder()->dropForeignKey($name, $table);
-		return $this->setSql($sql);
-	}
-
-	/**
-	 * Creates a SQL command for creating a new index.
-	 * @param string $name the name of the index. The name will be properly quoted by the method.
-	 * @param string $table the table that the new index will be created for. The table name will be properly quoted by the method.
-	 * @param string $columns the column(s) that should be included in the index. If there are multiple columns, please separate them
-	 * by commas. The column names will be properly quoted by the method.
-	 * @param boolean $unique whether to add UNIQUE constraint on the created index.
-	 * @return Command the command object itself
-	 */
-	public function createIndex($name, $table, $columns, $unique = false)
-	{
-		$sql = $this->db->getQueryBuilder()->createIndex($name, $table, $columns, $unique);
-		return $this->setSql($sql);
-	}
-
-	/**
-	 * Creates a SQL command for dropping an index.
-	 * @param string $name the name of the index to be dropped. The name will be properly quoted by the method.
-	 * @param string $table the table whose index is to be dropped. The name will be properly quoted by the method.
-	 * @return Command the command object itself
-	 */
-	public function dropIndex($name, $table)
-	{
-		$sql = $this->db->getQueryBuilder()->dropIndex($name, $table);
-		return $this->setSql($sql);
-	}
-
-	/**
-	 * Creates a SQL command for resetting the sequence value of a table's primary key.
-	 * The sequence will be reset such that the primary key of the next new row inserted
-	 * will have the specified value or 1.
-	 * @param string $table the name of the table whose primary key sequence will be reset
-	 * @param mixed $value the value for the primary key of the next new row inserted. If this is not set,
-	 * the next new row's primary key will have a value 1.
-	 * @return Command the command object itself
-	 * @throws NotSupportedException if this is not supported by the underlying DBMS
-	 */
-	public function resetSequence($table, $value = null)
-	{
-		$sql = $this->db->getQueryBuilder()->resetSequence($table, $value);
-		return $this->setSql($sql);
-	}
-
-	/**
-	 * Builds a SQL command for enabling or disabling integrity check.
-	 * @param boolean $check whether to turn on or off the integrity check.
-	 * @param string $schema the schema name of the tables. Defaults to empty string, meaning the current
-	 * or default schema.
-	 * @return Command the command object itself
-	 * @throws NotSupportedException if this is not supported by the underlying DBMS
-	 */
-	public function checkIntegrity($check = true, $schema = '')
-	{
-		$sql = $this->db->getQueryBuilder()->checkIntegrity($check, $schema);
-		return $this->setSql($sql);
-	}
-}
diff --git a/framework/db/Connection.php b/framework/db/Connection.php
deleted file mode 100644
index 37a5307..0000000
--- a/framework/db/Connection.php
+++ /dev/null
@@ -1,563 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\db;
-
-use yii\base\Component;
-use yii\base\InvalidConfigException;
-use yii\base\NotSupportedException;
-use yii\caching\Cache;
-
-/**
- * Connection represents a connection to a database via [PDO](http://www.php.net/manual/en/ref.pdo.php).
- *
- * Connection works together with [[Command]], [[DataReader]] and [[Transaction]]
- * to provide data access to various DBMS in a common set of APIs. They are a thin wrapper
- * of the [[PDO PHP extension]](http://www.php.net/manual/en/ref.pdo.php).
- *
- * To establish a DB connection, set [[dsn]], [[username]] and [[password]], and then
- * call [[open()]] to be true.
- *
- * The following example shows how to create a Connection instance and establish
- * the DB connection:
- *
- * ~~~
- * $connection = new \yii\db\Connection(array(
- *     'dsn' => $dsn,
- *     'username' => $username,
- *     'password' => $password,
- * ));
- * $connection->open();
- * ~~~
- *
- * After the DB connection is established, one can execute SQL statements like the following:
- *
- * ~~~
- * $command = $connection->createCommand('SELECT * FROM tbl_post');
- * $posts = $command->queryAll();
- * $command = $connection->createCommand('UPDATE tbl_post SET status=1');
- * $command->execute();
- * ~~~
- *
- * One can also do prepared SQL execution and bind parameters to the prepared SQL.
- * When the parameters are coming from user input, you should use this approach
- * to prevent SQL injection attacks. The following is an example:
- *
- * ~~~
- * $command = $connection->createCommand('SELECT * FROM tbl_post WHERE id=:id');
- * $command->bindValue(':id', $_GET['id']);
- * $post = $command->query();
- * ~~~
- *
- * For more information about how to perform various DB queries, please refer to [[Command]].
- *
- * If the underlying DBMS supports transactions, you can perform transactional SQL queries
- * like the following:
- *
- * ~~~
- * $transaction = $connection->beginTransaction();
- * try {
- *     $connection->createCommand($sql1)->execute();
- *     $connection->createCommand($sql2)->execute();
- *     // ... executing other SQL statements ...
- *     $transaction->commit();
- * } catch(Exception $e) {
- *     $transaction->rollback();
- * }
- * ~~~
- *
- * Connection is often used as an application component and configured in the application
- * configuration like the following:
- *
- * ~~~
- * array(
- *	 'components' => array(
- *		 'db' => array(
- *			 'class' => '\yii\db\Connection',
- *			 'dsn' => 'mysql:host=127.0.0.1;dbname=demo',
- *			 'username' => 'root',
- *			 'password' => '',
- *			 'charset' => 'utf8',
- *		 ),
- *	 ),
- * )
- * ~~~
- *
- * @property boolean $isActive Whether the DB connection is established. This property is read-only.
- * @property Transaction $transaction The currently active transaction. Null if no active transaction.
- * @property Schema $schema The database schema information for the current connection.
- * @property QueryBuilder $queryBuilder The query builder.
- * @property string $lastInsertID The row ID of the last row inserted, or the last value retrieved from the sequence object.
- * @property string $driverName Name of the DB driver currently being used.
- * @property array $querySummary The statistical results of SQL queries.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Connection extends Component
-{
-	/**
-	 * @event Event an event that is triggered after a DB connection is established
-	 */
-	const EVENT_AFTER_OPEN = 'afterOpen';
-
-	/**
-	 * @var string the Data Source Name, or DSN, contains the information required to connect to the database.
-	 * Please refer to the [PHP manual](http://www.php.net/manual/en/function.PDO-construct.php) on
-	 * the format of the DSN string.
-	 * @see charset
-	 */
-	public $dsn;
-	/**
-	 * @var string the username for establishing DB connection. Defaults to empty string.
-	 */
-	public $username = '';
-	/**
-	 * @var string the password for establishing DB connection. Defaults to empty string.
-	 */
-	public $password = '';
-	/**
-	 * @var array PDO attributes (name=>value) that should be set when calling [[open()]]
-	 * to establish a DB connection. Please refer to the
-	 * [PHP manual](http://www.php.net/manual/en/function.PDO-setAttribute.php) for
-	 * details about available attributes.
-	 */
-	public $attributes;
-	/**
-	 * @var \PDO the PHP PDO instance associated with this DB connection.
-	 * This property is mainly managed by [[open()]] and [[close()]] methods.
-	 * When a DB connection is active, this property will represent a PDO instance;
-	 * otherwise, it will be null.
-	 */
-	public $pdo;
-	/**
-	 * @var boolean whether to enable schema caching.
-	 * Note that in order to enable truly schema caching, a valid cache component as specified
-	 * by [[schemaCache]] must be enabled and [[enableSchemaCache]] must be set true.
-	 * @see schemaCacheDuration
-	 * @see schemaCacheExclude
-	 * @see schemaCache
-	 */
-	public $enableSchemaCache = false;
-	/**
-	 * @var integer number of seconds that table metadata can remain valid in cache.
-	 * Use 0 to indicate that the cached data will never expire.
-	 * @see enableSchemaCache
-	 */
-	public $schemaCacheDuration = 3600;
-	/**
-	 * @var array list of tables whose metadata should NOT be cached. Defaults to empty array.
-	 * The table names may contain schema prefix, if any. Do not quote the table names.
-	 * @see enableSchemaCache
-	 */
-	public $schemaCacheExclude = array();
-	/**
-	 * @var Cache|string the cache object or the ID of the cache application component that
-	 * is used to cache the table metadata.
-	 * @see enableSchemaCache
-	 */
-	public $schemaCache = 'cache';
-	/**
-	 * @var boolean whether to enable query caching.
-	 * Note that in order to enable query caching, a valid cache component as specified
-	 * by [[queryCache]] must be enabled and [[enableQueryCache]] must be set true.
-	 *
-	 * Methods [[beginCache()]] and [[endCache()]] can be used as shortcuts to turn on
-	 * and off query caching on the fly.
-	 * @see queryCacheDuration
-	 * @see queryCache
-	 * @see queryCacheDependency
-	 * @see beginCache()
-	 * @see endCache()
-	 */
-	public $enableQueryCache = false;
-	/**
-	 * @var integer number of seconds that query results can remain valid in cache.
-	 * Defaults to 3600, meaning 3600 seconds, or one hour.
-	 * Use 0 to indicate that the cached data will never expire.
-	 * @see enableQueryCache
-	 */
-	public $queryCacheDuration = 3600;
-	/**
-	 * @var \yii\caching\Dependency the dependency that will be used when saving query results into cache.
-	 * Defaults to null, meaning no dependency.
-	 * @see enableQueryCache
-	 */
-	public $queryCacheDependency;
-	/**
-	 * @var Cache|string the cache object or the ID of the cache application component
-	 * that is used for query caching.
-	 * @see enableQueryCache
-	 */
-	public $queryCache = 'cache';
-	/**
-	 * @var string the charset used for database connection. The property is only used
-	 * for MySQL and PostgreSQL databases. Defaults to null, meaning using default charset
-	 * as specified by the database.
-	 *
-	 * Note that if you're using GBK or BIG5 then it's highly recommended to
-	 * update to PHP 5.3.6+ and to specify charset via DSN like
-	 * 'mysql:dbname=mydatabase;host=127.0.0.1;charset=GBK;'.
-	 */
-	public $charset;
-	/**
-	 * @var boolean whether to turn on prepare emulation. Defaults to false, meaning PDO
-	 * will use the native prepare support if available. For some databases (such as MySQL),
-	 * this may need to be set true so that PDO can emulate the prepare support to bypass
-	 * the buggy native prepare support.
-	 * The default value is null, which means the PDO ATTR_EMULATE_PREPARES value will not be changed.
-	 */
-	public $emulatePrepare;
-	/**
-	 * @var boolean whether to enable profiling for the SQL statements being executed.
-	 * Defaults to false. This should be mainly enabled and used during development
-	 * to find out the bottleneck of SQL executions.
-	 * @see getStats
-	 */
-	public $enableProfiling = false;
-	/**
-	 * @var string the common prefix or suffix for table names. If a table name is given
-	 * as `{{%TableName}}`, then the percentage character `%` will be replaced with this
-	 * property value. For example, `{{%post}}` becomes `{{tbl_post}}` if this property is
-	 * set as `"tbl_"`.
-	 */
-	public $tablePrefix;
-	/**
-	 * @var array mapping between PDO driver names and [[Schema]] classes.
-	 * The keys of the array are PDO driver names while the values the corresponding
-	 * schema class name or configuration. Please refer to [[\Yii::createObject()]] for
-	 * details on how to specify a configuration.
-	 *
-	 * This property is mainly used by [[getSchema()]] when fetching the database schema information.
-	 * You normally do not need to set this property unless you want to use your own
-	 * [[Schema]] class to support DBMS that is not supported by Yii.
-	 */
-	public $schemaMap = array(
-		'pgsql' => 'yii\db\pgsql\Schema',    // PostgreSQL
-		'mysqli' => 'yii\db\mysql\Schema',   // MySQL
-		'mysql' => 'yii\db\mysql\Schema',    // MySQL
-		'sqlite' => 'yii\db\sqlite\Schema',  // sqlite 3
-		'sqlite2' => 'yii\db\sqlite\Schema', // sqlite 2
-		'mssql' => 'yii\db\dao\mssql\Schema', // Mssql driver on windows hosts
-		'sqlsrv' => 'yii\db\mssql\Schema',   // Mssql
-		'oci' => 'yii\db\oci\Schema',        // Oracle driver
-		'dblib' => 'yii\db\mssql\Schema',    // dblib drivers on linux (and maybe others os) hosts
-	);
-	/**
-	 * @var Transaction the currently active transaction
-	 */
-	private $_transaction;
-	/**
-	 * @var Schema the database schema
-	 */
-	private $_schema;
-
-	/**
-	 * Closes the connection when this component is being serialized.
-	 * @return array
-	 */
-	public function __sleep()
-	{
-		$this->close();
-		return array_keys(get_object_vars($this));
-	}
-
-	/**
-	 * Returns a value indicating whether the DB connection is established.
-	 * @return boolean whether the DB connection is established
-	 */
-	public function getIsActive()
-	{
-		return $this->pdo !== null;
-	}
-
-	/**
-	 * Turns on query caching.
-	 * This method is provided as a shortcut to setting two properties that are related
-	 * with query caching: [[queryCacheDuration]] and [[queryCacheDependency]].
-	 * @param integer $duration the number of seconds that query results may remain valid in cache.
-	 * If not set, it will use the value of [[queryCacheDuration]]. See [[queryCacheDuration]] for more details.
-	 * @param \yii\caching\Dependency $dependency the dependency for the cached query result.
-	 * See [[queryCacheDependency]] for more details.
-	 */
-	public function beginCache($duration = null, $dependency = null)
-	{
-		$this->enableQueryCache = true;
-		if ($duration !== null) {
-			$this->queryCacheDuration = $duration;
-		}
-		$this->queryCacheDependency = $dependency;
-	}
-
-	/**
-	 * Turns off query caching.
-	 */
-	public function endCache()
-	{
-		$this->enableQueryCache = false;
-	}
-
-	/**
-	 * Establishes a DB connection.
-	 * It does nothing if a DB connection has already been established.
-	 * @throws Exception if connection fails
-	 */
-	public function open()
-	{
-		if ($this->pdo === null) {
-			if (empty($this->dsn)) {
-				throw new InvalidConfigException('Connection::dsn cannot be empty.');
-			}
-			try {
-				\Yii::trace('Opening DB connection: ' . $this->dsn, __METHOD__);
-				$this->pdo = $this->createPdoInstance();
-				$this->initConnection();
-			}
-			catch (\PDOException $e) {
-				\Yii::error("Failed to open DB connection ({$this->dsn}): " . $e->getMessage(), __METHOD__);
-				$message = YII_DEBUG ? 'Failed to open DB connection: ' . $e->getMessage() : 'Failed to open DB connection.';
-				throw new Exception($message, $e->errorInfo, (int)$e->getCode());
-			}
-		}
-	}
-
-	/**
-	 * Closes the currently active DB connection.
-	 * It does nothing if the connection is already closed.
-	 */
-	public function close()
-	{
-		if ($this->pdo !== null) {
-			\Yii::trace('Closing DB connection: ' . $this->dsn, __METHOD__);
-			$this->pdo = null;
-			$this->_schema = null;
-			$this->_transaction = null;
-		}
-	}
-
-	/**
-	 * Creates the PDO instance.
-	 * This method is called by [[open]] to establish a DB connection.
-	 * The default implementation will create a PHP PDO instance.
-	 * You may override this method if the default PDO needs to be adapted for certain DBMS.
-	 * @return \PDO the pdo instance
-	 */
-	protected function createPdoInstance()
-	{
-		$pdoClass = '\PDO';
-		if (($pos = strpos($this->dsn, ':')) !== false) {
-			$driver = strtolower(substr($this->dsn, 0, $pos));
-			if ($driver === 'mssql' || $driver === 'dblib' || $driver === 'sqlsrv') {
-				$pdoClass = 'yii\db\mssql\PDO';
-			}
-		}
-		return new $pdoClass($this->dsn, $this->username, $this->password, $this->attributes);
-	}
-
-	/**
-	 * Initializes the DB connection.
-	 * This method is invoked right after the DB connection is established.
-	 * The default implementation turns on `PDO::ATTR_EMULATE_PREPARES`
-	 * if [[emulatePrepare]] is true, and sets the database [[charset]] if it is not empty.
-	 * It then triggers an [[EVENT_AFTER_OPEN]] event.
-	 */
-	protected function initConnection()
-	{
-		$this->pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
-		if ($this->emulatePrepare !== null && constant('\PDO::ATTR_EMULATE_PREPARES')) {
-			$this->pdo->setAttribute(\PDO::ATTR_EMULATE_PREPARES, $this->emulatePrepare);
-		}
-		if ($this->charset !== null && in_array($this->getDriverName(), array('pgsql', 'mysql', 'mysqli'))) {
-			$this->pdo->exec('SET NAMES ' . $this->pdo->quote($this->charset));
-		}
-		$this->trigger(self::EVENT_AFTER_OPEN);
-	}
-
-	/**
-	 * Creates a command for execution.
-	 * @param string $sql the SQL statement to be executed
-	 * @param array $params the parameters to be bound to the SQL statement
-	 * @return Command the DB command
-	 */
-	public function createCommand($sql = null, $params = array())
-	{
-		$this->open();
-		$command = new Command(array(
-			'db' => $this,
-			'sql' => $sql,
-		));
-		return $command->bindValues($params);
-	}
-
-	/**
-	 * Returns the currently active transaction.
-	 * @return Transaction the currently active transaction. Null if no active transaction.
-	 */
-	public function getTransaction()
-	{
-		return $this->_transaction && $this->_transaction->isActive ? $this->_transaction : null;
-	}
-
-	/**
-	 * Starts a transaction.
-	 * @return Transaction the transaction initiated
-	 */
-	public function beginTransaction()
-	{
-		$this->open();
-		$this->_transaction = new Transaction(array(
-			'db' => $this,
-		));
-		$this->_transaction->begin();
-		return $this->_transaction;
-	}
-
-	/**
-	 * Returns the schema information for the database opened by this connection.
-	 * @return Schema the schema information for the database opened by this connection.
-	 * @throws NotSupportedException if there is no support for the current driver type
-	 */
-	public function getSchema()
-	{
-		if ($this->_schema !== null) {
-			return $this->_schema;
-		} else {
-			$driver = $this->getDriverName();
-			if (isset($this->schemaMap[$driver])) {
-				$this->_schema = \Yii::createObject($this->schemaMap[$driver]);
-				$this->_schema->db = $this;
-				return $this->_schema;
-			} else {
-				throw new NotSupportedException("Connection does not support reading schema information for '$driver' DBMS.");
-			}
-		}
-	}
-
-	/**
-	 * Returns the query builder for the current DB connection.
-	 * @return QueryBuilder the query builder for the current DB connection.
-	 */
-	public function getQueryBuilder()
-	{
-		return $this->getSchema()->getQueryBuilder();
-	}
-
-	/**
-	 * Obtains the schema information for the named table.
-	 * @param string $name table name.
-	 * @param boolean $refresh whether to reload the table schema even if it is found in the cache.
-	 * @return TableSchema table schema information. Null if the named table does not exist.
-	 */
-	public function getTableSchema($name, $refresh = false)
-	{
-		return $this->getSchema()->getTableSchema($name, $refresh);
-	}
-
-	/**
-	 * Returns the ID of the last inserted row or sequence value.
-	 * @param string $sequenceName name of the sequence object (required by some DBMS)
-	 * @return string the row ID of the last row inserted, or the last value retrieved from the sequence object
-	 * @see http://www.php.net/manual/en/function.PDO-lastInsertId.php
-	 */
-	public function getLastInsertID($sequenceName = '')
-	{
-		return $this->getSchema()->getLastInsertID($sequenceName);
-	}
-
-	/**
-	 * Quotes a string value for use in a query.
-	 * Note that if the parameter is not a string, it will be returned without change.
-	 * @param string $str string to be quoted
-	 * @return string the properly quoted string
-	 * @see http://www.php.net/manual/en/function.PDO-quote.php
-	 */
-	public function quoteValue($str)
-	{
-		return $this->getSchema()->quoteValue($str);
-	}
-
-	/**
-	 * Quotes a table name for use in a query.
-	 * If the table name contains schema prefix, the prefix will also be properly quoted.
-	 * If the table name is already quoted or contains special characters including '(', '[[' and '{{',
-	 * then this method will do nothing.
-	 * @param string $name table name
-	 * @return string the properly quoted table name
-	 */
-	public function quoteTableName($name)
-	{
-		return $this->getSchema()->quoteTableName($name);
-	}
-
-	/**
-	 * Quotes a column name for use in a query.
-	 * If the column name contains prefix, the prefix will also be properly quoted.
-	 * If the column name is already quoted or contains special characters including '(', '[[' and '{{',
-	 * then this method will do nothing.
-	 * @param string $name column name
-	 * @return string the properly quoted column name
-	 */
-	public function quoteColumnName($name)
-	{
-		return $this->getSchema()->quoteColumnName($name);
-	}
-
-	/**
-	 * Processes a SQL statement by quoting table and column names that are enclosed within double brackets.
-	 * Tokens enclosed within double curly brackets are treated as table names, while
-	 * tokens enclosed within double square brackets are column names. They will be quoted accordingly.
-	 * Also, the percentage character "%" in a table name will be replaced with [[tablePrefix]].
-	 * @param string $sql the SQL to be quoted
-	 * @return string the quoted SQL
-	 */
-	public function quoteSql($sql)
-	{
-		$db = $this;
-		return preg_replace_callback('/(\\{\\{([%\w\-\. ]+)\\}\\}|\\[\\[([\w\-\. ]+)\\]\\])/',
-			function($matches) use($db) {
-				if (isset($matches[3])) {
-					return $db->quoteColumnName($matches[3]);
-				} else {
-					return str_replace('%', $db->tablePrefix, $db->quoteTableName($matches[2]));
-				}
-			}, $sql);
-	}
-
-	/**
-	 * Returns the name of the DB driver for the current [[dsn]].
-	 * @return string name of the DB driver
-	 */
-	public function getDriverName()
-	{
-		if (($pos = strpos($this->dsn, ':')) !== false) {
-			return strtolower(substr($this->dsn, 0, $pos));
-		} else {
-			return strtolower($this->pdo->getAttribute(\PDO::ATTR_DRIVER_NAME));
-		}
-	}
-
-	/**
-	 * Returns the statistical results of SQL queries.
-	 * The results returned include the number of SQL statements executed and
-	 * the total time spent.
-	 * In order to use this method, [[enableProfiling]] has to be set true.
-	 * @return array the first element indicates the number of SQL statements executed,
-	 * and the second element the total time spent in SQL execution.
-	 * @see \yii\logging\Logger::getProfiling()
-	 */
-	public function getQuerySummary()
-	{
-		$logger = \Yii::getLogger();
-		$timings = $logger->getProfiling(array('yii\db\Command::query', 'yii\db\Command::execute'));
-		$count = count($timings);
-		$time = 0;
-		foreach ($timings as $timing) {
-			$time += $timing[1];
-		}
-		return array($count, $time);
-	}
-}
diff --git a/framework/db/DataReader.php b/framework/db/DataReader.php
deleted file mode 100644
index 20444e7..0000000
--- a/framework/db/DataReader.php
+++ /dev/null
@@ -1,264 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\db;
-
-use yii\base\InvalidCallException;
-
-/**
- * DataReader represents a forward-only stream of rows from a query result set.
- *
- * To read the current row of data, call [[read()]]. The method [[readAll()]]
- * returns all the rows in a single array. Rows of data can also be read by
- * iterating through the reader. For example,
- *
- * ~~~
- * $reader = $command->query('SELECT * FROM tbl_post');
- *
- * while ($row = $reader->read()) {
- *     $rows[] = $row;
- * }
- *
- * // equivalent to:
- * foreach($reader as $row) {
- *     $rows[] = $row;
- * }
- *
- * // equivalent to:
- * $rows = $reader->readAll();
- * ~~~
- *
- * Note that since DataReader is a forward-only stream, you can only traverse it once.
- * Doing it the second time will throw an exception.
- *
- * It is possible to use a specific mode of data fetching by setting
- * [[fetchMode]]. See the [PHP manual](http://www.php.net/manual/en/function.PDOStatement-setFetchMode.php)
- * for more details about possible fetch mode.
- *
- * @property boolean $isClosed whether the reader is closed or not.
- * @property integer $rowCount number of rows contained in the result.
- * @property integer $columnCount the number of columns in the result set.
- * @property mixed $fetchMode fetch mode used when retrieving the data.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class DataReader extends \yii\base\Object implements \Iterator, \Countable
-{
-	/**
-	 * @var \PDOStatement the PDOStatement associated with the command
-	 */
-	private $_statement;
-	private $_closed = false;
-	private $_row;
-	private $_index = -1;
-
-	/**
-	 * Constructor.
-	 * @param Command $command the command generating the query result
-	 * @param array $config name-value pairs that will be used to initialize the object properties
-	 */
-	public function __construct(Command $command, $config = array())
-	{
-		$this->_statement = $command->pdoStatement;
-		$this->_statement->setFetchMode(\PDO::FETCH_ASSOC);
-		parent::__construct($config);
-	}
-
-	/**
-	 * Binds a column to a PHP variable.
-	 * When rows of data are being fetched, the corresponding column value
-	 * will be set in the variable. Note, the fetch mode must include PDO::FETCH_BOUND.
-	 * @param mixed $column Number of the column (1-indexed) or name of the column
-	 * in the result set. If using the column name, be aware that the name
-	 * should match the case of the column, as returned by the driver.
-	 * @param mixed $value Name of the PHP variable to which the column will be bound.
-	 * @param integer $dataType Data type of the parameter
-	 * @see http://www.php.net/manual/en/function.PDOStatement-bindColumn.php
-	 */
-	public function bindColumn($column, &$value, $dataType = null)
-	{
-		if ($dataType === null) {
-			$this->_statement->bindColumn($column, $value);
-		} else {
-			$this->_statement->bindColumn($column, $value, $dataType);
-		}
-	}
-
-	/**
-	 * Set the default fetch mode for this statement
-	 * @param mixed $mode fetch mode
-	 * @see http://www.php.net/manual/en/function.PDOStatement-setFetchMode.php
-	 */
-	public function setFetchMode($mode)
-	{
-		$params = func_get_args();
-		call_user_func_array(array($this->_statement, 'setFetchMode'), $params);
-	}
-
-	/**
-	 * Advances the reader to the next row in a result set.
-	 * @return array the current row, false if no more row available
-	 */
-	public function read()
-	{
-		return $this->_statement->fetch();
-	}
-
-	/**
-	 * Returns a single column from the next row of a result set.
-	 * @param integer $columnIndex zero-based column index
-	 * @return mixed the column of the current row, false if no more row available
-	 */
-	public function readColumn($columnIndex)
-	{
-		return $this->_statement->fetchColumn($columnIndex);
-	}
-
-	/**
-	 * Returns an object populated with the next row of data.
-	 * @param string $className class name of the object to be created and populated
-	 * @param array $fields Elements of this array are passed to the constructor
-	 * @return mixed the populated object, false if no more row of data available
-	 */
-	public function readObject($className, $fields)
-	{
-		return $this->_statement->fetchObject($className, $fields);
-	}
-
-	/**
-	 * Reads the whole result set into an array.
-	 * @return array the result set (each array element represents a row of data).
-	 * An empty array will be returned if the result contains no row.
-	 */
-	public function readAll()
-	{
-		return $this->_statement->fetchAll();
-	}
-
-	/**
-	 * Advances the reader to the next result when reading the results of a batch of statements.
-	 * This method is only useful when there are multiple result sets
-	 * returned by the query. Not all DBMS support this feature.
-	 * @return boolean Returns true on success or false on failure.
-	 */
-	public function nextResult()
-	{
-		if (($result = $this->_statement->nextRowset()) !== false) {
-			$this->_index = -1;
-		}
-		return $result;
-	}
-
-	/**
-	 * Closes the reader.
-	 * This frees up the resources allocated for executing this SQL statement.
-	 * Read attempts after this method call are unpredictable.
-	 */
-	public function close()
-	{
-		$this->_statement->closeCursor();
-		$this->_closed = true;
-	}
-
-	/**
-	 * whether the reader is closed or not.
-	 * @return boolean whether the reader is closed or not.
-	 */
-	public function getIsClosed()
-	{
-		return $this->_closed;
-	}
-
-	/**
-	 * Returns the number of rows in the result set.
-	 * Note, most DBMS may not give a meaningful count.
-	 * In this case, use "SELECT COUNT(*) FROM tableName" to obtain the number of rows.
-	 * @return integer number of rows contained in the result.
-	 */
-	public function getRowCount()
-	{
-		return $this->_statement->rowCount();
-	}
-
-	/**
-	 * Returns the number of rows in the result set.
-	 * This method is required by the Countable interface.
-	 * Note, most DBMS may not give a meaningful count.
-	 * In this case, use "SELECT COUNT(*) FROM tableName" to obtain the number of rows.
-	 * @return integer number of rows contained in the result.
-	 */
-	public function count()
-	{
-		return $this->getRowCount();
-	}
-
-	/**
-	 * Returns the number of columns in the result set.
-	 * Note, even there's no row in the reader, this still gives correct column number.
-	 * @return integer the number of columns in the result set.
-	 */
-	public function getColumnCount()
-	{
-		return $this->_statement->columnCount();
-	}
-
-	/**
-	 * Resets the iterator to the initial state.
-	 * This method is required by the interface Iterator.
-	 * @throws InvalidCallException if this method is invoked twice
-	 */
-	public function rewind()
-	{
-		if ($this->_index < 0) {
-			$this->_row = $this->_statement->fetch();
-			$this->_index = 0;
-		} else {
-			throw new InvalidCallException('DataReader cannot rewind. It is a forward-only reader.');
-		}
-	}
-
-	/**
-	 * Returns the index of the current row.
-	 * This method is required by the interface Iterator.
-	 * @return integer the index of the current row.
-	 */
-	public function key()
-	{
-		return $this->_index;
-	}
-
-	/**
-	 * Returns the current row.
-	 * This method is required by the interface Iterator.
-	 * @return mixed the current row.
-	 */
-	public function current()
-	{
-		return $this->_row;
-	}
-
-	/**
-	 * Moves the internal pointer to the next row.
-	 * This method is required by the interface Iterator.
-	 */
-	public function next()
-	{
-		$this->_row = $this->_statement->fetch();
-		$this->_index++;
-	}
-
-	/**
-	 * Returns whether there is a row of data at current position.
-	 * This method is required by the interface Iterator.
-	 * @return boolean whether there is a row of data at current position.
-	 */
-	public function valid()
-	{
-		return $this->_row !== false;
-	}
-}
diff --git a/framework/db/Exception.php b/framework/db/Exception.php
deleted file mode 100644
index b7a60b4..0000000
--- a/framework/db/Exception.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\db;
-
-/**
- * Exception represents an exception that is caused by some DB-related operations.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Exception extends \yii\base\Exception
-{
-	/**
-	 * @var mixed the error info provided by a PDO exception. This is the same as returned
-	 * by [PDO::errorInfo](http://www.php.net/manual/en/pdo.errorinfo.php).
-	 */
-	public $errorInfo;
-
-	/**
-	 * Constructor.
-	 * @param string $message PDO error message
-	 * @param mixed $errorInfo PDO error info
-	 * @param integer $code PDO error code
-	 * @param \Exception $previous The previous exception used for the exception chaining.
-	 */
-	public function __construct($message, $errorInfo = null, $code = 0, \Exception $previous = null)
-	{
-		$this->errorInfo = $errorInfo;
-		parent::__construct($message, $code, $previous);
-	}
-
-	/**
-	 * @return string the user-friendly name of this exception
-	 */
-	public function getName()
-	{
-		return \Yii::t('yii|Database Exception');
-	}
-}
diff --git a/framework/db/Expression.php b/framework/db/Expression.php
deleted file mode 100644
index 77e9f60..0000000
--- a/framework/db/Expression.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\db;
-
-/**
- * Expression represents a DB expression that does not need escaping or quoting.
- * When an Expression object is embedded within a SQL statement or fragment,
- * it will be replaced with the [[expression]] property value without any
- * DB escaping or quoting. For example,
- *
- * ~~~
- * $expression = new Expression('NOW()');
- * $sql = 'SELECT ' . $expression;  // SELECT NOW()
- * ~~~
- *
- * An expression can also be bound with parameters specified via [[params]].
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Expression extends \yii\base\Object
-{
-	/**
-	 * @var string the DB expression
-	 */
-	public $expression;
-	/**
-	 * @var array list of parameters that should be bound for this expression.
-	 * The keys are placeholders appearing in [[expression]] and the values
-	 * are the corresponding parameter values.
-	 */
-	public $params = array();
-
-	/**
-	 * Constructor.
-	 * @param string $expression the DB expression
-	 * @param array $params parameters
-	 * @param array $config name-value pairs that will be used to initialize the object properties
-	 */
-	public function __construct($expression, $params = array(), $config = array())
-	{
-		$this->expression = $expression;
-		$this->params = $params;
-		parent::__construct($config);
-	}
-
-	/**
-	 * String magic method
-	 * @return string the DB expression
-	 */
-	public function __toString()
-	{
-		return $this->expression;
-	}
-}
diff --git a/framework/db/Migration.php b/framework/db/Migration.php
deleted file mode 100644
index f51e597..0000000
--- a/framework/db/Migration.php
+++ /dev/null
@@ -1,371 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\db;
-
-/**
- * Migration is the base class for representing a database migration.
- *
- * Migration is designed to be used together with the "yiic migrate" command.
- *
- * Each child class of Migration represents an individual database migration which
- * is identified by the child class name.
- *
- * Within each migration, the [[up()]] method should be overwritten to contain the logic
- * for "upgrading" the database; while the [[down()]] method for the "downgrading"
- * logic. The "yiic migrate" command manages all available migrations in an application.
- *
- * If the database supports transactions, you may also overwrite [[safeUp()]] and
- * [[safeDown()]] so that if anything wrong happens during the upgrading or downgrading,
- * the whole migration can be reverted in a whole.
- *
- * Migration provides a set of convenient methods for manipulating database data and schema.
- * For example, the [[insert()]] method can be used to easily insert a row of data into
- * a database table; the [[createTable()]] method can be used to create a database table.
- * Compared with the same methods in [[Command]], these methods will display extra
- * information showing the method parameters and execution time, which may be useful when
- * applying migrations.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Migration extends \yii\base\Component
-{
-	/**
-	 * @var Connection the database connection that this migration should work with.
-	 * If not set, it will be initialized as the 'db' application component.
-	 */
-	public $db;
-
-	/**
-	 * Initializes the migration.
-	 * This method will set [[db]] to be the 'db' application component, if it is null.
-	 */
-	public function init()
-	{
-		parent::init();
-		if ($this->db === null) {
-			$this->db = \Yii::$app->getComponent('db');
-		}
-	}
-
-	/**
-	 * This method contains the logic to be executed when applying this migration.
-	 * Child classes may overwrite this method to provide actual migration logic.
-	 * @return boolean return a false value to indicate the migration fails
-	 * and should not proceed further. All other return values mean the migration succeeds.
-	 */
-	public function up()
-	{
-		$transaction = $this->db->beginTransaction();
-		try {
-			if ($this->safeUp() === false) {
-				$transaction->rollback();
-				return false;
-			}
-			$transaction->commit();
-		} catch (\Exception $e) {
-			echo "Exception: " . $e->getMessage() . ' (' . $e->getFile() . ':' . $e->getLine() . ")\n";
-			echo $e->getTraceAsString() . "\n";
-			$transaction->rollback();
-			return false;
-		}
-		return null;
-	}
-
-	/**
-	 * This method contains the logic to be executed when removing this migration.
-	 * The default implementation throws an exception indicating the migration cannot be removed.
-	 * Child classes may override this method if the corresponding migrations can be removed.
-	 * @return boolean return a false value to indicate the migration fails
-	 * and should not proceed further. All other return values mean the migration succeeds.
-	 */
-	public function down()
-	{
-		$transaction = $this->db->beginTransaction();
-		try {
-			if ($this->safeDown() === false) {
-				$transaction->rollback();
-				return false;
-			}
-			$transaction->commit();
-		} catch (\Exception $e) {
-			echo "Exception: " . $e->getMessage() . ' (' . $e->getFile() . ':' . $e->getLine() . ")\n";
-			echo $e->getTraceAsString() . "\n";
-			$transaction->rollback();
-			return false;
-		}
-		return null;
-	}
-
-	/**
-	 * This method contains the logic to be executed when applying this migration.
-	 * This method differs from [[up()]] in that the DB logic implemented here will
-	 * be enclosed within a DB transaction.
-	 * Child classes may implement this method instead of [[up()]] if the DB logic
-	 * needs to be within a transaction.
-	 * @return boolean return a false value to indicate the migration fails
-	 * and should not proceed further. All other return values mean the migration succeeds.
-	 */
-	public function safeUp()
-	{
-	}
-
-	/**
-	 * This method contains the logic to be executed when removing this migration.
-	 * This method differs from [[down()]] in that the DB logic implemented here will
-	 * be enclosed within a DB transaction.
-	 * Child classes may implement this method instead of [[up()]] if the DB logic
-	 * needs to be within a transaction.
-	 * @return boolean return a false value to indicate the migration fails
-	 * and should not proceed further. All other return values mean the migration succeeds.
-	 */
-	public function safeDown()
-	{
-	}
-
-	/**
-	 * Executes a SQL statement.
-	 * This method executes the specified SQL statement using [[db]].
-	 * @param string $sql the SQL statement to be executed
-	 * @param array $params input parameters (name=>value) for the SQL execution. See [[Command::execute()]] for more details.
-	 */
-	public function execute($sql, $params = array())
-	{
-		echo "    > execute SQL: $sql ...";
-		$time = microtime(true);
-		$this->db->createCommand($sql)->execute($params);
-		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
-	}
-
-	/**
-	 * Creates and executes an INSERT SQL statement.
-	 * The method will properly escape the column names, and bind the values to be inserted.
-	 * @param string $table the table that new rows will be inserted into.
-	 * @param array $columns the column data (name=>value) to be inserted into the table.
-	 */
-	public function insert($table, $columns)
-	{
-		echo "    > insert into $table ...";
-		$time = microtime(true);
-		$this->db->createCommand()->insert($table, $columns)->execute();
-		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
-	}
-
-	/**
-	 * Creates and executes an UPDATE SQL statement.
-	 * The method will properly escape the column names and bind the values to be updated.
-	 * @param string $table the table to be updated.
-	 * @param array $columns the column data (name=>value) to be updated.
-	 * @param mixed $condition the conditions that will be put in the WHERE part. Please
-	 * refer to [[Query::where()]] on how to specify conditions.
-	 * @param array $params the parameters to be bound to the query.
-	 */
-	public function update($table, $columns, $condition = '', $params = array())
-	{
-		echo "    > update $table ...";
-		$time = microtime(true);
-		$this->db->createCommand()->update($table, $columns, $condition, $params)->execute();
-		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
-	}
-
-	/**
-	 * Creates and executes a DELETE SQL statement.
-	 * @param string $table the table where the data will be deleted from.
-	 * @param mixed $condition the conditions that will be put in the WHERE part. Please
-	 * refer to [[Query::where()]] on how to specify conditions.
-	 * @param array $params the parameters to be bound to the query.
-	 */
-	public function delete($table, $condition = '', $params = array())
-	{
-		echo "    > delete from $table ...";
-		$time = microtime(true);
-		$this->db->createCommand()->delete($table, $condition, $params)->execute();
-		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
-	}
-
-	/**
-	 * Builds and executes a SQL statement for creating a new DB table.
-	 *
-	 * The columns in the new  table should be specified as name-definition pairs (e.g. 'name'=>'string'),
-	 * where name stands for a column name which will be properly quoted by the method, and definition
-	 * stands for the column type which can contain an abstract DB type.
-	 *
-	 * The [[QueryBuilder::getColumnType()]] method will be invoked to convert any abstract type into a physical one.
-	 *
-	 * If a column is specified with definition only (e.g. 'PRIMARY KEY (name, type)'), it will be directly
-	 * put into the generated SQL.
-	 *
-	 * @param string $table the name of the table to be created. The name will be properly quoted by the method.
-	 * @param array $columns the columns (name=>definition) in the new table.
-	 * @param string $options additional SQL fragment that will be appended to the generated SQL.
-	 */
-	public function createTable($table, $columns, $options = null)
-	{
-		echo "    > create table $table ...";
-		$time = microtime(true);
-		$this->db->createCommand()->createTable($table, $columns, $options)->execute();
-		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
-	}
-
-	/**
-	 * Builds and executes a SQL statement for renaming a DB table.
-	 * @param string $table the table to be renamed. The name will be properly quoted by the method.
-	 * @param string $newName the new table name. The name will be properly quoted by the method.
-	 */
-	public function renameTable($table, $newName)
-	{
-		echo "    > rename table $table to $newName ...";
-		$time = microtime(true);
-		$this->db->createCommand()->renameTable($table, $newName)->execute();
-		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
-	}
-
-	/**
-	 * Builds and executes a SQL statement for dropping a DB table.
-	 * @param string $table the table to be dropped. The name will be properly quoted by the method.
-	 */
-	public function dropTable($table)
-	{
-		echo "    > drop table $table ...";
-		$time = microtime(true);
-		$this->db->createCommand()->dropTable($table)->execute();
-		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
-	}
-
-	/**
-	 * Builds and executes a SQL statement for truncating a DB table.
-	 * @param string $table the table to be truncated. The name will be properly quoted by the method.
-	 */
-	public function truncateTable($table)
-	{
-		echo "    > truncate table $table ...";
-		$time = microtime(true);
-		$this->db->createCommand()->truncateTable($table)->execute();
-		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
-	}
-
-	/**
-	 * Builds and executes a SQL statement for adding a new DB column.
-	 * @param string $table the table that the new column will be added to. The table name will be properly quoted by the method.
-	 * @param string $column the name of the new column. The name will be properly quoted by the method.
-	 * @param string $type the column type. The [[QueryBuilder::getColumnType()]] method will be invoked to convert abstract column type (if any)
-	 * into the physical one. Anything that is not recognized as abstract type will be kept in the generated SQL.
-	 * For example, 'string' will be turned into 'varchar(255)', while 'string not null' will become 'varchar(255) not null'.
-	 */
-	public function addColumn($table, $column, $type)
-	{
-		echo "    > add column $column $type to table $table ...";
-		$time = microtime(true);
-		$this->db->createCommand()->addColumn($table, $column, $type)->execute();
-		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
-	}
-
-	/**
-	 * Builds and executes a SQL statement for dropping a DB column.
-	 * @param string $table the table whose column is to be dropped. The name will be properly quoted by the method.
-	 * @param string $column the name of the column to be dropped. The name will be properly quoted by the method.
-	 */
-	public function dropColumn($table, $column)
-	{
-		echo "    > drop column $column from table $table ...";
-		$time = microtime(true);
-		$this->db->createCommand()->dropColumn($table, $column)->execute();
-		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
-	}
-
-	/**
-	 * Builds and executes a SQL statement for renaming a column.
-	 * @param string $table the table whose column is to be renamed. The name will be properly quoted by the method.
-	 * @param string $name the old name of the column. The name will be properly quoted by the method.
-	 * @param string $newName the new name of the column. The name will be properly quoted by the method.
-	 */
-	public function renameColumn($table, $name, $newName)
-	{
-		echo "    > rename column $name in table $table to $newName ...";
-		$time = microtime(true);
-		$this->db->createCommand()->renameColumn($table, $name, $newName)->execute();
-		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
-	}
-
-	/**
-	 * Builds and executes a SQL statement for changing the definition of a column.
-	 * @param string $table the table whose column is to be changed. The table name will be properly quoted by the method.
-	 * @param string $column the name of the column to be changed. The name will be properly quoted by the method.
-	 * @param string $type the new column type. The {@link getColumnType} method will be invoked to convert abstract column type (if any)
-	 * into the physical one. Anything that is not recognized as abstract type will be kept in the generated SQL.
-	 * For example, 'string' will be turned into 'varchar(255)', while 'string not null' will become 'varchar(255) not null'.
-	 */
-	public function alterColumn($table, $column, $type)
-	{
-		echo "    > alter column $column in table $table to $type ...";
-		$time = microtime(true);
-		$this->db->createCommand()->alterColumn($table, $column, $type)->execute();
-		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
-	}
-
-	/**
-	 * Builds a SQL statement for adding a foreign key constraint to an existing table.
-	 * The method will properly quote the table and column names.
-	 * @param string $name the name of the foreign key constraint.
-	 * @param string $table the table that the foreign key constraint will be added to.
-	 * @param string $columns the name of the column to that the constraint will be added on. If there are multiple columns, separate them with commas.
-	 * @param string $refTable the table that the foreign key references to.
-	 * @param string $refColumns the name of the column that the foreign key references to. If there are multiple columns, separate them with commas.
-	 * @param string $delete the ON DELETE option. Most DBMS support these options: RESTRICT, CASCADE, NO ACTION, SET DEFAULT, SET NULL
-	 * @param string $update the ON UPDATE option. Most DBMS support these options: RESTRICT, CASCADE, NO ACTION, SET DEFAULT, SET NULL
-	 */
-	public function addForeignKey($name, $table, $columns, $refTable, $refColumns, $delete = null, $update = null)
-	{
-		echo "    > add foreign key $name: $table ($columns) references $refTable ($refColumns) ...";
-		$time = microtime(true);
-		$this->db->createCommand()->addForeignKey($name, $table, $columns, $refTable, $refColumns, $delete, $update)->execute();
-		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
-	}
-
-	/**
-	 * Builds a SQL statement for dropping a foreign key constraint.
-	 * @param string $name the name of the foreign key constraint to be dropped. The name will be properly quoted by the method.
-	 * @param string $table the table whose foreign is to be dropped. The name will be properly quoted by the method.
-	 */
-	public function dropForeignKey($name, $table)
-	{
-		echo "    > drop foreign key $name from table $table ...";
-		$time = microtime(true);
-		$this->db->createCommand()->dropForeignKey($name, $table)->execute();
-		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
-	}
-
-	/**
-	 * Builds and executes a SQL statement for creating a new index.
-	 * @param string $name the name of the index. The name will be properly quoted by the method.
-	 * @param string $table the table that the new index will be created for. The table name will be properly quoted by the method.
-	 * @param string $column the column(s) that should be included in the index. If there are multiple columns, please separate them
-	 * by commas. The column names will be properly quoted by the method.
-	 * @param boolean $unique whether to add UNIQUE constraint on the created index.
-	 */
-	public function createIndex($name, $table, $column, $unique = false)
-	{
-		echo "    > create" . ($unique ? ' unique' : '') . " index $name on $table ($column) ...";
-		$time = microtime(true);
-		$this->db->createCommand()->createIndex($name, $table, $column, $unique)->execute();
-		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
-	}
-
-	/**
-	 * Builds and executes a SQL statement for dropping an index.
-	 * @param string $name the name of the index to be dropped. The name will be properly quoted by the method.
-	 * @param string $table the table whose index is to be dropped. The name will be properly quoted by the method.
-	 */
-	public function dropIndex($name, $table)
-	{
-		echo "    > drop index $name ...";
-		$time = microtime(true);
-		$this->db->createCommand()->dropIndex($name, $table)->execute();
-		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
-	}
-}
diff --git a/framework/db/Query.php b/framework/db/Query.php
deleted file mode 100644
index b1fc718..0000000
--- a/framework/db/Query.php
+++ /dev/null
@@ -1,607 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\db;
-
-/**
- * Query represents a SELECT SQL statement in a way that is independent of DBMS.
- *
- * Query provides a set of methods to facilitate the specification of different clauses
- * in a SELECT statement. These methods can be chained together.
- *
- * By calling [[createCommand()]], we can get a [[Command]] instance which can be further
- * used to perform/execute the DB query against a database.
- *
- * For example,
- *
- * ~~~
- * $query = new Query;
- * $query->select('id, name')
- *     ->from('tbl_user')
- *     ->limit(10);
- * // build and execute the query
- * $command = $query->createCommand();
- * // $command->sql returns the actual SQL
- * $rows = $command->queryAll();
- * ~~~
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Query extends \yii\base\Component
-{
-	/**
-	 * Sort ascending
-	 * @see orderBy
-	 */
-	const SORT_ASC = false;
-	/**
-	 * Sort ascending
-	 * @see orderBy
-	 */
-	const SORT_DESC = true;
-
-	/**
-	 * @var array the columns being selected. For example, `array('id', 'name')`.
-	 * This is used to construct the SELECT clause in a SQL statement. If not set, if means selecting all columns.
-	 * @see select()
-	 */
-	public $select;
-	/**
-	 * @var string additional option that should be appended to the 'SELECT' keyword. For example,
-	 * in MySQL, the option 'SQL_CALC_FOUND_ROWS' can be used.
-	 */
-	public $selectOption;
-	/**
-	 * @var boolean whether to select distinct rows of data only. If this is set true,
-	 * the SELECT clause would be changed to SELECT DISTINCT.
-	 */
-	public $distinct;
-	/**
-	 * @var array the table(s) to be selected from. For example, `array('tbl_user', 'tbl_post')`.
-	 * This is used to construct the FROM clause in a SQL statement.
-	 * @see from()
-	 */
-	public $from;
-	/**
-	 * @var string|array query condition. This refers to the WHERE clause in a SQL statement.
-	 * For example, `age > 31 AND team = 1`.
-	 * @see where()
-	 */
-	public $where;
-	/**
-	 * @var integer maximum number of records to be returned. If not set or less than 0, it means no limit.
-	 */
-	public $limit;
-	/**
-	 * @var integer zero-based offset from where the records are to be returned. If not set or
-	 * less than 0, it means starting from the beginning.
-	 */
-	public $offset;
-	/**
-	 * @var array how to sort the query results. This is used to construct the ORDER BY clause in a SQL statement.
-	 * The array keys are the columns to be sorted by, and the array values are the corresponding sort directions which
-	 * can be either [[Query::SORT_ASC]] or [[Query::SORT_DESC]]. The array may also contain [[Expression]] objects.
-	 * If that is the case, the expressions will be converted into strings without any change.
-	 */
-	public $orderBy;
-	/**
-	 * @var array how to group the query results. For example, `array('company', 'department')`.
-	 * This is used to construct the GROUP BY clause in a SQL statement.
-	 */
-	public $groupBy;
-	/**
-	 * @var array how to join with other tables. Each array element represents the specification
-	 * of one join which has the following structure:
-	 *
-	 * ~~~
-	 * array($joinType, $tableName, $joinCondition)
-	 * ~~~
-	 *
-	 * For example,
-	 *
-	 * ~~~
-	 * array(
-	 *     array('INNER JOIN', 'tbl_user', 'tbl_user.id = author_id'),
-	 *     array('LEFT JOIN', 'tbl_team', 'tbl_team.id = team_id'),
-	 * )
-	 * ~~~
-	 */
-	public $join;
-	/**
-	 * @var string|array the condition to be applied in the GROUP BY clause.
-	 * It can be either a string or an array. Please refer to [[where()]] on how to specify the condition.
-	 */
-	public $having;
-	/**
-	 * @var array this is used to construct the UNION clause(s) in a SQL statement.
-	 * Each array element can be either a string or a [[Query]] object representing a sub-query.
-	 */
-	public $union;
-	/**
-	 * @var array list of query parameter values indexed by parameter placeholders.
-	 * For example, `array(':name'=>'Dan', ':age'=>31)`.
-	 */
-	public $params;
-
-	/**
-	 * Creates a DB command that can be used to execute this query.
-	 * @param Connection $db the database connection used to generate the SQL statement.
-	 * If this parameter is not given, the `db` application component will be used.
-	 * @return Command the created DB command instance.
-	 */
-	public function createCommand($db = null)
-	{
-		if ($db === null) {
-			$db = \Yii::$app->db;
-		}
-		$sql = $db->getQueryBuilder()->build($this);
-		return $db->createCommand($sql, $this->params);
-	}
-
-	/**
-	 * Sets the SELECT part of the query.
-	 * @param string|array $columns the columns to be selected.
-	 * Columns can be specified in either a string (e.g. "id, name") or an array (e.g. array('id', 'name')).
-	 * Columns can contain table prefixes (e.g. "tbl_user.id") and/or column aliases (e.g. "tbl_user.id AS user_id").
-	 * The method will automatically quote the column names unless a column contains some parenthesis
-	 * (which means the column contains a DB expression).
-	 * @param string $option additional option that should be appended to the 'SELECT' keyword. For example,
-	 * in MySQL, the option 'SQL_CALC_FOUND_ROWS' can be used.
-	 * @return Query the query object itself
-	 */
-	public function select($columns, $option = null)
-	{
-		if (!is_array($columns)) {
-			$columns = preg_split('/\s*,\s*/', trim($columns), -1, PREG_SPLIT_NO_EMPTY);
-		}
-		$this->select = $columns;
-		$this->selectOption = $option;
-		return $this;
-	}
-
-	/**
-	 * Sets the value indicating whether to SELECT DISTINCT or not.
-	 * @param bool $value whether to SELECT DISTINCT or not.
-	 * @return Query the query object itself
-	 */
-	public function distinct($value = true)
-	{
-		$this->distinct = $value;
-		return $this;
-	}
-
-	/**
-	 * Sets the FROM part of the query.
-	 * @param string|array $tables the table(s) to be selected from. This can be either a string (e.g. `'tbl_user'`)
-	 * or an array (e.g. `array('tbl_user', 'tbl_profile')`) specifying one or several table names.
-	 * Table names can contain schema prefixes (e.g. `'public.tbl_user'`) and/or table aliases (e.g. `'tbl_user u'`).
-	 * The method will automatically quote the table names unless it contains some parenthesis
-	 * (which means the table is given as a sub-query or DB expression).
-	 * @return Query the query object itself
-	 */
-	public function from($tables)
-	{
-		if (!is_array($tables)) {
-			$tables = preg_split('/\s*,\s*/', trim($tables), -1, PREG_SPLIT_NO_EMPTY);
-		}
-		$this->from = $tables;
-		return $this;
-	}
-
-	/**
-	 * Sets the WHERE part of the query.
-	 *
-	 * The method requires a $condition parameter, and optionally a $params parameter
-	 * specifying the values to be bound to the query.
-	 *
-	 * The $condition parameter should be either a string (e.g. 'id=1') or an array.
-	 * If the latter, it must be in one of the following two formats:
-	 *
-	 * - hash format: `array('column1' => value1, 'column2' => value2, ...)`
-	 * - operator format: `array(operator, operand1, operand2, ...)`
-	 *
-	 * A condition in hash format represents the following SQL expression in general:
-	 * `column1=value1 AND column2=value2 AND ...`. In case when a value is an array,
-	 * an `IN` expression will be generated. And if a value is null, `IS NULL` will be used
-	 * in the generated expression. Below are some examples:
-	 *
-	 * - `array('type'=>1, 'status'=>2)` generates `(type=1) AND (status=2)`.
-	 * - `array('id'=>array(1,2,3), 'status'=>2)` generates `(id IN (1,2,3)) AND (status=2)`.
-	 * - `array('status'=>null) generates `status IS NULL`.
-	 *
-	 * A condition in operator format generates the SQL expression according to the specified operator, which
-	 * can be one of the followings:
-	 *
-	 * - `and`: the operands should be concatenated together using `AND`. For example,
-	 * `array('and', 'id=1', 'id=2')` will generate `id=1 AND id=2`. If an operand is an array,
-	 * it will be converted into a string using the rules described here. For example,
-	 * `array('and', 'type=1', array('or', 'id=1', 'id=2'))` will generate `type=1 AND (id=1 OR id=2)`.
-	 * The method will NOT do any quoting or escaping.
-	 *
-	 * - `or`: similar to the `and` operator except that the operands are concatenated using `OR`.
-	 *
-	 * - `between`: operand 1 should be the column name, and operand 2 and 3 should be the
-	 * starting and ending values of the range that the column is in.
-	 * For example, `array('between', 'id', 1, 10)` will generate `id BETWEEN 1 AND 10`.
-	 *
-	 * - `not between`: similar to `between` except the `BETWEEN` is replaced with `NOT BETWEEN`
-	 * in the generated condition.
-	 *
-	 * - `in`: operand 1 should be a column or DB expression, and operand 2 be an array representing
-	 * the range of the values that the column or DB expression should be in. For example,
-	 * `array('in', 'id', array(1,2,3))` will generate `id IN (1,2,3)`.
-	 * The method will properly quote the column name and escape values in the range.
-	 *
-	 * - `not in`: similar to the `in` operator except that `IN` is replaced with `NOT IN` in the generated condition.
-	 *
-	 * - `like`: operand 1 should be a column or DB expression, and operand 2 be a string or an array representing
-	 * the values that the column or DB expression should be like.
-	 * For example, `array('like', 'name', '%tester%')` will generate `name LIKE '%tester%'`.
-	 * When the value range is given as an array, multiple `LIKE` predicates will be generated and concatenated
-	 * using `AND`. For example, `array('like', 'name', array('%test%', '%sample%'))` will generate
-	 * `name LIKE '%test%' AND name LIKE '%sample%'`.
-	 * The method will properly quote the column name and escape values in the range.
-	 *
-	 * - `or like`: similar to the `like` operator except that `OR` is used to concatenate the `LIKE`
-	 * predicates when operand 2 is an array.
-	 *
-	 * - `not like`: similar to the `like` operator except that `LIKE` is replaced with `NOT LIKE`
-	 * in the generated condition.
-	 *
-	 * - `or not like`: similar to the `not like` operator except that `OR` is used to concatenate
-	 * the `NOT LIKE` predicates.
-	 *
-	 * @param string|array $condition the conditions that should be put in the WHERE part.
-	 * @param array $params the parameters (name=>value) to be bound to the query.
-	 * @return Query the query object itself
-	 * @see andWhere()
-	 * @see orWhere()
-	 */
-	public function where($condition, $params = array())
-	{
-		$this->where = $condition;
-		$this->addParams($params);
-		return $this;
-	}
-
-	/**
-	 * Adds an additional WHERE condition to the existing one.
-	 * The new condition and the existing one will be joined using the 'AND' operator.
-	 * @param string|array $condition the new WHERE condition. Please refer to [[where()]]
-	 * on how to specify this parameter.
-	 * @param array $params the parameters (name=>value) to be bound to the query.
-	 * @return Query the query object itself
-	 * @see where()
-	 * @see orWhere()
-	 */
-	public function andWhere($condition, $params = array())
-	{
-		if ($this->where === null) {
-			$this->where = $condition;
-		} else {
-			$this->where = array('and', $this->where, $condition);
-		}
-		$this->addParams($params);
-		return $this;
-	}
-
-	/**
-	 * Adds an additional WHERE condition to the existing one.
-	 * The new condition and the existing one will be joined using the 'OR' operator.
-	 * @param string|array $condition the new WHERE condition. Please refer to [[where()]]
-	 * on how to specify this parameter.
-	 * @param array $params the parameters (name=>value) to be bound to the query.
-	 * @return Query the query object itself
-	 * @see where()
-	 * @see andWhere()
-	 */
-	public function orWhere($condition, $params = array())
-	{
-		if ($this->where === null) {
-			$this->where = $condition;
-		} else {
-			$this->where = array('or', $this->where, $condition);
-		}
-		$this->addParams($params);
-		return $this;
-	}
-
-	/**
-	 * Appends a JOIN part to the query.
-	 * The first parameter specifies what type of join it is.
-	 * @param string $type the type of join, such as INNER JOIN, LEFT JOIN.
-	 * @param string $table the table to be joined.
-	 * Table name can contain schema prefix (e.g. 'public.tbl_user') and/or table alias (e.g. 'tbl_user u').
-	 * The method will automatically quote the table name unless it contains some parenthesis
-	 * (which means the table is given as a sub-query or DB expression).
-	 * @param string|array $on the join condition that should appear in the ON part.
-	 * Please refer to [[where()]] on how to specify this parameter.
-	 * @param array $params the parameters (name=>value) to be bound to the query.
-	 * @return Query the query object itself
-	 */
-	public function join($type, $table, $on = '', $params = array())
-	{
-		$this->join[] = array($type, $table, $on);
-		return $this->addParams($params);
-	}
-
-	/**
-	 * Appends an INNER JOIN part to the query.
-	 * @param string $table the table to be joined.
-	 * Table name can contain schema prefix (e.g. 'public.tbl_user') and/or table alias (e.g. 'tbl_user u').
-	 * The method will automatically quote the table name unless it contains some parenthesis
-	 * (which means the table is given as a sub-query or DB expression).
-	 * @param string|array $on the join condition that should appear in the ON part.
-	 * Please refer to [[where()]] on how to specify this parameter.
-	 * @param array $params the parameters (name=>value) to be bound to the query.
-	 * @return Query the query object itself
-	 */
-	public function innerJoin($table, $on = '', $params = array())
-	{
-		$this->join[] = array('INNER JOIN', $table, $on);
-		return $this->addParams($params);
-	}
-
-	/**
-	 * Appends a LEFT OUTER JOIN part to the query.
-	 * @param string $table the table to be joined.
-	 * Table name can contain schema prefix (e.g. 'public.tbl_user') and/or table alias (e.g. 'tbl_user u').
-	 * The method will automatically quote the table name unless it contains some parenthesis
-	 * (which means the table is given as a sub-query or DB expression).
-	 * @param string|array $on the join condition that should appear in the ON part.
-	 * Please refer to [[where()]] on how to specify this parameter.
-	 * @param array $params the parameters (name=>value) to be bound to the query
-	 * @return Query the query object itself
-	 */
-	public function leftJoin($table, $on = '', $params = array())
-	{
-		$this->join[] = array('LEFT JOIN', $table, $on);
-		return $this->addParams($params);
-	}
-
-	/**
-	 * Appends a RIGHT OUTER JOIN part to the query.
-	 * @param string $table the table to be joined.
-	 * Table name can contain schema prefix (e.g. 'public.tbl_user') and/or table alias (e.g. 'tbl_user u').
-	 * The method will automatically quote the table name unless it contains some parenthesis
-	 * (which means the table is given as a sub-query or DB expression).
-	 * @param string|array $on the join condition that should appear in the ON part.
-	 * Please refer to [[where()]] on how to specify this parameter.
-	 * @param array $params the parameters (name=>value) to be bound to the query
-	 * @return Query the query object itself
-	 */
-	public function rightJoin($table, $on = '', $params = array())
-	{
-		$this->join[] = array('RIGHT JOIN', $table, $on);
-		return $this->addParams($params);
-	}
-
-	/**
-	 * Sets the GROUP BY part of the query.
-	 * @param string|array $columns the columns to be grouped by.
-	 * Columns can be specified in either a string (e.g. "id, name") or an array (e.g. array('id', 'name')).
-	 * The method will automatically quote the column names unless a column contains some parenthesis
-	 * (which means the column contains a DB expression).
-	 * @return Query the query object itself
-	 * @see addGroupBy()
-	 */
-	public function groupBy($columns)
-	{
-		if (!is_array($columns)) {
-			$columns = preg_split('/\s*,\s*/', trim($columns), -1, PREG_SPLIT_NO_EMPTY);
-		}
-		$this->groupBy = $columns;
-		return $this;
-	}
-
-	/**
-	 * Adds additional group-by columns to the existing ones.
-	 * @param string|array $columns additional columns to be grouped by.
-	 * Columns can be specified in either a string (e.g. "id, name") or an array (e.g. array('id', 'name')).
-	 * The method will automatically quote the column names unless a column contains some parenthesis
-	 * (which means the column contains a DB expression).
-	 * @return Query the query object itself
-	 * @see groupBy()
-	 */
-	public function addGroupBy($columns)
-	{
-		if (!is_array($columns)) {
-			$columns = preg_split('/\s*,\s*/', trim($columns), -1, PREG_SPLIT_NO_EMPTY);
-		}
-		if ($this->groupBy === null) {
-			$this->groupBy = $columns;
-		} else {
-			$this->groupBy = array_merge($this->groupBy, $columns);
-		}
-		return $this;
-	}
-
-	/**
-	 * Sets the HAVING part of the query.
-	 * @param string|array $condition the conditions to be put after HAVING.
-	 * Please refer to [[where()]] on how to specify this parameter.
-	 * @param array $params the parameters (name=>value) to be bound to the query.
-	 * @return Query the query object itself
-	 * @see andHaving()
-	 * @see orHaving()
-	 */
-	public function having($condition, $params = array())
-	{
-		$this->having = $condition;
-		$this->addParams($params);
-		return $this;
-	}
-
-	/**
-	 * Adds an additional HAVING condition to the existing one.
-	 * The new condition and the existing one will be joined using the 'AND' operator.
-	 * @param string|array $condition the new HAVING condition. Please refer to [[where()]]
-	 * on how to specify this parameter.
-	 * @param array $params the parameters (name=>value) to be bound to the query.
-	 * @return Query the query object itself
-	 * @see having()
-	 * @see orHaving()
-	 */
-	public function andHaving($condition, $params = array())
-	{
-		if ($this->having === null) {
-			$this->having = $condition;
-		} else {
-			$this->having = array('and', $this->having, $condition);
-		}
-		$this->addParams($params);
-		return $this;
-	}
-
-	/**
-	 * Adds an additional HAVING condition to the existing one.
-	 * The new condition and the existing one will be joined using the 'OR' operator.
-	 * @param string|array $condition the new HAVING condition. Please refer to [[where()]]
-	 * on how to specify this parameter.
-	 * @param array $params the parameters (name=>value) to be bound to the query.
-	 * @return Query the query object itself
-	 * @see having()
-	 * @see andHaving()
-	 */
-	public function orHaving($condition, $params = array())
-	{
-		if ($this->having === null) {
-			$this->having = $condition;
-		} else {
-			$this->having = array('or', $this->having, $condition);
-		}
-		$this->addParams($params);
-		return $this;
-	}
-
-	/**
-	 * Sets the ORDER BY part of the query.
-	 * @param string|array $columns the columns (and the directions) to be ordered by.
-	 * Columns can be specified in either a string (e.g. "id ASC, name DESC") or an array
-	 * (e.g. `array('id' => Query::SORT_ASC, 'name' => Query::SORT_DESC)`).
-	 * The method will automatically quote the column names unless a column contains some parenthesis
-	 * (which means the column contains a DB expression).
-	 * @return Query the query object itself
-	 * @see addOrderBy()
-	 */
-	public function orderBy($columns)
-	{
-		$this->orderBy = $this->normalizeOrderBy($columns);
-		return $this;
-	}
-
-	/**
-	 * Adds additional ORDER BY columns to the query.
-	 * @param string|array $columns the columns (and the directions) to be ordered by.
-	 * Columns can be specified in either a string (e.g. "id ASC, name DESC") or an array
-	 * (e.g. `array('id' => Query::SORT_ASC, 'name' => Query::SORT_DESC)`).
-	 * The method will automatically quote the column names unless a column contains some parenthesis
-	 * (which means the column contains a DB expression).
-	 * @return Query the query object itself
-	 * @see orderBy()
-	 */
-	public function addOrderBy($columns)
-	{
-		$columns = $this->normalizeOrderBy($columns);
-		if ($this->orderBy === null) {
-			$this->orderBy = $columns;
-		} else {
-			$this->orderBy = array_merge($this->orderBy, $columns);
-		}
-		return $this;
-	}
-
-	protected function normalizeOrderBy($columns)
-	{
-		if (is_array($columns)) {
-			return $columns;
-		} else {
-			$columns = preg_split('/\s*,\s*/', trim($columns), -1, PREG_SPLIT_NO_EMPTY);
-			$result = array();
-			foreach ($columns as $column) {
-				if (preg_match('/^(.*?)\s+(asc|desc)$/i', $column, $matches)) {
-					$result[$matches[1]] = strcasecmp($matches[2], 'desc') ? self::SORT_ASC : self::SORT_DESC;
-				} else {
-					$result[$column] = self::SORT_ASC;
-				}
-			}
-			return $result;
-		}
-	}
-
-	/**
-	 * Sets the LIMIT part of the query.
-	 * @param integer $limit the limit
-	 * @return Query the query object itself
-	 */
-	public function limit($limit)
-	{
-		$this->limit = $limit;
-		return $this;
-	}
-
-	/**
-	 * Sets the OFFSET part of the query.
-	 * @param integer $offset the offset
-	 * @return Query the query object itself
-	 */
-	public function offset($offset)
-	{
-		$this->offset = $offset;
-		return $this;
-	}
-
-	/**
-	 * Appends a SQL statement using UNION operator.
-	 * @param string|Query $sql the SQL statement to be appended using UNION
-	 * @return Query the query object itself
-	 */
-	public function union($sql)
-	{
-		$this->union[] = $sql;
-		return $this;
-	}
-
-	/**
-	 * Sets the parameters to be bound to the query.
-	 * @param array $params list of query parameter values indexed by parameter placeholders.
-	 * For example, `array(':name'=>'Dan', ':age'=>31)`.
-	 * @return Query the query object itself
-	 * @see addParams()
-	 */
-	public function params($params)
-	{
-		$this->params = $params;
-		return $this;
-	}
-
-	/**
-	 * Adds additional parameters to be bound to the query.
-	 * @param array $params list of query parameter values indexed by parameter placeholders.
-	 * For example, `array(':name'=>'Dan', ':age'=>31)`.
-	 * @return Query the query object itself
-	 * @see params()
-	 */
-	public function addParams($params)
-	{
-		if (!empty($params)) {
-			if ($this->params === null) {
-				$this->params = $params;
-			} else {
-				foreach ($params as $name => $value) {
-					if (is_integer($name)) {
-						$this->params[] = $value;
-					} else {
-						$this->params[$name] = $value;
-					}
-				}
-			}
-		}
-		return $this;
-	}
-}
diff --git a/framework/db/QueryBuilder.php b/framework/db/QueryBuilder.php
deleted file mode 100644
index a4e30ea..0000000
--- a/framework/db/QueryBuilder.php
+++ /dev/null
@@ -1,912 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\db;
-
-use yii\db\Exception;
-use yii\base\NotSupportedException;
-
-/**
- * QueryBuilder builds a SELECT SQL statement based on the specification given as a [[Query]] object.
- *
- * QueryBuilder can also be used to build SQL statements such as INSERT, UPDATE, DELETE, CREATE TABLE,
- * from a [[Query]] object.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class QueryBuilder extends \yii\base\Object
-{
-	/**
-	 * The prefix for automatically generated query binding parameters.
-	 */
-	const PARAM_PREFIX = ':qp';
-
-	/**
-	 * @var Connection the database connection.
-	 */
-	public $db;
-	/**
-	 * @var string the separator between different fragments of a SQL statement.
-	 * Defaults to an empty space. This is mainly used by [[build()]] when generating a SQL statement.
-	 */
-	public $separator = " ";
-	/**
-	 * @var array the abstract column types mapped to physical column types.
-	 * This is mainly used to support creating/modifying tables using DB-independent data type specifications.
-	 * Child classes should override this property to declare supported type mappings.
-	 */
-	public $typeMap = array();
-
-	/**
-	 * Constructor.
-	 * @param Connection $connection the database connection.
-	 * @param array $config name-value pairs that will be used to initialize the object properties
-	 */
-	public function __construct($connection, $config = array())
-	{
-		$this->db = $connection;
-		parent::__construct($config);
-	}
-
-	/**
-	 * Generates a SELECT SQL statement from a [[Query]] object.
-	 * @param Query $query the [[Query]] object from which the SQL statement will be generated
-	 * @return string the generated SQL statement
-	 */
-	public function build($query)
-	{
-		$clauses = array(
-			$this->buildSelect($query->select, $query->distinct, $query->selectOption),
-			$this->buildFrom($query->from),
-			$this->buildJoin($query->join, $query->params),
-			$this->buildWhere($query->where, $query->params),
-			$this->buildGroupBy($query->groupBy),
-			$this->buildHaving($query->having, $query->params),
-			$this->buildUnion($query->union, $query->params),
-			$this->buildOrderBy($query->orderBy),
-			$this->buildLimit($query->limit, $query->offset),
-		);
-		return implode($this->separator, array_filter($clauses));
-	}
-
-	/**
-	 * Creates an INSERT SQL statement.
-	 * For example,
-	 *
-	 * ~~~
-	 * $sql = $queryBuilder->insert('tbl_user', array(
-	 *	 'name' => 'Sam',
-	 *	 'age' => 30,
-	 * ), $params);
-	 * ~~~
-	 *
-	 * The method will properly escape the table and column names.
-	 *
-	 * @param string $table the table that new rows will be inserted into.
-	 * @param array $columns the column data (name=>value) to be inserted into the table.
-	 * @param array $params the binding parameters that will be generated by this method.
-	 * They should be bound to the DB command later.
-	 * @return string the INSERT SQL
-	 */
-	public function insert($table, $columns, &$params)
-	{
-		$names = array();
-		$placeholders = array();
-		foreach ($columns as $name => $value) {
-			$names[] = $this->db->quoteColumnName($name);
-			if ($value instanceof Expression) {
-				$placeholders[] = $value->expression;
-				foreach ($value->params as $n => $v) {
-					$params[$n] = $v;
-				}
-			} else {
-				$phName = self::PARAM_PREFIX . count($params);
-				$placeholders[] = $phName;
-				$params[$phName] = $value;
-			}
-		}
-
-		return 'INSERT INTO ' . $this->db->quoteTableName($table)
-			. ' (' . implode(', ', $names) . ') VALUES ('
-			. implode(', ', $placeholders) . ')';
-	}
-
-	/**
-	 * Generates a batch INSERT SQL statement.
-	 * For example,
-	 *
-	 * ~~~
-	 * $connection->createCommand()->batchInsert('tbl_user', array('name', 'age'), array(
-	 *     array('Tom', 30),
-	 *     array('Jane', 20),
-	 *     array('Linda', 25),
-	 * ))->execute();
-	 * ~~~
-	 *
-	 * Not that the values in each row must match the corresponding column names.
-	 *
-	 * @param string $table the table that new rows will be inserted into.
-	 * @param array $columns the column names
-	 * @param array $rows the rows to be batch inserted into the table
-	 * @return string the batch INSERT SQL statement
-	 * @throws NotSupportedException if this is not supported by the underlying DBMS
-	 */
-	public function batchInsert($table, $columns, $rows)
-	{
-		throw new NotSupportedException($this->db->getDriverName() . ' does not support batch insert.');
-
-	}
-
-	/**
-	 * Creates an UPDATE SQL statement.
-	 * For example,
-	 *
-	 * ~~~
-	 * $params = array();
-	 * $sql = $queryBuilder->update('tbl_user', array(
-	 *	 'status' => 1,
-	 * ), 'age > 30', $params);
-	 * ~~~
-	 *
-	 * The method will properly escape the table and column names.
-	 *
-	 * @param string $table the table to be updated.
-	 * @param array $columns the column data (name=>value) to be updated.
-	 * @param mixed $condition the condition that will be put in the WHERE part. Please
-	 * refer to [[Query::where()]] on how to specify condition.
-	 * @param array $params the binding parameters that will be modified by this method
-	 * so that they can be bound to the DB command later.
-	 * @return string the UPDATE SQL
-	 */
-	public function update($table, $columns, $condition, &$params)
-	{
-		$lines = array();
-		foreach ($columns as $name => $value) {
-			if ($value instanceof Expression) {
-				$lines[] = $this->db->quoteColumnName($name) . '=' . $value->expression;
-				foreach ($value->params as $n => $v) {
-					$params[$n] = $v;
-				}
-			} else {
-				$phName = self::PARAM_PREFIX . count($params);
-				$lines[] = $this->db->quoteColumnName($name) . '=' . $phName;
-				$params[$phName] = $value;
-			}
-		}
-
-		$sql = 'UPDATE ' . $this->db->quoteTableName($table) . ' SET ' . implode(', ', $lines);
-		$where = $this->buildWhere($condition, $params);
-		return $where === '' ? $sql : $sql . ' ' . $where;
-	}
-
-	/**
-	 * Creates a DELETE SQL statement.
-	 * For example,
-	 *
-	 * ~~~
-	 * $sql = $queryBuilder->delete('tbl_user', 'status = 0');
-	 * ~~~
-	 *
-	 * The method will properly escape the table and column names.
-	 *
-	 * @param string $table the table where the data will be deleted from.
-	 * @param mixed $condition the condition that will be put in the WHERE part. Please
-	 * refer to [[Query::where()]] on how to specify condition.
-	 * @param array $params the binding parameters that will be modified by this method
-	 * so that they can be bound to the DB command later.
-	 * @return string the DELETE SQL
-	 */
-	public function delete($table, $condition, &$params)
-	{
-		$sql = 'DELETE FROM ' . $this->db->quoteTableName($table);
-		$where = $this->buildWhere($condition, $params);
-		return $where === '' ? $sql : $sql . ' ' . $where;
-	}
-
-	/**
-	 * Builds a SQL statement for creating a new DB table.
-	 *
-	 * The columns in the new  table should be specified as name-definition pairs (e.g. 'name'=>'string'),
-	 * where name stands for a column name which will be properly quoted by the method, and definition
-	 * stands for the column type which can contain an abstract DB type.
-	 * The [[getColumnType()]] method will be invoked to convert any abstract type into a physical one.
-	 *
-	 * If a column is specified with definition only (e.g. 'PRIMARY KEY (name, type)'), it will be directly
-	 * inserted into the generated SQL.
-	 *
-	 * For example,
-	 *
-	 * ~~~
-	 * $sql = $queryBuilder->createTable('tbl_user', array(
-	 *	 'id' => 'pk',
-	 *	 'name' => 'string',
-	 *	 'age' => 'integer',
-	 * ));
-	 * ~~~
-	 *
-	 * @param string $table the name of the table to be created. The name will be properly quoted by the method.
-	 * @param array $columns the columns (name=>definition) in the new table.
-	 * @param string $options additional SQL fragment that will be appended to the generated SQL.
-	 * @return string the SQL statement for creating a new DB table.
-	 */
-	public function createTable($table, $columns, $options = null)
-	{
-		$cols = array();
-		foreach ($columns as $name => $type) {
-			if (is_string($name)) {
-				$cols[] = "\t" . $this->db->quoteColumnName($name) . ' ' . $this->getColumnType($type);
-			} else {
-				$cols[] = "\t" . $type;
-			}
-		}
-		$sql = "CREATE TABLE " . $this->db->quoteTableName($table) . " (\n" . implode(",\n", $cols) . "\n)";
-		return $options === null ? $sql : $sql . ' ' . $options;
-	}
-
-	/**
-	 * Builds a SQL statement for renaming a DB table.
-	 * @param string $oldName the table to be renamed. The name will be properly quoted by the method.
-	 * @param string $newName the new table name. The name will be properly quoted by the method.
-	 * @return string the SQL statement for renaming a DB table.
-	 */
-	public function renameTable($oldName, $newName)
-	{
-		return 'RENAME TABLE ' . $this->db->quoteTableName($oldName) . ' TO ' . $this->db->quoteTableName($newName);
-	}
-
-	/**
-	 * Builds a SQL statement for dropping a DB table.
-	 * @param string $table the table to be dropped. The name will be properly quoted by the method.
-	 * @return string the SQL statement for dropping a DB table.
-	 */
-	public function dropTable($table)
-	{
-		return "DROP TABLE " . $this->db->quoteTableName($table);
-	}
-
-	/**
-	 * Builds a SQL statement for truncating a DB table.
-	 * @param string $table the table to be truncated. The name will be properly quoted by the method.
-	 * @return string the SQL statement for truncating a DB table.
-	 */
-	public function truncateTable($table)
-	{
-		return "TRUNCATE TABLE " . $this->db->quoteTableName($table);
-	}
-
-	/**
-	 * Builds a SQL statement for adding a new DB column.
-	 * @param string $table the table that the new column will be added to. The table name will be properly quoted by the method.
-	 * @param string $column the name of the new column. The name will be properly quoted by the method.
-	 * @param string $type the column type. The [[getColumnType()]] method will be invoked to convert abstract column type (if any)
-	 * into the physical one. Anything that is not recognized as abstract type will be kept in the generated SQL.
-	 * For example, 'string' will be turned into 'varchar(255)', while 'string not null' will become 'varchar(255) not null'.
-	 * @return string the SQL statement for adding a new column.
-	 */
-	public function addColumn($table, $column, $type)
-	{
-		return 'ALTER TABLE ' . $this->db->quoteTableName($table)
-			. ' ADD ' . $this->db->quoteColumnName($column) . ' '
-			. $this->getColumnType($type);
-	}
-
-	/**
-	 * Builds a SQL statement for dropping a DB column.
-	 * @param string $table the table whose column is to be dropped. The name will be properly quoted by the method.
-	 * @param string $column the name of the column to be dropped. The name will be properly quoted by the method.
-	 * @return string the SQL statement for dropping a DB column.
-	 */
-	public function dropColumn($table, $column)
-	{
-		return "ALTER TABLE " . $this->db->quoteTableName($table)
-			. " DROP COLUMN " . $this->db->quoteColumnName($column);
-	}
-
-	/**
-	 * Builds a SQL statement for renaming a column.
-	 * @param string $table the table whose column is to be renamed. The name will be properly quoted by the method.
-	 * @param string $oldName the old name of the column. The name will be properly quoted by the method.
-	 * @param string $newName the new name of the column. The name will be properly quoted by the method.
-	 * @return string the SQL statement for renaming a DB column.
-	 */
-	public function renameColumn($table, $oldName, $newName)
-	{
-		return "ALTER TABLE " . $this->db->quoteTableName($table)
-			. " RENAME COLUMN " . $this->db->quoteColumnName($oldName)
-			. " TO " . $this->db->quoteColumnName($newName);
-	}
-
-	/**
-	 * Builds a SQL statement for changing the definition of a column.
-	 * @param string $table the table whose column is to be changed. The table name will be properly quoted by the method.
-	 * @param string $column the name of the column to be changed. The name will be properly quoted by the method.
-	 * @param string $type the new column type. The [[getColumnType()]] method will be invoked to convert abstract
-	 * column type (if any) into the physical one. Anything that is not recognized as abstract type will be kept
-	 * in the generated SQL. For example, 'string' will be turned into 'varchar(255)', while 'string not null'
-	 * will become 'varchar(255) not null'.
-	 * @return string the SQL statement for changing the definition of a column.
-	 */
-	public function alterColumn($table, $column, $type)
-	{
-		return 'ALTER TABLE ' . $this->db->quoteTableName($table) . ' CHANGE '
-			. $this->db->quoteColumnName($column) . ' '
-			. $this->db->quoteColumnName($column) . ' '
-			. $this->getColumnType($type);
-	}
-
-	/**
-	 * Builds a SQL statement for adding a foreign key constraint to an existing table.
-	 * The method will properly quote the table and column names.
-	 * @param string $name the name of the foreign key constraint.
-	 * @param string $table the table that the foreign key constraint will be added to.
-	 * @param string|array $columns the name of the column to that the constraint will be added on.
-	 * If there are multiple columns, separate them with commas or use an array to represent them.
-	 * @param string $refTable the table that the foreign key references to.
-	 * @param string|array $refColumns the name of the column that the foreign key references to.
-	 * If there are multiple columns, separate them with commas or use an array to represent them.
-	 * @param string $delete the ON DELETE option. Most DBMS support these options: RESTRICT, CASCADE, NO ACTION, SET DEFAULT, SET NULL
-	 * @param string $update the ON UPDATE option. Most DBMS support these options: RESTRICT, CASCADE, NO ACTION, SET DEFAULT, SET NULL
-	 * @return string the SQL statement for adding a foreign key constraint to an existing table.
-	 */
-	public function addForeignKey($name, $table, $columns, $refTable, $refColumns, $delete = null, $update = null)
-	{
-		$sql = 'ALTER TABLE ' . $this->db->quoteTableName($table)
-			. ' ADD CONSTRAINT ' . $this->db->quoteColumnName($name)
-			. ' FOREIGN KEY (' . $this->buildColumns($columns) . ')'
-			. ' REFERENCES ' . $this->db->quoteTableName($refTable)
-			. ' (' . $this->buildColumns($refColumns) . ')';
-		if ($delete !== null) {
-			$sql .= ' ON DELETE ' . $delete;
-		}
-		if ($update !== null) {
-			$sql .= ' ON UPDATE ' . $update;
-		}
-		return $sql;
-	}
-
-	/**
-	 * Builds a SQL statement for dropping a foreign key constraint.
-	 * @param string $name the name of the foreign key constraint to be dropped. The name will be properly quoted by the method.
-	 * @param string $table the table whose foreign is to be dropped. The name will be properly quoted by the method.
-	 * @return string the SQL statement for dropping a foreign key constraint.
-	 */
-	public function dropForeignKey($name, $table)
-	{
-		return 'ALTER TABLE ' . $this->db->quoteTableName($table)
-			. ' DROP CONSTRAINT ' . $this->db->quoteColumnName($name);
-	}
-
-	/**
-	 * Builds a SQL statement for creating a new index.
-	 * @param string $name the name of the index. The name will be properly quoted by the method.
-	 * @param string $table the table that the new index will be created for. The table name will be properly quoted by the method.
-	 * @param string|array $columns the column(s) that should be included in the index. If there are multiple columns,
-	 * separate them with commas or use an array to represent them. Each column name will be properly quoted
-	 * by the method, unless a parenthesis is found in the name.
-	 * @param boolean $unique whether to add UNIQUE constraint on the created index.
-	 * @return string the SQL statement for creating a new index.
-	 */
-	public function createIndex($name, $table, $columns, $unique = false)
-	{
-		return ($unique ? 'CREATE UNIQUE INDEX ' : 'CREATE INDEX ')
-			. $this->db->quoteTableName($name) . ' ON '
-			. $this->db->quoteTableName($table)
-			. ' (' . $this->buildColumns($columns) . ')';
-	}
-
-	/**
-	 * Builds a SQL statement for dropping an index.
-	 * @param string $name the name of the index to be dropped. The name will be properly quoted by the method.
-	 * @param string $table the table whose index is to be dropped. The name will be properly quoted by the method.
-	 * @return string the SQL statement for dropping an index.
-	 */
-	public function dropIndex($name, $table)
-	{
-		return 'DROP INDEX ' . $this->db->quoteTableName($name) . ' ON ' . $this->db->quoteTableName($table);
-	}
-
-	/**
-	 * Creates a SQL statement for resetting the sequence value of a table's primary key.
-	 * The sequence will be reset such that the primary key of the next new row inserted
-	 * will have the specified value or 1.
-	 * @param string $table the name of the table whose primary key sequence will be reset
-	 * @param mixed $value the value for the primary key of the next new row inserted. If this is not set,
-	 * the next new row's primary key will have a value 1.
-	 * @return string the SQL statement for resetting sequence
-	 * @throws NotSupportedException if this is not supported by the underlying DBMS
-	 */
-	public function resetSequence($table, $value = null)
-	{
-		throw new NotSupportedException($this->db->getDriverName() . ' does not support resetting sequence.');
-	}
-
-	/**
-	 * Builds a SQL statement for enabling or disabling integrity check.
-	 * @param boolean $check whether to turn on or off the integrity check.
-	 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
-	 * @return string the SQL statement for checking integrity
-	 * @throws NotSupportedException if this is not supported by the underlying DBMS
-	 */
-	public function checkIntegrity($check = true, $schema = '')
-	{
-		throw new NotSupportedException($this->db->getDriverName() . ' does not support enabling/disabling integrity check.');
-	}
-
-	/**
-	 * Converts an abstract column type into a physical column type.
-	 * The conversion is done using the type map specified in [[typeMap]].
-	 * The following abstract column types are supported (using MySQL as an example to explain the corresponding
-	 * physical types):
-	 *
-	 * - `pk`: an auto-incremental primary key type, will be converted into "int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY"
-	 * - `string`: string type, will be converted into "varchar(255)"
-	 * - `text`: a long string type, will be converted into "text"
-	 * - `smallint`: a small integer type, will be converted into "smallint(6)"
-	 * - `integer`: integer type, will be converted into "int(11)"
-	 * - `bigint`: a big integer type, will be converted into "bigint(20)"
-	 * - `boolean`: boolean type, will be converted into "tinyint(1)"
-	 * - `float``: float number type, will be converted into "float"
-	 * - `decimal`: decimal number type, will be converted into "decimal"
-	 * - `datetime`: datetime type, will be converted into "datetime"
-	 * - `timestamp`: timestamp type, will be converted into "timestamp"
-	 * - `time`: time type, will be converted into "time"
-	 * - `date`: date type, will be converted into "date"
-	 * - `money`: money type, will be converted into "decimal(19,4)"
-	 * - `binary`: binary data type, will be converted into "blob"
-	 *
-	 * If the abstract type contains two or more parts separated by spaces (e.g. "string NOT NULL"), then only
-	 * the first part will be converted, and the rest of the parts will be appended to the converted result.
-	 * For example, 'string NOT NULL' is converted to 'varchar(255) NOT NULL'.
-	 *
-	 * If a type cannot be found in [[typeMap]], it will be returned without any change.
-	 * @param string $type abstract column type
-	 * @return string physical column type.
-	 */
-	public function getColumnType($type)
-	{
-		if (isset($this->typeMap[$type])) {
-			return $this->typeMap[$type];
-		} elseif (preg_match('/^(\w+)\s+/', $type, $matches)) {
-			if (isset($this->typeMap[$matches[1]])) {
-				return preg_replace('/^\w+/', $this->typeMap[$matches[1]], $type);
-			}
-		}
-		return $type;
-	}
-
-	/**
-	 * @param array $columns
-	 * @param boolean $distinct
-	 * @param string $selectOption
-	 * @return string the SELECT clause built from [[query]].
-	 */
-	public function buildSelect($columns, $distinct = false, $selectOption = null)
-	{
-		$select = $distinct ? 'SELECT DISTINCT' : 'SELECT';
-		if ($selectOption !== null) {
-			$select .= ' ' . $selectOption;
-		}
-
-		if (empty($columns)) {
-			return $select . ' *';
-		}
-
-		foreach ($columns as $i => $column) {
-			if (is_object($column)) {
-				$columns[$i] = (string)$column;
-			} elseif (strpos($column, '(') === false) {
-				if (preg_match('/^(.*?)(?i:\s+as\s+|\s+)([\w\-_\.]+)$/', $column, $matches)) {
-					$columns[$i] = $this->db->quoteColumnName($matches[1]) . ' AS ' . $this->db->quoteColumnName($matches[2]);
-				} else {
-					$columns[$i] = $this->db->quoteColumnName($column);
-				}
-			}
-		}
-
-		if (is_array($columns)) {
-			$columns = implode(', ', $columns);
-		}
-
-		return $select . ' ' . $columns;
-	}
-
-	/**
-	 * @param array $tables
-	 * @return string the FROM clause built from [[query]].
-	 */
-	public function buildFrom($tables)
-	{
-		if (empty($tables)) {
-			return '';
-		}
-
-		foreach ($tables as $i => $table) {
-			if (strpos($table, '(') === false) {
-				if (preg_match('/^(.*?)(?i:\s+as\s+|\s+)(.*)$/i', $table, $matches)) { // with alias
-					$tables[$i] = $this->db->quoteTableName($matches[1]) . ' ' . $this->db->quoteTableName($matches[2]);
-				} else {
-					$tables[$i] = $this->db->quoteTableName($table);
-				}
-			}
-		}
-
-		if (is_array($tables)) {
-			$tables = implode(', ', $tables);
-		}
-
-		return 'FROM ' . $tables;
-	}
-
-	/**
-	 * @param string|array $joins
-	 * @param array $params the binding parameters to be populated
-	 * @return string the JOIN clause built from [[query]].
-	 * @throws Exception if the $joins parameter is not in proper format
-	 */
-	public function buildJoin($joins, &$params)
-	{
-		if (empty($joins)) {
-			return '';
-		}
-
-		foreach ($joins as $i => $join) {
-			if (is_object($join)) {
-				$joins[$i] = (string)$join;
-			} elseif (is_array($join) && isset($join[0], $join[1])) {
-				// 0:join type, 1:table name, 2:on-condition
-				$table = $join[1];
-				if (strpos($table, '(') === false) {
-					if (preg_match('/^(.*?)(?i:\s+as\s+|\s+)(.*)$/', $table, $matches)) { // with alias
-						$table = $this->db->quoteTableName($matches[1]) . ' ' . $this->db->quoteTableName($matches[2]);
-					} else {
-						$table = $this->db->quoteTableName($table);
-					}
-				}
-				$joins[$i] = $join[0] . ' ' . $table;
-				if (isset($join[2])) {
-					$condition = $this->buildCondition($join[2], $params);
-					if ($condition !== '') {
-						$joins[$i] .= ' ON ' . $condition;
-					}
-				}
-			} else {
-				throw new Exception('A join clause must be specified as an array of join type, join table, and optionally join condition.');
-			}
-		}
-
-		return implode($this->separator, $joins);
-	}
-
-	/**
-	 * @param string|array $condition
-	 * @param array $params the binding parameters to be populated
-	 * @return string the WHERE clause built from [[query]].
-	 */
-	public function buildWhere($condition, &$params)
-	{
-		$where = $this->buildCondition($condition, $params);
-		return $where === '' ? '' : 'WHERE ' . $where;
-	}
-
-	/**
-	 * @param array $columns
-	 * @return string the GROUP BY clause
-	 */
-	public function buildGroupBy($columns)
-	{
-		return empty($columns) ? '' : 'GROUP BY ' . $this->buildColumns($columns);
-	}
-
-	/**
-	 * @param string|array $condition
-	 * @param array $params the binding parameters to be populated
-	 * @return string the HAVING clause built from [[query]].
-	 */
-	public function buildHaving($condition, &$params)
-	{
-		$having = $this->buildCondition($condition, $params);
-		return $having === '' ? '' : 'HAVING ' . $having;
-	}
-
-	/**
-	 * @param array $columns
-	 * @return string the ORDER BY clause built from [[query]].
-	 */
-	public function buildOrderBy($columns)
-	{
-		if (empty($columns)) {
-			return '';
-		}
-		$orders = array();
-		foreach ($columns as $name => $direction) {
-			if (is_object($direction)) {
-				$orders[] = (string)$direction;
-			} else {
-				$orders[] = $this->db->quoteColumnName($name) . ($direction === Query::SORT_DESC ? ' DESC' : '');
-			}
-		}
-
-		return 'ORDER BY ' . implode(', ', $orders);
-	}
-
-	/**
-	 * @param integer $limit
-	 * @param integer $offset
-	 * @return string the LIMIT and OFFSET clauses built from [[query]].
-	 */
-	public function buildLimit($limit, $offset)
-	{
-		$sql = '';
-		if ($limit !== null && $limit >= 0) {
-			$sql = 'LIMIT ' . (int)$limit;
-		}
-		if ($offset > 0) {
-			$sql .= ' OFFSET ' . (int)$offset;
-		}
-		return ltrim($sql);
-	}
-
-	/**
-	 * @param array $unions
-	 * @param array $params the binding parameters to be populated
-	 * @return string the UNION clause built from [[query]].
-	 */
-	public function buildUnion($unions, &$params)
-	{
-		if (empty($unions)) {
-			return '';
-		}
-		foreach ($unions as $i => $union) {
-			if ($union instanceof Query) {
-				$union->addParams($params);
-				$unions[$i] = $this->build($union);
-				$params = $union->params;
-			}
-		}
-		return "UNION (\n" . implode("\n) UNION (\n", $unions) . "\n)";
-	}
-
-	/**
-	 * Processes columns and properly quote them if necessary.
-	 * It will join all columns into a string with comma as separators.
-	 * @param string|array $columns the columns to be processed
-	 * @return string the processing result
-	 */
-	public function buildColumns($columns)
-	{
-		if (!is_array($columns)) {
-			if (strpos($columns, '(') !== false) {
-				return $columns;
-			} else {
-				$columns = preg_split('/\s*,\s*/', $columns, -1, PREG_SPLIT_NO_EMPTY);
-			}
-		}
-		foreach ($columns as $i => $column) {
-			if (is_object($column)) {
-				$columns[$i] = (string)$column;
-			} elseif (strpos($column, '(') === false) {
-				$columns[$i] = $this->db->quoteColumnName($column);
-			}
-		}
-		return is_array($columns) ? implode(', ', $columns) : $columns;
-	}
-
-
-	/**
-	 * Parses the condition specification and generates the corresponding SQL expression.
-	 * @param string|array $condition the condition specification. Please refer to [[Query::where()]]
-	 * on how to specify a condition.
-	 * @param array $params the binding parameters to be populated
-	 * @return string the generated SQL expression
-	 * @throws \yii\db\Exception if the condition is in bad format
-	 */
-	public function buildCondition($condition, &$params)
-	{
-		static $builders = array(
-			'AND' => 'buildAndCondition',
-			'OR' => 'buildAndCondition',
-			'BETWEEN' => 'buildBetweenCondition',
-			'NOT BETWEEN' => 'buildBetweenCondition',
-			'IN' => 'buildInCondition',
-			'NOT IN' => 'buildInCondition',
-			'LIKE' => 'buildLikeCondition',
-			'NOT LIKE' => 'buildLikeCondition',
-			'OR LIKE' => 'buildLikeCondition',
-			'OR NOT LIKE' => 'buildLikeCondition',
-		);
-
-		if (!is_array($condition)) {
-			return (string)$condition;
-		} elseif (empty($condition)) {
-			return '';
-		}
-		if (isset($condition[0])) { // operator format: operator, operand 1, operand 2, ...
-			$operator = strtoupper($condition[0]);
-			if (isset($builders[$operator])) {
-				$method = $builders[$operator];
-				array_shift($condition);
-				return $this->$method($operator, $condition, $params);
-			} else {
-				throw new Exception('Found unknown operator in query: ' . $operator);
-			}
-		} else { // hash format: 'column1'=>'value1', 'column2'=>'value2', ...
-			return $this->buildHashCondition($condition, $params);
-		}
-	}
-
-	private function buildHashCondition($condition, &$params)
-	{
-		$parts = array();
-		foreach ($condition as $column => $value) {
-			if (is_array($value)) { // IN condition
-				$parts[] = $this->buildInCondition('in', array($column, $value), $params);
-			} else {
-				if (strpos($column, '(') === false) {
-					$column = $this->db->quoteColumnName($column);
-				}
-				if ($value === null) {
-					$parts[] = "$column IS NULL";
-				} elseif ($value instanceof Expression) {
-					$parts[] = "$column=" . $value->expression;
-					foreach ($value->params as $n => $v) {
-						$params[$n] = $v;
-					}
-				} else {
-					$phName = self::PARAM_PREFIX . count($params);
-					$parts[] = "$column=$phName";
-					$params[$phName] = $value;
-				}
-			}
-		}
-		return count($parts) === 1 ? $parts[0] : '(' . implode(') AND (', $parts) . ')';
-	}
-
-	private function buildAndCondition($operator, $operands, &$params)
-	{
-		$parts = array();
-		foreach ($operands as $operand) {
-			if (is_array($operand)) {
-				$operand = $this->buildCondition($operand, $params);
-			}
-			if ($operand !== '') {
-				$parts[] = $operand;
-			}
-		}
-		if (!empty($parts)) {
-			return '(' . implode(") $operator (", $parts) . ')';
-		} else {
-			return '';
-		}
-	}
-
-	private function buildBetweenCondition($operator, $operands, &$params)
-	{
-		if (!isset($operands[0], $operands[1], $operands[2])) {
-			throw new Exception("Operator '$operator' requires three operands.");
-		}
-
-		list($column, $value1, $value2) = $operands;
-
-		if (strpos($column, '(') === false) {
-			$column = $this->db->quoteColumnName($column);
-		}
-		$phName1 = self::PARAM_PREFIX . count($params);
-		$phName2 = self::PARAM_PREFIX . count($params);
-		$params[$phName1] = $value1;
-		$params[$phName2] = $value2;
-
-		return "$column $operator $phName1 AND $phName2";
-	}
-
-	private function buildInCondition($operator, $operands, &$params)
-	{
-		if (!isset($operands[0], $operands[1])) {
-			throw new Exception("Operator '$operator' requires two operands.");
-		}
-
-		list($column, $values) = $operands;
-
-		$values = (array)$values;
-
-		if (empty($values) || $column === array()) {
-			return $operator === 'IN' ? '0=1' : '';
-		}
-
-		if (count($column) > 1) {
-			return $this->buildCompositeInCondition($operator, $column, $values, $params);
-		} elseif (is_array($column)) {
-			$column = reset($column);
-		}
-		foreach ($values as $i => $value) {
-			if (is_array($value)) {
-				$value = isset($value[$column]) ? $value[$column] : null;
-			}
-			if ($value === null) {
-				$values[$i] = 'NULL';
-			} elseif ($value instanceof Expression) {
-				$values[$i] = $value->expression;
-				foreach ($value->params as $n => $v) {
-					$params[$n] = $v;
-				}
-			} else {
-				$phName = self::PARAM_PREFIX . count($params);
-				$params[$phName] = $value;
-				$values[$i] = $phName;
-			}
-		}
-		if (strpos($column, '(') === false) {
-			$column = $this->db->quoteColumnName($column);
-		}
-
-		if (count($values) > 1) {
-			return "$column $operator (" . implode(', ', $values) . ')';
-		} else {
-			$operator = $operator === 'IN' ? '=' : '<>';
-			return "$column$operator{$values[0]}";
-		}
-	}
-
-	protected function buildCompositeInCondition($operator, $columns, $values, &$params)
-	{
-		foreach ($columns as $i => $column) {
-			if (strpos($column, '(') === false) {
-				$columns[$i] = $this->db->quoteColumnName($column);
-			}
-		}
-		$vss = array();
-		foreach ($values as $value) {
-			$vs = array();
-			foreach ($columns as $column) {
-				if (isset($value[$column])) {
-					$phName = self::PARAM_PREFIX . count($params);
-					$params[$phName] = $value[$column];
-					$vs[] = $phName;
-				} else {
-					$vs[] = 'NULL';
-				}
-			}
-			$vss[] = '(' . implode(', ', $vs) . ')';
-		}
-		return '(' . implode(', ', $columns) . ") $operator (" . implode(', ', $vss) . ')';
-	}
-
-	private function buildLikeCondition($operator, $operands, &$params)
-	{
-		if (!isset($operands[0], $operands[1])) {
-			throw new Exception("Operator '$operator' requires two operands.");
-		}
-
-		list($column, $values) = $operands;
-
-		$values = (array)$values;
-
-		if (empty($values)) {
-			return $operator === 'LIKE' || $operator === 'OR LIKE' ? '0=1' : '';
-		}
-
-		if ($operator === 'LIKE' || $operator === 'NOT LIKE') {
-			$andor = ' AND ';
-		} else {
-			$andor = ' OR ';
-			$operator = $operator === 'OR LIKE' ? 'LIKE' : 'NOT LIKE';
-		}
-
-		if (strpos($column, '(') === false) {
-			$column = $this->db->quoteColumnName($column);
-		}
-
-		$parts = array();
-		foreach ($values as $value) {
-			$phName = self::PARAM_PREFIX . count($params);
-			$params[$phName] = $value;
-			$parts[] = "$column $operator $phName";
-		}
-
-		return implode($andor, $parts);
-	}
-}
diff --git a/framework/db/Schema.php b/framework/db/Schema.php
deleted file mode 100644
index 9538e4c..0000000
--- a/framework/db/Schema.php
+++ /dev/null
@@ -1,363 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\db;
-
-use Yii;
-use yii\base\NotSupportedException;
-use yii\base\InvalidCallException;
-use yii\caching\Cache;
-
-/**
- * Schema is the base class for concrete DBMS-specific schema classes.
- *
- * Schema represents the database schema information that is DBMS specific.
- *
- * @property QueryBuilder $queryBuilder the query builder for the DBMS represented by this schema
- * @property array $tableNames the names of all tables in this database.
- * @property array $tableSchemas the schema information for all tables in this database.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-abstract class Schema extends \yii\base\Object
-{
-	/**
-	 * The followings are the supported abstract column data types.
-	 */
-	const TYPE_PK = 'pk';
-	const TYPE_STRING = 'string';
-	const TYPE_TEXT = 'text';
-	const TYPE_SMALLINT = 'smallint';
-	const TYPE_INTEGER = 'integer';
-	const TYPE_BIGINT = 'bigint';
-	const TYPE_FLOAT = 'float';
-	const TYPE_DECIMAL = 'decimal';
-	const TYPE_DATETIME = 'datetime';
-	const TYPE_TIMESTAMP = 'timestamp';
-	const TYPE_TIME = 'time';
-	const TYPE_DATE = 'date';
-	const TYPE_BINARY = 'binary';
-	const TYPE_BOOLEAN = 'boolean';
-	const TYPE_MONEY = 'money';
-
-	/**
-	 * @var Connection the database connection
-	 */
-	public $db;
-	/**
-	 * @var array list of ALL table names in the database
-	 */
-	private $_tableNames = array();
-	/**
-	 * @var array list of loaded table metadata (table name => TableSchema)
-	 */
-	private $_tables = array();
-	/**
-	 * @var QueryBuilder the query builder for this database
-	 */
-	private $_builder;
-
-	/**
-	 * Loads the metadata for the specified table.
-	 * @param string $name table name
-	 * @return TableSchema DBMS-dependent table metadata, null if the table does not exist.
-	 */
-	abstract protected function loadTableSchema($name);
-
-
-	/**
-	 * Obtains the metadata for the named table.
-	 * @param string $name table name. The table name may contain schema name if any. Do not quote the table name.
-	 * @param boolean $refresh whether to reload the table schema even if it is found in the cache.
-	 * @return TableSchema table metadata. Null if the named table does not exist.
-	 */
-	public function getTableSchema($name, $refresh = false)
-	{
-		if (isset($this->_tables[$name]) && !$refresh) {
-			return $this->_tables[$name];
-		}
-
-		$db = $this->db;
-		$realName = $this->getRawTableName($name);
-
-		if ($db->enableSchemaCache && !in_array($name, $db->schemaCacheExclude, true)) {
-			/** @var $cache Cache */
-			$cache = is_string($db->schemaCache) ? Yii::$app->getComponent($db->schemaCache) : $db->schemaCache;
-			if ($cache instanceof Cache) {
-				$key = $this->getCacheKey($cache, $name);
-				if ($refresh || ($table = $cache->get($key)) === false) {
-					$table = $this->loadTableSchema($realName);
-					if ($table !== null) {
-						$cache->set($key, $table, $db->schemaCacheDuration);
-					}
-				}
-				return $this->_tables[$name] = $table;
-			}
-		}
-		return $this->_tables[$name] = $table = $this->loadTableSchema($realName);
-	}
-
-	/**
-	 * Returns the cache key for the specified table name.
-	 * @param Cache $cache the cache component
-	 * @param string $name the table name
-	 * @return string the cache key
-	 */
-	public function getCacheKey($cache, $name)
-	{
-		return $cache->buildKey(array(
-			__CLASS__,
-			$this->db->dsn,
-			$this->db->username,
-			$name,
-		));
-	}
-
-	/**
-	 * Returns the metadata for all tables in the database.
-	 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema name.
-	 * @param boolean $refresh whether to fetch the latest available table schemas. If this is false,
-	 * cached data may be returned if available.
-	 * @return array the metadata for all tables in the database.
-	 * Each array element is an instance of [[TableSchema]] or its child class.
-	 */
-	public function getTableSchemas($schema = '', $refresh = false)
-	{
-		$tables = array();
-		foreach ($this->getTableNames($schema, $refresh) as $name) {
-			if ($schema !== '') {
-				$name = $schema . '.' . $name;
-			}
-			if (($table = $this->getTableSchema($name, $refresh)) !== null) {
-				$tables[] = $table;
-			}
-		}
-		return $tables;
-	}
-
-	/**
-	 * Returns all table names in the database.
-	 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema name.
-	 * If not empty, the returned table names will be prefixed with the schema name.
-	 * @param boolean $refresh whether to fetch the latest available table names. If this is false,
-	 * table names fetched previously (if available) will be returned.
-	 * @return array all table names in the database.
-	 */
-	public function getTableNames($schema = '', $refresh = false)
-	{
-		if (!isset($this->_tableNames[$schema]) || $refresh) {
-			$this->_tableNames[$schema] = $this->findTableNames($schema);
-		}
-		return $this->_tableNames[$schema];
-	}
-
-	/**
-	 * @return QueryBuilder the query builder for this connection.
-	 */
-	public function getQueryBuilder()
-	{
-		if ($this->_builder === null) {
-			$this->_builder = $this->createQueryBuilder();
-		}
-		return $this->_builder;
-	}
-
-	/**
-	 * Refreshes the schema.
-	 * This method cleans up all cached table schemas so that they can be re-created later
-	 * to reflect the database schema change.
-	 */
-	public function refresh()
-	{
-		/** @var $cache Cache */
-		$cache = is_string($this->db->schemaCache) ? Yii::$app->getComponent($this->db->schemaCache) : $this->db->schemaCache;
-		if ($this->db->enableSchemaCache && $cache instanceof Cache) {
-			foreach ($this->_tables as $name => $table) {
-				$cache->delete($this->getCacheKey($cache, $name));
-			}
-		}
-		$this->_tableNames = array();
-		$this->_tables = array();
-	}
-
-	/**
-	 * Creates a query builder for the database.
-	 * This method may be overridden by child classes to create a DBMS-specific query builder.
-	 * @return QueryBuilder query builder instance
-	 */
-	public function createQueryBuilder()
-	{
-		return new QueryBuilder($this->db);
-	}
-
-	/**
-	 * Returns all table names in the database.
-	 * This method should be overridden by child classes in order to support this feature
-	 * because the default implementation simply throws an exception.
-	 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
-	 * @return array all table names in the database. The names have NO the schema name prefix.
-	 * @throws NotSupportedException if this method is called
-	 */
-	protected function findTableNames($schema = '')
-	{
-		throw new NotSupportedException(get_class($this) . ' does not support fetching all table names.');
-	}
-
-	/**
-	 * Returns the ID of the last inserted row or sequence value.
-	 * @param string $sequenceName name of the sequence object (required by some DBMS)
-	 * @return string the row ID of the last row inserted, or the last value retrieved from the sequence object
-	 * @throws InvalidCallException if the DB connection is not active
-	 * @see http://www.php.net/manual/en/function.PDO-lastInsertId.php
-	 */
-	public function getLastInsertID($sequenceName = '')
-	{
-		if ($this->db->isActive) {
-			return $this->db->pdo->lastInsertId($sequenceName);
-		} else {
-			throw new InvalidCallException('DB Connection is not active.');
-		}
-	}
-
-	/**
-	 * Quotes a string value for use in a query.
-	 * Note that if the parameter is not a string, it will be returned without change.
-	 * @param string $str string to be quoted
-	 * @return string the properly quoted string
-	 * @see http://www.php.net/manual/en/function.PDO-quote.php
-	 */
-	public function quoteValue($str)
-	{
-		if (!is_string($str)) {
-			return $str;
-		}
-
-		$this->db->open();
-		if (($value = $this->db->pdo->quote($str)) !== false) {
-			return $value;
-		} else { // the driver doesn't support quote (e.g. oci)
-			return "'" . addcslashes(str_replace("'", "''", $str), "\000\n\r\\\032") . "'";
-		}
-	}
-
-	/**
-	 * Quotes a table name for use in a query.
-	 * If the table name contains schema prefix, the prefix will also be properly quoted.
-	 * If the table name is already quoted or contains '(' or '{{',
-	 * then this method will do nothing.
-	 * @param string $name table name
-	 * @return string the properly quoted table name
-	 * @see quoteSimpleTableName
-	 */
-	public function quoteTableName($name)
-	{
-		if (strpos($name, '(') !== false || strpos($name, '{{') !== false) {
-			return $name;
-		}
-		if (strpos($name, '.') === false) {
-			return $this->quoteSimpleTableName($name);
-		}
-		$parts = explode('.', $name);
-		foreach ($parts as $i => $part) {
-			$parts[$i] = $this->quoteSimpleTableName($part);
-		}
-		return implode('.', $parts);
-
-	}
-
-	/**
-	 * Quotes a column name for use in a query.
-	 * If the column name contains prefix, the prefix will also be properly quoted.
-	 * If the column name is already quoted or contains '(', '[[' or '{{',
-	 * then this method will do nothing.
-	 * @param string $name column name
-	 * @return string the properly quoted column name
-	 * @see quoteSimpleColumnName
-	 */
-	public function quoteColumnName($name)
-	{
-		if (strpos($name, '(') !== false || strpos($name, '[[') !== false || strpos($name, '{{') !== false) {
-			return $name;
-		}
-		if (($pos = strrpos($name, '.')) !== false) {
-			$prefix = $this->quoteTableName(substr($name, 0, $pos)) . '.';
-			$name = substr($name, $pos + 1);
-		} else {
-			$prefix = '';
-		}
-		return $prefix . $this->quoteSimpleColumnName($name);
-	}
-
-	/**
-	 * Quotes a simple table name for use in a query.
-	 * A simple table name should contain the table name only without any schema prefix.
-	 * If the table name is already quoted, this method will do nothing.
-	 * @param string $name table name
-	 * @return string the properly quoted table name
-	 */
-	public function quoteSimpleTableName($name)
-	{
-		return strpos($name, "'") !== false ? $name : "'" . $name . "'";
-	}
-
-	/**
-	 * Quotes a simple column name for use in a query.
-	 * A simple column name should contain the column name only without any prefix.
-	 * If the column name is already quoted or is the asterisk character '*', this method will do nothing.
-	 * @param string $name column name
-	 * @return string the properly quoted column name
-	 */
-	public function quoteSimpleColumnName($name)
-	{
-		return strpos($name, '"') !== false || $name === '*' ? $name : '"' . $name . '"';
-	}
-
-	/**
-	 * Returns the actual name of a given table name.
-	 * This method will strip off curly brackets from the given table name
-	 * and replace the percentage character '%' with [[Connection::tablePrefix]].
-	 * @param string $name the table name to be converted
-	 * @return string the real name of the given table name
-	 */
-	public function getRawTableName($name)
-	{
-		if (strpos($name, '{{') !== false) {
-			$name = preg_replace('/\\{\\{(.*?)\\}\\}/', '\1', $name);
-			return str_replace('%', $this->db->tablePrefix, $name);
-		} else {
-			return $name;
-		}
-	}
-
-	/**
-	 * Extracts the PHP type from abstract DB type.
-	 * @param ColumnSchema $column the column schema information
-	 * @return string PHP type name
-	 */
-	protected function getColumnPhpType($column)
-	{
-		static $typeMap = array( // abstract type => php type
-			'smallint' => 'integer',
-			'integer' => 'integer',
-			'bigint' => 'integer',
-			'boolean' => 'boolean',
-			'float' => 'double',
-		);
-		if (isset($typeMap[$column->type])) {
-			if ($column->type === 'bigint') {
-				return PHP_INT_SIZE == 8 && !$column->unsigned ? 'integer' : 'string';
-			} elseif ($column->type === 'integer') {
-				return PHP_INT_SIZE == 4 && $column->unsigned ? 'string' : 'integer';
-			} else {
-				return $typeMap[$column->type];
-			}
-		} else {
-			return 'string';
-		}
-	}
-}
diff --git a/framework/db/StaleObjectException.php b/framework/db/StaleObjectException.php
deleted file mode 100644
index 0a04bd3..0000000
--- a/framework/db/StaleObjectException.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\db;
-
-/**
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class StaleObjectException extends Exception
-{
-	/**
-	 * @return string the user-friendly name of this exception
-	 */
-	public function getName()
-	{
-		return \Yii::t('yii|Stale Object Exception');
-	}
-}
diff --git a/framework/db/TableSchema.php b/framework/db/TableSchema.php
deleted file mode 100644
index 1065b51..0000000
--- a/framework/db/TableSchema.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\db;
-
-use yii\base\InvalidParamException;
-
-/**
- * TableSchema represents the metadata of a database table.
- *
- * @property array $columnNames list of column names
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class TableSchema extends \yii\base\Object
-{
-	/**
-	 * @var string name of the catalog (database) that this table belongs to.
-	 * Defaults to null, meaning no catalog (or the current database).
-	 * This property is only meaningful for MSSQL.
-	 */
-	public $catalogName;
-	/**
-	 * @var string name of the schema that this table belongs to.
-	 */
-	public $schemaName;
-	/**
-	 * @var string name of this table.
-	 */
-	public $name;
-	/**
-	 * @var string[] primary keys of this table.
-	 */
-	public $primaryKey = array();
-	/**
-	 * @var string sequence name for the primary key. Null if no sequence.
-	 */
-	public $sequenceName;
-	/**
-	 * @var array foreign keys of this table. Each array element is of the following structure:
-	 *
-	 * ~~~
-	 * array(
-	 *	 'ForeignTableName',
-	 *	 'fk1' => 'pk1',  // pk1 is in foreign table
-	 *	 'fk2' => 'pk2',  // if composite foreign key
-	 * )
-	 * ~~~
-	 */
-	public $foreignKeys = array();
-	/**
-	 * @var ColumnSchema[] column metadata of this table. Each array element is a [[ColumnSchema]] object, indexed by column names.
-	 */
-	public $columns = array();
-
-	/**
-	 * Gets the named column metadata.
-	 * This is a convenient method for retrieving a named column even if it does not exist.
-	 * @param string $name column name
-	 * @return ColumnSchema metadata of the named column. Null if the named column does not exist.
-	 */
-	public function getColumn($name)
-	{
-		return isset($this->columns[$name]) ? $this->columns[$name] : null;
-	}
-
-	/**
-	 * Returns the names of all columns in this table.
-	 * @return array list of column names
-	 */
-	public function getColumnNames()
-	{
-		return array_keys($this->columns);
-	}
-
-	/**
-	 * Manually specifies the primary key for this table.
-	 * @param string|array $keys the primary key (can be composite)
-	 * @throws InvalidParamException if the specified key cannot be found in the table.
-	 */
-	public function fixPrimaryKey($keys)
-	{
-		if (!is_array($keys)) {
-			$keys = array($keys);
-		}
-		$this->primaryKey = $keys;
-		foreach ($this->columns as $column) {
-			$column->isPrimaryKey = false;
-		}
-		foreach ($keys as $key) {
-			if (isset($this->columns[$key])) {
-				$this->columns[$key]->isPrimaryKey = true;
-			} else {
-				throw new InvalidParamException("Primary key '$key' cannot be found in table '{$this->name}'.");
-			}
-		}
-	}
-}
diff --git a/framework/db/Transaction.php b/framework/db/Transaction.php
deleted file mode 100644
index 195a8c8..0000000
--- a/framework/db/Transaction.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\db;
-
-use yii\base\InvalidConfigException;
-
-/**
- * Transaction represents a DB transaction.
- *
- * It is usually created by calling [[Connection::beginTransaction()]].
- *
- * The following code is a typical example of using transactions (note that some
- * DBMS may not support transactions):
- *
- * ~~~
- * $transaction = $connection->beginTransaction();
- * try {
- *     $connection->createCommand($sql1)->execute();
- *     $connection->createCommand($sql2)->execute();
- *     //.... other SQL executions
- *     $transaction->commit();
- * } catch(Exception $e) {
- *     $transaction->rollback();
- * }
- * ~~~
- *
- * @property boolean $isActive Whether the transaction is active. This property is read-only.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Transaction extends \yii\base\Object
-{
-	/**
-	 * @var Connection the database connection that this transaction is associated with.
-	 */
-	public $db;
-	/**
-	 * @var boolean whether this transaction is active. Only an active transaction
-	 * can [[commit()]] or [[rollback()]]. This property is set true when the transaction is started.
-	 */
-	private $_active = false;
-
-	/**
-	 * Returns a value indicating whether this transaction is active.
-	 * @return boolean whether this transaction is active. Only an active transaction
-	 * can [[commit()]] or [[rollback()]].
-	 */
-	public function getIsActive()
-	{
-		return $this->_active;
-	}
-
-	/**
-	 * Begins a transaction.
-	 * @throws InvalidConfigException if [[connection]] is null
-	 */
-	public function begin()
-	{
-		if (!$this->_active) {
-			if ($this->db === null) {
-				throw new InvalidConfigException('Transaction::db must be set.');
-			}
-			\Yii::trace('Starting transaction', __METHOD__);
-			$this->db->open();
-			$this->db->pdo->beginTransaction();
-			$this->_active = true;
-		}
-	}
-
-	/**
-	 * Commits a transaction.
-	 * @throws Exception if the transaction or the DB connection is not active.
-	 */
-	public function commit()
-	{
-		if ($this->_active && $this->db && $this->db->isActive) {
-			\Yii::trace('Committing transaction', __METHOD__);
-			$this->db->pdo->commit();
-			$this->_active = false;
-		} else {
-			throw new Exception('Failed to commit transaction: transaction was inactive.');
-		}
-	}
-
-	/**
-	 * Rolls back a transaction.
-	 * @throws Exception if the transaction or the DB connection is not active.
-	 */
-	public function rollback()
-	{
-		if ($this->_active && $this->db && $this->db->isActive) {
-			\Yii::trace('Rolling back transaction', __METHOD__);
-			$this->db->pdo->rollBack();
-			$this->_active = false;
-		} else {
-			throw new Exception('Failed to roll back transaction: transaction was inactive.');
-		}
-	}
-}
diff --git a/framework/db/mysql/QueryBuilder.php b/framework/db/mysql/QueryBuilder.php
deleted file mode 100644
index a078b9a..0000000
--- a/framework/db/mysql/QueryBuilder.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\db\mysql;
-
-use yii\db\Exception;
-use yii\base\InvalidParamException;
-
-/**
- * QueryBuilder is the query builder for MySQL databases.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class QueryBuilder extends \yii\db\QueryBuilder
-{
-	/**
-	 * @var array mapping from abstract column types (keys) to physical column types (values).
-	 */
-	public $typeMap = array(
-		Schema::TYPE_PK => 'int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY',
-		Schema::TYPE_STRING => 'varchar(255)',
-		Schema::TYPE_TEXT => 'text',
-		Schema::TYPE_SMALLINT => 'smallint(6)',
-		Schema::TYPE_INTEGER => 'int(11)',
-		Schema::TYPE_BIGINT => 'bigint(20)',
-		Schema::TYPE_FLOAT => 'float',
-		Schema::TYPE_DECIMAL => 'decimal',
-		Schema::TYPE_DATETIME => 'datetime',
-		Schema::TYPE_TIMESTAMP => 'timestamp',
-		Schema::TYPE_TIME => 'time',
-		Schema::TYPE_DATE => 'date',
-		Schema::TYPE_BINARY => 'blob',
-		Schema::TYPE_BOOLEAN => 'tinyint(1)',
-		Schema::TYPE_MONEY => 'decimal(19,4)',
-	);
-
-	/**
-	 * Builds a SQL statement for renaming a column.
-	 * @param string $table the table whose column is to be renamed. The name will be properly quoted by the method.
-	 * @param string $oldName the old name of the column. The name will be properly quoted by the method.
-	 * @param string $newName the new name of the column. The name will be properly quoted by the method.
-	 * @return string the SQL statement for renaming a DB column.
-	 * @throws Exception
-	 */
-	public function renameColumn($table, $oldName, $newName)
-	{
-		$quotedTable = $this->db->quoteTableName($table);
-		$row = $this->db->createCommand('SHOW CREATE TABLE ' . $quotedTable)->queryRow();
-		if ($row === false) {
-			throw new Exception("Unable to find column '$oldName' in table '$table'.");
-		}
-		if (isset($row['Create Table'])) {
-			$sql = $row['Create Table'];
-		} else {
-			$row = array_values($row);
-			$sql = $row[1];
-		}
-		if (preg_match_all('/^\s*`(.*?)`\s+(.*?),?$/m', $sql, $matches)) {
-			foreach ($matches[1] as $i => $c) {
-				if ($c === $oldName) {
-					return "ALTER TABLE $quotedTable CHANGE "
-						. $this->db->quoteColumnName($oldName) . ' '
-						. $this->db->quoteColumnName($newName) . ' '
-						. $matches[2][$i];
-				}
-			}
-		}
-		// try to give back a SQL anyway
-		return "ALTER TABLE $quotedTable CHANGE "
-			. $this->db->quoteColumnName($oldName) . ' '
-			. $this->db->quoteColumnName($newName);
-	}
-
-	/**
-	 * Builds a SQL statement for dropping a foreign key constraint.
-	 * @param string $name the name of the foreign key constraint to be dropped. The name will be properly quoted by the method.
-	 * @param string $table the table whose foreign is to be dropped. The name will be properly quoted by the method.
-	 * @return string the SQL statement for dropping a foreign key constraint.
-	 */
-	public function dropForeignKey($name, $table)
-	{
-		return 'ALTER TABLE ' . $this->db->quoteTableName($table)
-			. ' DROP FOREIGN KEY ' . $this->db->quoteColumnName($name);
-	}
-
-	/**
-	 * Creates a SQL statement for resetting the sequence value of a table's primary key.
-	 * The sequence will be reset such that the primary key of the next new row inserted
-	 * will have the specified value or 1.
-	 * @param string $tableName the name of the table whose primary key sequence will be reset
-	 * @param mixed $value the value for the primary key of the next new row inserted. If this is not set,
-	 * the next new row's primary key will have a value 1.
-	 * @return string the SQL statement for resetting sequence
-	 * @throws InvalidParamException if the table does not exist or there is no sequence associated with the table.
-	 */
-	public function resetSequence($tableName, $value = null)
-	{
-		$table = $this->db->getTableSchema($tableName);
-		if ($table !== null && $table->sequenceName !== null) {
-			$tableName = $this->db->quoteTableName($tableName);
-			if ($value === null) {
-				$key = reset($table->primaryKey);
-				$value = $this->db->createCommand("SELECT MAX(`$key`) FROM $tableName")->queryScalar() + 1;
-			} else {
-				$value = (int)$value;
-			}
-			return "ALTER TABLE $tableName AUTO_INCREMENT=$value";
-		} elseif ($table === null) {
-			throw new InvalidParamException("Table not found: $tableName");
-		} else {
-			throw new InvalidParamException("There is not sequence associated with table '$tableName'.'");
-		}
-	}
-
-	/**
-	 * Builds a SQL statement for enabling or disabling integrity check.
-	 * @param boolean $check whether to turn on or off the integrity check.
-	 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
-	 * @return string the SQL statement for checking integrity
-	 */
-	public function checkIntegrity($check = true, $schema = '')
-	{
-		return 'SET FOREIGN_KEY_CHECKS=' . ($check ? 1 : 0);
-	}
-
-	/**
-	 * Generates a batch INSERT SQL statement.
-	 * For example,
-	 *
-	 * ~~~
-	 * $connection->createCommand()->batchInsert('tbl_user', array('name', 'age'), array(
-	 *     array('Tom', 30),
-	 *     array('Jane', 20),
-	 *     array('Linda', 25),
-	 * ))->execute();
-	 * ~~~
-	 *
-	 * Not that the values in each row must match the corresponding column names.
-	 *
-	 * @param string $table the table that new rows will be inserted into.
-	 * @param array $columns the column names
-	 * @param array $rows the rows to be batch inserted into the table
-	 * @return string the batch INSERT SQL statement
-	 */
-	public function batchInsert($table, $columns, $rows)
-	{
-		$values = array();
-		foreach ($rows as $row) {
-			$vs = array();
-			foreach ($row as $value) {
-				$vs[] = is_string($value) ? $this->db->quoteValue($value) : $value;
-			}
-			$values[] = $vs;
-		}
-
-		return 'INSERT INTO ' . $this->db->quoteTableName($table)
-			. ' (' . implode(', ', $columns) . ') VALUES ('
-			. implode(', ', $values) . ')';
-	}
-}
diff --git a/framework/db/mysql/Schema.php b/framework/db/mysql/Schema.php
deleted file mode 100644
index 501149a..0000000
--- a/framework/db/mysql/Schema.php
+++ /dev/null
@@ -1,246 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\db\mysql;
-
-use yii\db\TableSchema;
-use yii\db\ColumnSchema;
-
-/**
- * Schema is the class for retrieving metadata from a MySQL database (version 4.1.x and 5.x).
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Schema extends \yii\db\Schema
-{
-	/**
-	 * @var array mapping from physical column types (keys) to abstract column types (values)
-	 */
-	public $typeMap = array(
-		'tinyint' => self::TYPE_SMALLINT,
-		'bit' => self::TYPE_SMALLINT,
-		'smallint' => self::TYPE_SMALLINT,
-		'mediumint' => self::TYPE_INTEGER,
-		'int' => self::TYPE_INTEGER,
-		'integer' => self::TYPE_INTEGER,
-		'bigint' => self::TYPE_BIGINT,
-		'float' => self::TYPE_FLOAT,
-		'double' => self::TYPE_FLOAT,
-		'real' => self::TYPE_FLOAT,
-		'decimal' => self::TYPE_DECIMAL,
-		'numeric' => self::TYPE_DECIMAL,
-		'tinytext' => self::TYPE_TEXT,
-		'mediumtext' => self::TYPE_TEXT,
-		'longtext' => self::TYPE_TEXT,
-		'text' => self::TYPE_TEXT,
-		'varchar' => self::TYPE_STRING,
-		'string' => self::TYPE_STRING,
-		'char' => self::TYPE_STRING,
-		'datetime' => self::TYPE_DATETIME,
-		'year' => self::TYPE_DATE,
-		'date' => self::TYPE_DATE,
-		'time' => self::TYPE_TIME,
-		'timestamp' => self::TYPE_TIMESTAMP,
-		'enum' => self::TYPE_STRING,
-	);
-
-	/**
-	 * Quotes a table name for use in a query.
-	 * A simple table name has no schema prefix.
-	 * @param string $name table name
-	 * @return string the properly quoted table name
-	 */
-	public function quoteSimpleTableName($name)
-	{
-		return strpos($name, "`") !== false ? $name : "`" . $name . "`";
-	}
-
-	/**
-	 * Quotes a column name for use in a query.
-	 * A simple column name has no prefix.
-	 * @param string $name column name
-	 * @return string the properly quoted column name
-	 */
-	public function quoteSimpleColumnName($name)
-	{
-		return strpos($name, '`') !== false || $name === '*' ? $name : '`' . $name . '`';
-	}
-
-	/**
-	 * Creates a query builder for the MySQL database.
-	 * @return QueryBuilder query builder instance
-	 */
-	public function createQueryBuilder()
-	{
-		return new QueryBuilder($this->db);
-	}
-
-	/**
-	 * Loads the metadata for the specified table.
-	 * @param string $name table name
-	 * @return TableSchema driver dependent table metadata. Null if the table does not exist.
-	 */
-	protected function loadTableSchema($name)
-	{
-		$table = new TableSchema;
-		$this->resolveTableNames($table, $name);
-
-		if ($this->findColumns($table)) {
-			$this->findConstraints($table);
-			return $table;
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Resolves the table name and schema name (if any).
-	 * @param TableSchema $table the table metadata object
-	 * @param string $name the table name
-	 */
-	protected function resolveTableNames($table, $name)
-	{
-		$parts = explode('.', str_replace('`', '', $name));
-		if (isset($parts[1])) {
-			$table->schemaName = $parts[0];
-			$table->name = $parts[1];
-		} else {
-			$table->name = $parts[0];
-		}
-	}
-
-	/**
-	 * Loads the column information into a [[ColumnSchema]] object.
-	 * @param array $info column information
-	 * @return ColumnSchema the column schema object
-	 */
-	protected function loadColumnSchema($info)
-	{
-		$column = new ColumnSchema;
-
-		$column->name = $info['Field'];
-		$column->allowNull = $info['Null'] === 'YES';
-		$column->isPrimaryKey = strpos($info['Key'], 'PRI') !== false;
-		$column->autoIncrement = stripos($info['Extra'], 'auto_increment') !== false;
-		$column->comment = $info['Comment'];
-
-
-		$column->dbType = $info['Type'];
-		$column->unsigned = strpos($column->dbType, 'unsigned') !== false;
-
-		$column->type = self::TYPE_STRING;
-		if (preg_match('/^(\w+)(?:\(([^\)]+)\))?/', $column->dbType, $matches)) {
-			$type = $matches[1];
-			if (isset($this->typeMap[$type])) {
-				$column->type = $this->typeMap[$type];
-			}
-			if (!empty($matches[2])) {
-				if ($type === 'enum') {
-					$values = explode(',', $matches[2]);
-					foreach ($values as $i => $value) {
-						$values[$i] = trim($value, "'");
-					}
-					$column->enumValues = $values;
-				} else {
-					$values = explode(',', $matches[2]);
-					$column->size = $column->precision = (int)$values[0];
-					if (isset($values[1])) {
-						$column->scale = (int)$values[1];
-					}
-					if ($column->size === 1 && ($type === 'tinyint' || $type === 'bit')) {
-						$column->type = 'boolean';
-					} elseif ($type === 'bit') {
-						if ($column->size > 32) {
-							$column->type = 'bigint';
-						} elseif ($column->size === 32) {
-							$column->type = 'integer';
-						}
-					}
-				}
-			}
-		}
-
-		$column->phpType = $this->getColumnPhpType($column);
-
-		if ($column->type !== 'timestamp' || $info['Default'] !== 'CURRENT_TIMESTAMP') {
-			$column->defaultValue = $column->typecast($info['Default']);
-		}
-
-		return $column;
-	}
-
-	/**
-	 * Collects the metadata of table columns.
-	 * @param TableSchema $table the table metadata
-	 * @return boolean whether the table exists in the database
-	 */
-	protected function findColumns($table)
-	{
-		$sql = 'SHOW FULL COLUMNS FROM ' . $this->quoteSimpleTableName($table->name);
-		try {
-			$columns = $this->db->createCommand($sql)->queryAll();
-		} catch (\Exception $e) {
-			return false;
-		}
-		foreach ($columns as $info) {
-			$column = $this->loadColumnSchema($info);
-			$table->columns[$column->name] = $column;
-			if ($column->isPrimaryKey) {
-				$table->primaryKey[] = $column->name;
-				if ($column->autoIncrement) {
-					$table->sequenceName = '';
-				}
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Collects the foreign key column details for the given table.
-	 * @param TableSchema $table the table metadata
-	 */
-	protected function findConstraints($table)
-	{
-		$row = $this->db->createCommand('SHOW CREATE TABLE ' . $this->quoteSimpleTableName($table->name))->queryRow();
-		if (isset($row['Create Table'])) {
-			$sql = $row['Create Table'];
-		} else {
-			$row = array_values($row);
-			$sql = $row[1];
-		}
-
-		$regexp = '/FOREIGN KEY\s+\(([^\)]+)\)\s+REFERENCES\s+([^\(^\s]+)\s*\(([^\)]+)\)/mi';
-		if (preg_match_all($regexp, $sql, $matches, PREG_SET_ORDER)) {
-			foreach ($matches as $match) {
-				$fks = array_map('trim', explode(',', str_replace('`', '', $match[1])));
-				$pks = array_map('trim', explode(',', str_replace('`', '', $match[3])));
-				$constraint = array(str_replace('`', '', $match[2]));
-				foreach ($fks as $k => $name) {
-					$constraint[$name] = $pks[$k];
-				}
-				$table->foreignKeys[] = $constraint;
-			}
-		}
-	}
-
-	/**
-	 * Returns all table names in the database.
-	 * This method should be overridden by child classes in order to support this feature
-	 * because the default implementation simply throws an exception.
-	 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
-	 * @return array all table names in the database. The names have NO the schema name prefix.
-	 */
-	protected function findTableNames($schema = '')
-	{
-		$sql = 'SHOW TABLES';
-		if ($schema !== '') {
-			$sql .= ' FROM ' . $this->quoteSimpleTableName($schema);
-		}
-		return $this->db->createCommand($sql)->queryColumn();
-	}
-}
diff --git a/framework/db/sqlite/QueryBuilder.php b/framework/db/sqlite/QueryBuilder.php
deleted file mode 100644
index 3aa89e7..0000000
--- a/framework/db/sqlite/QueryBuilder.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\db\sqlite;
-
-use yii\db\Exception;
-use yii\base\InvalidParamException;
-use yii\base\NotSupportedException;
-
-/**
- * QueryBuilder is the query builder for SQLite databases.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class QueryBuilder extends \yii\db\QueryBuilder
-{
-	/**
-	 * @var array mapping from abstract column types (keys) to physical column types (values).
-	 */
-	public $typeMap = array(
-		Schema::TYPE_PK => 'integer PRIMARY KEY AUTOINCREMENT NOT NULL',
-		Schema::TYPE_STRING => 'varchar(255)',
-		Schema::TYPE_TEXT => 'text',
-		Schema::TYPE_SMALLINT => 'smallint',
-		Schema::TYPE_INTEGER => 'integer',
-		Schema::TYPE_BIGINT => 'bigint',
-		Schema::TYPE_FLOAT => 'float',
-		Schema::TYPE_DECIMAL => 'decimal',
-		Schema::TYPE_DATETIME => 'datetime',
-		Schema::TYPE_TIMESTAMP => 'timestamp',
-		Schema::TYPE_TIME => 'time',
-		Schema::TYPE_DATE => 'date',
-		Schema::TYPE_BINARY => 'blob',
-		Schema::TYPE_BOOLEAN => 'tinyint(1)',
-		Schema::TYPE_MONEY => 'decimal(19,4)',
-	);
-
-	/**
-	 * Creates a SQL statement for resetting the sequence value of a table's primary key.
-	 * The sequence will be reset such that the primary key of the next new row inserted
-	 * will have the specified value or 1.
-	 * @param string $tableName the name of the table whose primary key sequence will be reset
-	 * @param mixed $value the value for the primary key of the next new row inserted. If this is not set,
-	 * the next new row's primary key will have a value 1.
-	 * @return string the SQL statement for resetting sequence
-	 * @throws InvalidParamException if the table does not exist or there is no sequence associated with the table.
-	 */
-	public function resetSequence($tableName, $value = null)
-	{
-		$db = $this->db;
-		$table = $db->getTableSchema($tableName);
-		if ($table !== null && $table->sequenceName !== null) {
-			if ($value === null) {
-				$key = reset($table->primaryKey);
-				$tableName = $db->quoteTableName($tableName);
-				$value = $db->createCommand("SELECT MAX('$key') FROM $tableName")->queryScalar();
-			} else {
-				$value = (int)$value - 1;
-			}
-			try {
-				// it's possible sqlite_sequence does not exist
-				$db->createCommand("UPDATE sqlite_sequence SET seq='$value' WHERE name='{$table->name}'")->execute();
-			} catch (Exception $e) {
-			}
-		} elseif ($table === null) {
-			throw new InvalidParamException("Table not found: $tableName");
-		} else {
-			throw new InvalidParamException("There is not sequence associated with table '$tableName'.'");
-		}
-	}
-
-	/**
-	 * Enables or disables integrity check.
-	 * @param boolean $check whether to turn on or off the integrity check.
-	 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
-	 * @throws NotSupportedException this is not supported by SQLite
-	 */
-	public function checkIntegrity($check = true, $schema = '')
-	{
-		throw new NotSupportedException(__METHOD__ . ' is not supported by SQLite.');
-	}
-
-	/**
-	 * Builds a SQL statement for truncating a DB table.
-	 * @param string $table the table to be truncated. The name will be properly quoted by the method.
-	 * @return string the SQL statement for truncating a DB table.
-	 */
-	public function truncateTable($table)
-	{
-		return "DELETE FROM " . $this->db->quoteTableName($table);
-	}
-
-	/**
-	 * Builds a SQL statement for dropping an index.
-	 * @param string $name the name of the index to be dropped. The name will be properly quoted by the method.
-	 * @param string $table the table whose index is to be dropped. The name will be properly quoted by the method.
-	 * @return string the SQL statement for dropping an index.
-	 */
-	public function dropIndex($name, $table)
-	{
-		return 'DROP INDEX ' . $this->db->quoteTableName($name);
-	}
-
-	/**
-	 * Builds a SQL statement for dropping a DB column.
-	 * @param string $table the table whose column is to be dropped. The name will be properly quoted by the method.
-	 * @param string $column the name of the column to be dropped. The name will be properly quoted by the method.
-	 * @return string the SQL statement for dropping a DB column.
-	 * @throws NotSupportedException this is not supported by SQLite
-	 */
-	public function dropColumn($table, $column)
-	{
-		throw new NotSupportedException(__METHOD__ . ' is not supported by SQLite.');
-	}
-
-	/**
-	 * Builds a SQL statement for renaming a column.
-	 * @param string $table the table whose column is to be renamed. The name will be properly quoted by the method.
-	 * @param string $oldName the old name of the column. The name will be properly quoted by the method.
-	 * @param string $newName the new name of the column. The name will be properly quoted by the method.
-	 * @return string the SQL statement for renaming a DB column.
-	 * @throws NotSupportedException this is not supported by SQLite
-	 */
-	public function renameColumn($table, $oldName, $newName)
-	{
-		throw new NotSupportedException(__METHOD__ . ' is not supported by SQLite.');
-	}
-
-	/**
-	 * Builds a SQL statement for adding a foreign key constraint to an existing table.
-	 * The method will properly quote the table and column names.
-	 * @param string $name the name of the foreign key constraint.
-	 * @param string $table the table that the foreign key constraint will be added to.
-	 * @param string|array $columns the name of the column to that the constraint will be added on.
-	 * If there are multiple columns, separate them with commas or use an array to represent them.
-	 * @param string $refTable the table that the foreign key references to.
-	 * @param string|array $refColumns the name of the column that the foreign key references to.
-	 * If there are multiple columns, separate them with commas or use an array to represent them.
-	 * @param string $delete the ON DELETE option. Most DBMS support these options: RESTRICT, CASCADE, NO ACTION, SET DEFAULT, SET NULL
-	 * @param string $update the ON UPDATE option. Most DBMS support these options: RESTRICT, CASCADE, NO ACTION, SET DEFAULT, SET NULL
-	 * @return string the SQL statement for adding a foreign key constraint to an existing table.
-	 * @throws NotSupportedException this is not supported by SQLite
-	 */
-	public function addForeignKey($name, $table, $columns, $refTable, $refColumns, $delete = null, $update = null)
-	{
-		throw new NotSupportedException(__METHOD__ . ' is not supported by SQLite.');
-	}
-
-	/**
-	 * Builds a SQL statement for dropping a foreign key constraint.
-	 * @param string $name the name of the foreign key constraint to be dropped. The name will be properly quoted by the method.
-	 * @param string $table the table whose foreign is to be dropped. The name will be properly quoted by the method.
-	 * @return string the SQL statement for dropping a foreign key constraint.
-	 * @throws NotSupportedException this is not supported by SQLite
-	 */
-	public function dropForeignKey($name, $table)
-	{
-		throw new NotSupportedException(__METHOD__ . ' is not supported by SQLite.');
-	}
-
-	/**
-	 * Builds a SQL statement for changing the definition of a column.
-	 * @param string $table the table whose column is to be changed. The table name will be properly quoted by the method.
-	 * @param string $column the name of the column to be changed. The name will be properly quoted by the method.
-	 * @param string $type the new column type. The [[getColumnType()]] method will be invoked to convert abstract
-	 * column type (if any) into the physical one. Anything that is not recognized as abstract type will be kept
-	 * in the generated SQL. For example, 'string' will be turned into 'varchar(255)', while 'string not null'
-	 * will become 'varchar(255) not null'.
-	 * @return string the SQL statement for changing the definition of a column.
-	 * @throws NotSupportedException this is not supported by SQLite
-	 */
-	public function alterColumn($table, $column, $type)
-	{
-		throw new NotSupportedException(__METHOD__ . ' is not supported by SQLite.');
-	}
-}
diff --git a/framework/db/sqlite/Schema.php b/framework/db/sqlite/Schema.php
deleted file mode 100644
index 45f8392..0000000
--- a/framework/db/sqlite/Schema.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\db\sqlite;
-
-use yii\db\TableSchema;
-use yii\db\ColumnSchema;
-
-/**
- * Schema is the class for retrieving metadata from a SQLite (2/3) database.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Schema extends \yii\db\Schema
-{
-	/**
-	 * @var array mapping from physical column types (keys) to abstract column types (values)
-	 */
-	public $typeMap = array(
-		'tinyint' => self::TYPE_SMALLINT,
-		'bit' => self::TYPE_SMALLINT,
-		'smallint' => self::TYPE_SMALLINT,
-		'mediumint' => self::TYPE_INTEGER,
-		'int' => self::TYPE_INTEGER,
-		'integer' => self::TYPE_INTEGER,
-		'bigint' => self::TYPE_BIGINT,
-		'float' => self::TYPE_FLOAT,
-		'double' => self::TYPE_FLOAT,
-		'real' => self::TYPE_FLOAT,
-		'decimal' => self::TYPE_DECIMAL,
-		'numeric' => self::TYPE_DECIMAL,
-		'tinytext' => self::TYPE_TEXT,
-		'mediumtext' => self::TYPE_TEXT,
-		'longtext' => self::TYPE_TEXT,
-		'text' => self::TYPE_TEXT,
-		'varchar' => self::TYPE_STRING,
-		'string' => self::TYPE_STRING,
-		'char' => self::TYPE_STRING,
-		'datetime' => self::TYPE_DATETIME,
-		'year' => self::TYPE_DATE,
-		'date' => self::TYPE_DATE,
-		'time' => self::TYPE_TIME,
-		'timestamp' => self::TYPE_TIMESTAMP,
-		'enum' => self::TYPE_STRING,
-	);
-
-	/**
-	 * Creates a query builder for the MySQL database.
-	 * This method may be overridden by child classes to create a DBMS-specific query builder.
-	 * @return QueryBuilder query builder instance
-	 */
-	public function createQueryBuilder()
-	{
-		return new QueryBuilder($this->db);
-	}
-
-	/**
-	 * Returns all table names in the database.
-	 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
-	 * If not empty, the returned table names will be prefixed with the schema name.
-	 * @return array all table names in the database.
-	 */
-	protected function findTableNames($schema = '')
-	{
-		$sql = "SELECT DISTINCT tbl_name FROM sqlite_master WHERE tbl_name<>'sqlite_sequence'";
-		return $this->db->createCommand($sql)->queryColumn();
-	}
-
-	/**
-	 * Loads the metadata for the specified table.
-	 * @param string $name table name
-	 * @return TableSchema driver dependent table metadata. Null if the table does not exist.
-	 */
-	protected function loadTableSchema($name)
-	{
-		$table = new TableSchema;
-		$table->name = $name;
-
-		if ($this->findColumns($table)) {
-			$this->findConstraints($table);
-			return $table;
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Collects the table column metadata.
-	 * @param TableSchema $table the table metadata
-	 * @return boolean whether the table exists in the database
-	 */
-	protected function findColumns($table)
-	{
-		$sql = "PRAGMA table_info(" . $this->quoteSimpleTableName($table->name) . ')';
-		$columns = $this->db->createCommand($sql)->queryAll();
-		if (empty($columns)) {
-			return false;
-		}
-
-		foreach ($columns as $info) {
-			$column = $this->loadColumnSchema($info);
-			$table->columns[$column->name] = $column;
-			if ($column->isPrimaryKey) {
-				$table->primaryKey[] = $column->name;
-			}
-		}
-		if (count($table->primaryKey) === 1 && !strncasecmp($table->columns[$table->primaryKey[0]]->dbType, 'int', 3)) {
-			$table->sequenceName = '';
-			$table->columns[$table->primaryKey[0]]->autoIncrement = true;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Collects the foreign key column details for the given table.
-	 * @param TableSchema $table the table metadata
-	 */
-	protected function findConstraints($table)
-	{
-		$sql = "PRAGMA foreign_key_list(" . $this->quoteSimpleTableName($table->name) . ')';
-		$keys = $this->db->createCommand($sql)->queryAll();
-		foreach ($keys as $key) {
-			$table->foreignKeys[] = array($key['table'], $key['from'] => $key['to']);
-		}
-	}
-
-	/**
-	 * Loads the column information into a [[ColumnSchema]] object.
-	 * @param array $info column information
-	 * @return ColumnSchema the column schema object
-	 */
-	protected function loadColumnSchema($info)
-	{
-		$column = new ColumnSchema;
-		$column->name = $info['name'];
-		$column->allowNull = !$info['notnull'];
-		$column->isPrimaryKey = $info['pk'] != 0;
-
-		$column->dbType = $info['type'];
-		$column->unsigned = strpos($column->dbType, 'unsigned') !== false;
-
-		$column->type = self::TYPE_STRING;
-		if (preg_match('/^(\w+)(?:\(([^\)]+)\))?/', $column->dbType, $matches)) {
-			$type = $matches[1];
-			if (isset($this->typeMap[$type])) {
-				$column->type = $this->typeMap[$type];
-			}
-
-			if (!empty($matches[2])) {
-				$values = explode(',', $matches[2]);
-				$column->size = $column->precision = (int)$values[0];
-				if (isset($values[1])) {
-					$column->scale = (int)$values[1];
-				}
-				if ($column->size === 1 && ($type === 'tinyint' || $type === 'bit')) {
-					$column->type = 'boolean';
-				} elseif ($type === 'bit') {
-					if ($column->size > 32) {
-						$column->type = 'bigint';
-					} elseif ($column->size === 32) {
-						$column->type = 'integer';
-					}
-				}
-			}
-		}
-		$column->phpType = $this->getColumnPhpType($this->type);
-
-		$value = $info['dflt_value'];
-		if ($column->type === 'string') {
-			$column->defaultValue = trim($value, "'\"");
-		} else {
-			$column->defaultValue = $column->typecast(strcasecmp($value, 'null') ? $value : null);
-		}
-
-		return $column;
-	}
-}
diff --git a/framework/debug/Module.php b/framework/debug/Module.php
deleted file mode 100644
index 3421d95..0000000
--- a/framework/debug/Module.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\debug;
-
-/**
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Module extends \yii\base\Module
-{
-	public $controllerNamespace = 'yii\debug\controllers';
-}
\ No newline at end of file
diff --git a/framework/debug/Toolbar.php b/framework/debug/Toolbar.php
deleted file mode 100644
index 84b55c8..0000000
--- a/framework/debug/Toolbar.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\debug;
-
-use Yii;
-use yii\base\Widget;
-use yii\helpers\Html;
-
-/**
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Toolbar extends Widget
-{
-	public $debugAction = 'debug';
-	public $enabled = YII_DEBUG;
-
-	public function run()
-	{
-		if ($this->enabled) {
-			$id = 'yii-debug-toolbar';
-			$url = Yii::$app->getUrlManager()->createUrl($this->debugAction, array(
-				'tag' => Yii::getLogger()->tag,
-			));
-			$this->view->registerJs("yii.debug.load('$id', '$url');");
-			$this->view->registerAssetBundle('yii/debug');
-			echo Html::tag('div', '', array(
-				'id' => $id,
-				'style' => 'display: none',
-			));
-		}
-	}
-}
diff --git a/framework/debug/controllers/DefaultController.php b/framework/debug/controllers/DefaultController.php
deleted file mode 100644
index ca90920..0000000
--- a/framework/debug/controllers/DefaultController.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\debug\controllers;
-
-use yii\web\Controller;
-
-/**
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class DefaultController extends Controller
-{
-	public function actionIndex($tag)
-	{
-		echo $tag;
-	}
-}
\ No newline at end of file
diff --git a/framework/helpers/ArrayHelper.php b/framework/helpers/ArrayHelper.php
deleted file mode 100644
index d58341c..0000000
--- a/framework/helpers/ArrayHelper.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @link http://www.yiiframework.com/
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\helpers;
-
-/**
- * ArrayHelper provides additional array functionality you can use in your
- * application.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class ArrayHelper extends base\ArrayHelper
-{
-}
diff --git a/framework/helpers/Console.php b/framework/helpers/Console.php
deleted file mode 100644
index 0055107..0000000
--- a/framework/helpers/Console.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\helpers;
-
-/**
- * TODO adjust phpdoc
- * Console View is the base class for console view components
- *
- * A console view provides functionality to create rich console application by allowing to format output
- * by adding color and font style to it.
- *
- * @author Carsten Brandt <mail@cebe.cc>
- * @since 2.0
- */
-class Console extends base\Console
-{
-}
diff --git a/framework/helpers/FileHelper.php b/framework/helpers/FileHelper.php
deleted file mode 100644
index 04ce4e1..0000000
--- a/framework/helpers/FileHelper.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Filesystem helper class file.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\helpers;
-
-/**
- * Filesystem helper
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @author Alex Makarov <sam@rmcreative.ru>
- * @since 2.0
- */
-class FileHelper extends base\FileHelper
-{
-}
diff --git a/framework/helpers/Html.php b/framework/helpers/Html.php
deleted file mode 100644
index b3a0743..0000000
--- a/framework/helpers/Html.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\helpers;
-
-/**
- * Html provides a set of static methods for generating commonly used HTML tags.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Html extends base\Html
-{
-}
diff --git a/framework/helpers/Json.php b/framework/helpers/Json.php
deleted file mode 100644
index 5e77c3f..0000000
--- a/framework/helpers/Json.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\helpers;
-
-/**
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Json extends base\Json
-{
-	
-}
diff --git a/framework/helpers/Markdown.php b/framework/helpers/Markdown.php
deleted file mode 100644
index 3f6c98e..0000000
--- a/framework/helpers/Markdown.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @link http://www.yiiframework.com/
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\helpers;
-
-/**
- * Markdown provides an ability to transform markdown into HTML.
- *
- * Basic usage is the following:
- *
- * ```php
- * $myHtml = Markdown::process($myText);
- * ```
- *
- * If you want to configure the parser:
- *
- * ```php
- * $myHtml = Markdown::process($myText, array(
- *     'fn_id_prefix' => 'footnote_',
- * ));
- * ```
- *
- * For more details please refer to [PHP Markdown library documentation](http://michelf.ca/projects/php-markdown/).
- * @author Alexander Makarov <sam@rmcreative.ru>
- * @since 2.0
- */
-class Markdown extends base\Markdown
-{
-}
diff --git a/framework/helpers/Purifier.php b/framework/helpers/Purifier.php
deleted file mode 100644
index b659531..0000000
--- a/framework/helpers/Purifier.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @link http://www.yiiframework.com/
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\helpers;
-
-/**
- * Purifier provides an ability to clean up HTML from any harmful code.
- *
- * Basic usage is the following:
- *
- * ```php
- * $my_html = Purifier::process($my_text);
- * ```
- *
- * If you want to configure it:
- *
- * ```php
- * $my_html = Purifier::process($my_text, array(
- *     'Attr.EnableID' => true,
- * ));
- * ```
- *
- * For more details please refer to HTMLPurifier documentation](http://htmlpurifier.org/).
- *
- * @author Alexander Makarov <sam@rmcreative.ru>
- * @since 2.0
- */
-class Purifier extends base\Purifier
-{
-}
diff --git a/framework/helpers/SecurityHelper.php b/framework/helpers/SecurityHelper.php
deleted file mode 100644
index d16e7e6..0000000
--- a/framework/helpers/SecurityHelper.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\helpers;
-
-/**
- * SecurityHelper provides a set of methods to handle common security-related tasks.
- *
- * In particular, SecurityHelper supports the following features:
- *
- * - Encryption/decryption: [[encrypt()]] and [[decrypt()]]
- * - Data tampering prevention: [[hashData()]] and [[validateData()]]
- * - Password validation: [[generatePasswordHash()]] and [[validatePassword()]]
- *
- * Additionally, SecurityHelper provides [[getSecretKey()]] to support generating
- * named secret keys. These secret keys, once generated, will be stored in a file
- * and made available in future requests.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @author Tom Worster <fsb@thefsb.org>
- * @since 2.0
- */
-class SecurityHelper extends base\SecurityHelper
-{
-}
diff --git a/framework/helpers/StringHelper.php b/framework/helpers/StringHelper.php
deleted file mode 100644
index 22b881a..0000000
--- a/framework/helpers/StringHelper.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\helpers;
-
-/**
- * StringHelper
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @author Alex Makarov <sam@rmcreative.ru>
- * @since 2.0
- */
-class StringHelper extends base\StringHelper
-{
-}
diff --git a/framework/helpers/VarDumper.php b/framework/helpers/VarDumper.php
deleted file mode 100644
index 59a1718..0000000
--- a/framework/helpers/VarDumper.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\helpers;
-
-/**
- * VarDumper is intended to replace the buggy PHP function var_dump and print_r.
- * It can correctly identify the recursively referenced objects in a complex
- * object structure. It also has a recursive depth control to avoid indefinite
- * recursive display of some peculiar variables.
- *
- * VarDumper can be used as follows,
- *
- * ~~~
- * VarDumper::dump($var);
- * ~~~
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class VarDumper extends base\VarDumper
-{
-}
diff --git a/framework/helpers/base/ArrayHelper.php b/framework/helpers/base/ArrayHelper.php
deleted file mode 100644
index 672c7b9..0000000
--- a/framework/helpers/base/ArrayHelper.php
+++ /dev/null
@@ -1,352 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @link http://www.yiiframework.com/
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\helpers\base;
-
-use Yii;
-use yii\base\InvalidParamException;
-
-/**
- * ArrayHelper provides additional array functionality you can use in your
- * application.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class ArrayHelper
-{
-	/**
-	 * Merges two or more arrays into one recursively.
-	 * If each array has an element with the same string key value, the latter
-	 * will overwrite the former (different from array_merge_recursive).
-	 * Recursive merging will be conducted if both arrays have an element of array
-	 * type and are having the same key.
-	 * For integer-keyed elements, the elements from the latter array will
-	 * be appended to the former array.
-	 * @param array $a array to be merged to
-	 * @param array $b array to be merged from. You can specify additional
-	 * arrays via third argument, fourth argument etc.
-	 * @return array the merged array (the original arrays are not changed.)
-	 */
-	public static function merge($a, $b)
-	{
-		$args = func_get_args();
-		$res = array_shift($args);
-		while (!empty($args)) {
-			$next = array_shift($args);
-			foreach ($next as $k => $v) {
-				if (is_integer($k)) {
-					isset($res[$k]) ? $res[] = $v : $res[$k] = $v;
-				} elseif (is_array($v) && isset($res[$k]) && is_array($res[$k])) {
-					$res[$k] = self::merge($res[$k], $v);
-				} else {
-					$res[$k] = $v;
-				}
-			}
-		}
-		return $res;
-	}
-
-	/**
-	 * Retrieves the value of an array element or object property with the given key or property name.
-	 * If the key does not exist in the array, the default value will be returned instead.
-	 *
-	 * Below are some usage examples,
-	 *
-	 * ~~~
-	 * // working with array
-	 * $username = \yii\helpers\ArrayHelper::getValue($_POST, 'username');
-	 * // working with object
-	 * $username = \yii\helpers\ArrayHelper::getValue($user, 'username');
-	 * // working with anonymous function
-	 * $fullName = \yii\helpers\ArrayHelper::getValue($user, function($user, $defaultValue) {
-	 *     return $user->firstName . ' ' . $user->lastName;
-	 * });
-	 * ~~~
-	 *
-	 * @param array|object $array array or object to extract value from
-	 * @param string|\Closure $key key name of the array element, or property name of the object,
-	 * or an anonymous function returning the value. The anonymous function signature should be:
-	 * `function($array, $defaultValue)`.
-	 * @param mixed $default the default value to be returned if the specified key does not exist
-	 * @return mixed the value of the
-	 */
-	public static function getValue($array, $key, $default = null)
-	{
-		if ($key instanceof \Closure) {
-			return $key($array, $default);
-		} elseif (is_array($array)) {
-			return isset($array[$key]) || array_key_exists($key, $array) ? $array[$key] : $default;
-		} else {
-			return $array->$key;
-		}
-	}
-
-	/**
-	 * Indexes an array according to a specified key.
-	 * The input array should be multidimensional or an array of objects.
-	 *
-	 * The key can be a key name of the sub-array, a property name of object, or an anonymous
-	 * function which returns the key value given an array element.
-	 *
-	 * If a key value is null, the corresponding array element will be discarded and not put in the result.
-	 *
-	 * For example,
-	 *
-	 * ~~~
-	 * $array = array(
-	 *     array('id' => '123', 'data' => 'abc'),
-	 *     array('id' => '345', 'data' => 'def'),
-	 * );
-	 * $result = ArrayHelper::index($array, 'id');
-	 * // the result is:
-	 * // array(
-	 * //     '123' => array('id' => '123', 'data' => 'abc'),
-	 * //     '345' => array('id' => '345', 'data' => 'def'),
-	 * // )
-	 *
-	 * // using anonymous function
-	 * $result = ArrayHelper::index($array, function(element) {
-	 *     return $element['id'];
-	 * });
-	 * ~~~
-	 *
-	 * @param array $array the array that needs to be indexed
-	 * @param string|\Closure $key the column name or anonymous function whose result will be used to index the array
-	 * @return array the indexed array
-	 */
-	public static function index($array, $key)
-	{
-		$result = array();
-		foreach ($array as $element) {
-			$value = static::getValue($element, $key);
-			$result[$value] = $element;
-		}
-		return $result;
-	}
-
-	/**
-	 * Returns the values of a specified column in an array.
-	 * The input array should be multidimensional or an array of objects.
-	 *
-	 * For example,
-	 *
-	 * ~~~
-	 * $array = array(
-	 *     array('id' => '123', 'data' => 'abc'),
-	 *     array('id' => '345', 'data' => 'def'),
-	 * );
-	 * $result = ArrayHelper::getColumn($array, 'id');
-	 * // the result is: array( '123', '345')
-	 *
-	 * // using anonymous function
-	 * $result = ArrayHelper::getColumn($array, function(element) {
-	 *     return $element['id'];
-	 * });
-	 * ~~~
-	 *
-	 * @param array $array
-	 * @param string|\Closure $name
-	 * @param boolean $keepKeys whether to maintain the array keys. If false, the resulting array
-	 * will be re-indexed with integers.
-	 * @return array the list of column values
-	 */
-	public static function getColumn($array, $name, $keepKeys = true)
-	{
-		$result = array();
-		if ($keepKeys) {
-			foreach ($array as $k => $element) {
-				$result[$k] = static::getValue($element, $name);
-			}
-		} else {
-			foreach ($array as $element) {
-				$result[] = static::getValue($element, $name);
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Builds a map (key-value pairs) from a multidimensional array or an array of objects.
-	 * The `$from` and `$to` parameters specify the key names or property names to set up the map.
-	 * Optionally, one can further group the map according to a grouping field `$group`.
-	 *
-	 * For example,
-	 *
-	 * ~~~
-	 * $array = array(
-	 *     array('id' => '123', 'name' => 'aaa', 'class' => 'x'),
-	 *     array('id' => '124', 'name' => 'bbb', 'class' => 'x'),
-	 *     array('id' => '345', 'name' => 'ccc', 'class' => 'y'),
-	 * );
-	 *
-	 * $result = ArrayHelper::map($array, 'id', 'name');
-	 * // the result is:
-	 * // array(
-	 * //     '123' => 'aaa',
-	 * //     '124' => 'bbb',
-	 * //     '345' => 'ccc',
-	 * // )
-	 *
-	 * $result = ArrayHelper::map($array, 'id', 'name', 'class');
-	 * // the result is:
-	 * // array(
-	 * //     'x' => array(
-	 * //         '123' => 'aaa',
-	 * //         '124' => 'bbb',
-	 * //     ),
-	 * //     'y' => array(
-	 * //         '345' => 'ccc',
-	 * //     ),
-	 * // )
-	 * ~~~
-	 *
-	 * @param array $array
-	 * @param string|\Closure $from
-	 * @param string|\Closure $to
-	 * @param string|\Closure $group
-	 * @return array
-	 */
-	public static function map($array, $from, $to, $group = null)
-	{
-		$result = array();
-		foreach ($array as $element) {
-			$key = static::getValue($element, $from);
-			$value = static::getValue($element, $to);
-			if ($group !== null) {
-				$result[static::getValue($element, $group)][$key] = $value;
-			} else {
-				$result[$key] = $value;
-			}
-		}
-		return $result;
-	}
-
-	/**
-	 * Sorts an array of objects or arrays (with the same structure) by one or several keys.
-	 * @param array $array the array to be sorted. The array will be modified after calling this method.
-	 * @param string|\Closure|array $key the key(s) to be sorted by. This refers to a key name of the sub-array
-	 * elements, a property name of the objects, or an anonymous function returning the values for comparison
-	 * purpose. The anonymous function signature should be: `function($item)`.
-	 * To sort by multiple keys, provide an array of keys here.
-	 * @param boolean|array $ascending whether to sort in ascending or descending order. When
-	 * sorting by multiple keys with different ascending orders, use an array of ascending flags.
-	 * @param integer|array $sortFlag the PHP sort flag. Valid values include
-	 * `SORT_REGULAR`, `SORT_NUMERIC`, `SORT_STRING` and `SORT_LOCALE_STRING`.
-	 * Please refer to [PHP manual](http://php.net/manual/en/function.sort.php)
-	 * for more details. When sorting by multiple keys with different sort flags, use an array of sort flags.
-	 * @param boolean|array $caseSensitive whether to sort string in case-sensitive manner. This parameter
-	 * is used only when `$sortFlag` is `SORT_STRING`.
-	 * When sorting by multiple keys with different case sensitivities, use an array of boolean values.
-	 * @throws InvalidParamException if the $ascending or $sortFlag parameters do not have
-	 * correct number of elements as that of $key.
-	 */
-	public static function multisort(&$array, $key, $ascending = true, $sortFlag = SORT_REGULAR, $caseSensitive = true)
-	{
-		$keys = is_array($key) ? $key : array($key);
-		if (empty($keys) || empty($array)) {
-			return;
-		}
-		$n = count($keys);
-		if (is_scalar($ascending)) {
-			$ascending = array_fill(0, $n, $ascending);
-		} elseif (count($ascending) !== $n) {
-			throw new InvalidParamException('The length of $ascending parameter must be the same as that of $keys.');
-		}
-		if (is_scalar($sortFlag)) {
-			$sortFlag = array_fill(0, $n, $sortFlag);
-		} elseif (count($sortFlag) !== $n) {
-			throw new InvalidParamException('The length of $sortFlag parameter must be the same as that of $keys.');
-		}
-		if (is_scalar($caseSensitive)) {
-			$caseSensitive = array_fill(0, $n, $caseSensitive);
-		} elseif (count($caseSensitive) !== $n) {
-			throw new InvalidParamException('The length of $caseSensitive parameter must be the same as that of $keys.');
-		}
-		$args = array();
-		foreach ($keys as $i => $key) {
-			$flag = $sortFlag[$i];
-			$cs = $caseSensitive[$i];
-			if (!$cs && ($flag === SORT_STRING)) {
-				if (defined('SORT_FLAG_CASE')) {
-					$flag = $flag | SORT_FLAG_CASE;
-					$args[] = static::getColumn($array, $key);
-				} else {
-					$column = array();
-					foreach (static::getColumn($array, $key) as $k => $value) {
-						$column[$k] = mb_strtolower($value);
-					}
-					$args[] = $column;
-				}
-			} else {
-				$args[] =  static::getColumn($array, $key);
-			}
-			$args[] = $ascending[$i] ? SORT_ASC : SORT_DESC;
-			$args[] = $flag;
-		}
-		$args[] = &$array;
-		call_user_func_array('array_multisort', $args);
-	}
-
-	/**
-	 * Encodes special characters in an array of strings into HTML entities.
-	 * Both the array keys and values will be encoded.
-	 * If a value is an array, this method will also encode it recursively.
-	 * @param array $data data to be encoded
-	 * @param boolean $valuesOnly whether to encode array values only. If false,
-	 * both the array keys and array values will be encoded.
-	 * @param string $charset the charset that the data is using. If not set,
-	 * [[\yii\base\Application::charset]] will be used.
-	 * @return array the encoded data
-	 * @see http://www.php.net/manual/en/function.htmlspecialchars.php
-	 */
-	public static function htmlEncode($data, $valuesOnly = true, $charset = null)
-	{
-		if ($charset === null) {
-			$charset = Yii::$app->charset;
-		}
-		$d = array();
-		foreach ($data as $key => $value) {
-			if (!$valuesOnly && is_string($key)) {
-				$key = htmlspecialchars($key, ENT_QUOTES, $charset);
-			}
-			if (is_string($value)) {
-				$d[$key] = htmlspecialchars($value, ENT_QUOTES, $charset);
-			} elseif (is_array($value)) {
-				$d[$key] = static::htmlEncode($value, $charset);
-			}
-		}
-		return $d;
-	}
-
-	/**
-	 * Decodes HTML entities into the corresponding characters in an array of strings.
-	 * Both the array keys and values will be decoded.
-	 * If a value is an array, this method will also decode it recursively.
-	 * @param array $data data to be decoded
-	 * @param boolean $valuesOnly whether to decode array values only. If false,
-	 * both the array keys and array values will be decoded.
-	 * @return array the decoded data
-	 * @see http://www.php.net/manual/en/function.htmlspecialchars-decode.php
-	 */
-	public static function htmlDecode($data, $valuesOnly = true)
-	{
-		$d = array();
-		foreach ($data as $key => $value) {
-			if (!$valuesOnly && is_string($key)) {
-				$key = htmlspecialchars_decode($key, ENT_QUOTES);
-			}
-			if (is_string($value)) {
-				$d[$key] = htmlspecialchars_decode($value, ENT_QUOTES);
-			} elseif (is_array($value)) {
-				$d[$key] = static::htmlDecode($value);
-			}
-		}
-		return $d;
-	}
-}
diff --git a/framework/helpers/base/Console.php b/framework/helpers/base/Console.php
deleted file mode 100644
index b611919..0000000
--- a/framework/helpers/base/Console.php
+++ /dev/null
@@ -1,781 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\helpers\base;
-
-/**
- * TODO adjust phpdoc
- * TODO test this on all kinds of terminals, especially windows (check out lib ncurses)
- *
- * Console View is the base class for console view components
- *
- * A console view provides functionality to create rich console application by allowing to format output
- * by adding color and font style to it.
- *
- * The following constants are available for formatting:
- *
- * TODO document constants
- *
- *
- *
- * @author Carsten Brandt <mail@cebe.cc>
- * @since 2.0
- */
-class Console
-{
-	const FG_BLACK  = 30;
-	const FG_RED    = 31;
-	const FG_GREEN  = 32;
-	const FG_YELLOW = 33;
-	const FG_BLUE   = 34;
-	const FG_PURPLE = 35;
-	const FG_CYAN   = 36;
-	const FG_GREY   = 37;
-
-	const BG_BLACK  = 40;
-	const BG_RED    = 41;
-	const BG_GREEN  = 42;
-	const BG_YELLOW = 43;
-	const BG_BLUE   = 44;
-	const BG_PURPLE = 45;
-	const BG_CYAN   = 46;
-	const BG_GREY   = 47;
-
-	const NORMAL      = 0;
-	const BOLD        = 1;
-	const ITALIC      = 3;
-	const UNDERLINE   = 4;
-	const BLINK       = 5;
-	const NEGATIVE    = 7;
-	const CONCEALED   = 8;
-	const CROSSED_OUT = 9;
-	const FRAMED      = 51;
-	const ENCIRCLED   = 52;
-	const OVERLINED   = 53;
-
-	/**
-	 * Moves the terminal cursor up by sending ANSI control code CUU to the terminal.
-	 * If the cursor is already at the edge of the screen, this has no effect.
-	 * @param integer $rows number of rows the cursor should be moved up
-	 */
-	public static function moveCursorUp($rows = 1)
-	{
-		echo "\033[" . (int)$rows . 'A';
-	}
-
-	/**
-	 * Moves the terminal cursor down by sending ANSI control code CUD to the terminal.
-	 * If the cursor is already at the edge of the screen, this has no effect.
-	 * @param integer $rows number of rows the cursor should be moved down
-	 */
-	public static function moveCursorDown($rows = 1)
-	{
-		echo "\033[" . (int)$rows . 'B';
-	}
-
-	/**
-	 * Moves the terminal cursor forward by sending ANSI control code CUF to the terminal.
-	 * If the cursor is already at the edge of the screen, this has no effect.
-	 * @param integer $steps number of steps the cursor should be moved forward
-	 */
-	public static function moveCursorForward($steps = 1)
-	{
-		echo "\033[" . (int)$steps . 'C';
-	}
-
-	/**
-	 * Moves the terminal cursor backward by sending ANSI control code CUB to the terminal.
-	 * If the cursor is already at the edge of the screen, this has no effect.
-	 * @param integer $steps number of steps the cursor should be moved backward
-	 */
-	public static function moveCursorBackward($steps = 1)
-	{
-		echo "\033[" . (int)$steps . 'D';
-	}
-
-	/**
-	 * Moves the terminal cursor to the beginning of the next line by sending ANSI control code CNL to the terminal.
-	 * @param integer $lines number of lines the cursor should be moved down
-	 */
-	public static function moveCursorNextLine($lines = 1)
-	{
-		echo "\033[" . (int)$lines . 'E';
-	}
-
-	/**
-	 * Moves the terminal cursor to the beginning of the previous line by sending ANSI control code CPL to the terminal.
-	 * @param integer $lines number of lines the cursor should be moved up
-	 */
-	public static function moveCursorPrevLine($lines = 1)
-	{
-		echo "\033[" . (int)$lines . 'F';
-	}
-
-	/**
-	 * Moves the cursor to an absolute position given as column and row by sending ANSI control code CUP or CHA to the terminal.
-	 * @param integer $column 1-based column number, 1 is the left edge of the screen.
-	 * @param integer|null $row 1-based row number, 1 is the top edge of the screen. if not set, will move cursor only in current line.
-	 */
-	public static function moveCursorTo($column, $row = null)
-	{
-		if ($row === null) {
-			echo "\033[" . (int)$column . 'G';
-		} else {
-			echo "\033[" . (int)$row . ';' . (int)$column . 'H';
-		}
-	}
-
-	/**
-	 * Scrolls whole page up by sending ANSI control code SU to the terminal.
-	 * New lines are added at the bottom. This is not supported by ANSI.SYS used in windows.
-	 * @param int $lines number of lines to scroll up
-	 */
-	public static function scrollUp($lines = 1)
-	{
-		echo "\033[" . (int)$lines . "S";
-	}
-
-	/**
-	 * Scrolls whole page down by sending ANSI control code SD to the terminal.
-	 * New lines are added at the top. This is not supported by ANSI.SYS used in windows.
-	 * @param int $lines number of lines to scroll down
-	 */
-	public static function scrollDown($lines = 1)
-	{
-		echo "\033[" . (int)$lines . "T";
-	}
-
-	/**
-	 * Saves the current cursor position by sending ANSI control code SCP to the terminal.
-	 * Position can then be restored with {@link restoreCursorPosition}.
-	 */
-	public static function saveCursorPosition()
-	{
-		echo "\033[s";
-	}
-
-	/**
-	 * Restores the cursor position saved with {@link saveCursorPosition} by sending ANSI control code RCP to the terminal.
-	 */
-	public static function restoreCursorPosition()
-	{
-		echo "\033[u";
-	}
-
-	/**
-	 * Hides the cursor by sending ANSI DECTCEM code ?25l to the terminal.
-	 * Use {@link showCursor} to bring it back.
-	 * Do not forget to show cursor when your application exits. Cursor might stay hidden in terminal after exit.
-	 */
-	public static function hideCursor()
-	{
-		echo "\033[?25l";
-	}
-
-	/**
-	 * Will show a cursor again when it has been hidden by {@link hideCursor}  by sending ANSI DECTCEM code ?25h to the terminal.
-	 */
-	public static function showCursor()
-	{
-		echo "\033[?25h";
-	}
-
-	/**
-	 * Clears entire screen content by sending ANSI control code ED with argument 2 to the terminal.
-	 * Cursor position will not be changed.
-	 * **Note:** ANSI.SYS implementation used in windows will reset cursor position to upper left corner of the screen.
-	 */
-	public static function clearScreen()
-	{
-		echo "\033[2J";
-	}
-
-	/**
-	 * Clears text from cursor to the beginning of the screen by sending ANSI control code ED with argument 1 to the terminal.
-	 * Cursor position will not be changed.
-	 */
-	public static function clearScreenBeforeCursor()
-	{
-		echo "\033[1J";
-	}
-
-	/**
-	 * Clears text from cursor to the end of the screen by sending ANSI control code ED with argument 0 to the terminal.
-	 * Cursor position will not be changed.
-	 */
-	public static function clearScreenAfterCursor()
-	{
-		echo "\033[0J";
-	}
-
-	/**
-	 * Clears the line, the cursor is currently on by sending ANSI control code EL with argument 2 to the terminal.
-	 * Cursor position will not be changed.
-	 */
-	public static function clearLine()
-	{
-		echo "\033[2K";
-	}
-
-	/**
-	 * Clears text from cursor position to the beginning of the line by sending ANSI control code EL with argument 1 to the terminal.
-	 * Cursor position will not be changed.
-	 */
-	public static function clearLineBeforeCursor()
-	{
-		echo "\033[1K";
-	}
-
-	/**
-	 * Clears text from cursor position to the end of the line by sending ANSI control code EL with argument 0 to the terminal.
-	 * Cursor position will not be changed.
-	 */
-	public static function clearLineAfterCursor()
-	{
-		echo "\033[0K";
-	}
-
-	/**
-	 * Sets the ANSI format for any text that is printed afterwards.
-	 *
-	 * You can pass any of the FG_*, BG_* and TEXT_* constants and also [[xterm256ColorFg]] and [[xterm256ColorBg]].
-	 * TODO: documentation
-	 */
-	public static function ansiFormatBegin()
-	{
-		echo "\033[" . implode(';', func_get_args()) . 'm';
-	}
-
-	/**
-	 * Resets any ANSI format set by previous method [[ansiFormatBegin()]]
-	 * Any output after this is will have default text style.
-	 */
-	public static function ansiFormatReset()
-	{
-		echo "\033[0m";
-	}
-
-	/**
-	 * Returns the ANSI format code.
-	 *
-	 * You can pass any of the FG_*, BG_* and TEXT_* constants and also [[xterm256ColorFg]] and [[xterm256ColorBg]].
-	 * TODO: documentation
-	 */
-	public static function ansiFormatCode($format)
-	{
-		return "\033[" . implode(';', $format) . 'm';
-	}
-
-	/**
-	 * Will return a string formatted with the given ANSI style
-	 *
-	 * @param string $string the string to be formatted
-	 * @param array $format array containing formatting values.
-	 * You can pass any of the FG_*, BG_* and TEXT_* constants and also [[xterm256ColorFg]] and [[xterm256ColorBg]].
-	 * @return string
-	 */
-	public static function ansiFormat($string, $format=array())
-	{
-		$code = implode(';', $format);
-		return "\033[0m" . ($code !== '' ? "\033[" . $code . "m" : '') . $string . "\033[0m";
-	}
-
-	//const COLOR_XTERM256 = 38;// http://en.wikipedia.org/wiki/Talk:ANSI_escape_code#xterm-256colors
-	public static function xterm256ColorFg($i) // TODO naming!
-	{
-		return '38;5;' . $i;
-	}
-
-	public static function xterm256ColorBg($i) // TODO naming!
-	{
-		return '48;5;' . $i;
-	}
-
-	/**
-	 * Strips ANSI control codes from a string
-	 *
-	 * @param string $string String to strip
-	 * @return string
-	 */
-	public static function stripAnsiFormat($string)
-	{
-		return preg_replace('/\033\[[\d;]+m/', '', $string); // TODO currently only strips color
-	}
-
-	// TODO refactor and review
-	public static function ansiToHtml($string)
-	{
-		$tags = 0;
-		return preg_replace_callback(
-			'/\033\[[\d;]+m/',
-			function ($ansi) use (&$tags) {
-				$styleA = array();
-				foreach (explode(';', $ansi) as $controlCode) {
-					switch ($controlCode) {
-						case self::FG_BLACK:
-							$style = array('color' => '#000000');
-							break;
-						case self::FG_BLUE:
-							$style = array('color' => '#000078');
-							break;
-						case self::FG_CYAN:
-							$style = array('color' => '#007878');
-							break;
-						case self::FG_GREEN:
-							$style = array('color' => '#007800');
-							break;
-						case self::FG_GREY:
-							$style = array('color' => '#787878');
-							break;
-						case self::FG_PURPLE:
-							$style = array('color' => '#780078');
-							break;
-						case self::FG_RED:
-							$style = array('color' => '#780000');
-							break;
-						case self::FG_YELLOW:
-							$style = array('color' => '#787800');
-							break;
-						case self::BG_BLACK:
-							$style = array('background-color' => '#000000');
-							break;
-						case self::BG_BLUE:
-							$style = array('background-color' => '#000078');
-							break;
-						case self::BG_CYAN:
-							$style = array('background-color' => '#007878');
-							break;
-						case self::BG_GREEN:
-							$style = array('background-color' => '#007800');
-							break;
-						case self::BG_GREY:
-							$style = array('background-color' => '#787878');
-							break;
-						case self::BG_PURPLE:
-							$style = array('background-color' => '#780078');
-							break;
-						case self::BG_RED:
-							$style = array('background-color' => '#780000');
-							break;
-						case self::BG_YELLOW:
-							$style = array('background-color' => '#787800');
-							break;
-						case self::BOLD:
-							$style = array('font-weight' => 'bold');
-							break;
-						case self::ITALIC:
-							$style = array('font-style' => 'italic');
-							break;
-						case self::UNDERLINE:
-							$style = array('text-decoration' => array('underline'));
-							break;
-						case self::OVERLINED:
-							$style = array('text-decoration' => array('overline'));
-							break;
-						case self::CROSSED_OUT:
-							$style = array('text-decoration' => array('line-through'));
-							break;
-						case self::BLINK:
-							$style = array('text-decoration' => array('blink'));
-							break;
-						case self::NEGATIVE: // ???
-						case self::CONCEALED:
-						case self::ENCIRCLED:
-						case self::FRAMED:
-							// TODO allow resetting codes
-							break;
-						case 0: // ansi reset
-							$return = '';
-							for ($n = $tags; $tags > 0; $tags--) {
-								$return .= '</span>';
-							}
-							return $return;
-					}
-
-					$styleA = ArrayHelper::merge($styleA, $style);
-				}
-				$styleString[] = array();
-				foreach ($styleA as $name => $content) {
-					if ($name === 'text-decoration') {
-						$content = implode(' ', $content);
-					}
-					$styleString[] = $name . ':' . $content;
-				}
-				$tags++;
-				return '<span' . (!empty($styleString) ? 'style="' . implode(';', $styleString) : '') . '>';
-			},
-			$string
-		);
-	}
-
-	public function markdownToAnsi()
-	{
-		// TODO implement
-	}
-
-	/**
-	 * TODO syntax copied from https://github.com/pear/Console_Color2/blob/master/Console/Color2.php
-	 *
-	 * Converts colorcodes in the format %y (for yellow) into ansi-control
-	 * codes. The conversion table is: ('bold' meaning 'light' on some
-	 * terminals). It's almost the same conversion table irssi uses.
-	 * <pre>
-	 *                  text      text            background
-	 *      ------------------------------------------------
-	 *      %k %K %0    black     dark grey       black
-	 *      %r %R %1    red       bold red        red
-	 *      %g %G %2    green     bold green      green
-	 *      %y %Y %3    yellow    bold yellow     yellow
-	 *      %b %B %4    blue      bold blue       blue
-	 *      %m %M %5    magenta   bold magenta    magenta
-	 *      %p %P       magenta (think: purple)
-	 *      %c %C %6    cyan      bold cyan       cyan
-	 *      %w %W %7    white     bold white      white
-	 *
-	 *      %F     Blinking, Flashing
-	 *      %U     Underline
-	 *      %8     Reverse
-	 *      %_,%9  Bold
-	 *
-	 *      %n     Resets the color
-	 *      %%     A single %
-	 * </pre>
-	 * First param is the string to convert, second is an optional flag if
-	 * colors should be used. It defaults to true, if set to false, the
-	 * colorcodes will just be removed (And %% will be transformed into %)
-	 *
-	 * @param string $string  String to convert
-	 * @param bool   $colored Should the string be colored?
-	 *
-	 * @return string
-	 */
-	public static function renderColoredString($string, $colored = true)
-	{
-		static $conversions = array(
-			'%y' => array(self::FG_YELLOW),
-			'%g' => array(self::FG_GREEN),
-			'%b' => array(self::FG_BLUE),
-			'%r' => array(self::FG_RED),
-			'%p' => array(self::FG_PURPLE),
-			'%m' => array(self::FG_PURPLE),
-			'%c' => array(self::FG_CYAN),
-			'%w' => array(self::FG_GREY),
-			'%k' => array(self::FG_BLACK),
-			'%n' => array(0), // reset
-			'%Y' => array(self::FG_YELLOW, self::BOLD),
-			'%G' => array(self::FG_GREEN, self::BOLD),
-			'%B' => array(self::FG_BLUE, self::BOLD),
-			'%R' => array(self::FG_RED, self::BOLD),
-			'%P' => array(self::FG_PURPLE, self::BOLD),
-			'%M' => array(self::FG_PURPLE, self::BOLD),
-			'%C' => array(self::FG_CYAN, self::BOLD),
-			'%W' => array(self::FG_GREY, self::BOLD),
-			'%K' => array(self::FG_BLACK, self::BOLD),
-			'%N' => array(0, self::BOLD),
-			'%3' => array(self::BG_YELLOW),
-			'%2' => array(self::BG_GREEN),
-			'%4' => array(self::BG_BLUE),
-			'%1' => array(self::BG_RED),
-			'%5' => array(self::BG_PURPLE),
-			'%6' => array(self::BG_PURPLE),
-			'%7' => array(self::BG_CYAN),
-			'%0' => array(self::BG_GREY),
-			'%F' => array(self::BLINK),
-			'%U' => array(self::UNDERLINE),
-			'%8' => array(self::NEGATIVE),
-			'%9' => array(self::BOLD),
-			'%_' => array(self::BOLD)
-		);
-
-		if ($colored) {
-			$string = str_replace('%%', '% ', $string);
-			foreach ($conversions as $key => $value) {
-				$string = str_replace(
-					$key,
-					static::ansiFormatCode($value),
-					$string
-				);
-			}
-			$string = str_replace('% ', '%', $string);
-		} else {
-			$string = preg_replace('/%((%)|.)/', '$2', $string);
-		}
-		return $string;
-	}
-
-	/**
-	* Escapes % so they don't get interpreted as color codes
-	*
-	* @param string $string String to escape
-	*
-	* @access public
-	* @return string
-	*/
-	public static function escape($string)
-	{
-		return str_replace('%', '%%', $string);
-	}
-
-	/**
-	 * Returns true if the stream supports colorization. ANSI colors is disabled if not supported by the stream.
-	 *
-	 * - windows without asicon
-	 * - not tty consoles
-	 *
-	 * @param mixed $stream
-	 * @return bool true if the stream supports ANSI colors, otherwise false.
-	 */
-	public static function streamSupportsAnsiColors($stream)
-	{
-		return DIRECTORY_SEPARATOR == '\\'
-			? null !== getenv('ANSICON')
-			: function_exists('posix_isatty') && @posix_isatty($stream);
-	}
-
-	/**
-	 * Returns true if the console is running on windows
-	 * @return bool
-	 */
-	public static function isRunningOnWindows()
-	{
-		return strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
-	}
-
-	/**
-	 * Usage: list($w, $h) = ConsoleHelper::getScreenSize();
-	 *
-	 * @return array
-	 */
-	public static function getScreenSize()
-	{
-		// TODO implement
-		return array(150, 50);
-	}
-
-	/**
-	 * Gets input from STDIN and returns a string right-trimmed for EOLs.
-	 *
-	 * @param bool $raw If set to true, returns the raw string without trimming
-	 * @return string
-	 */
-	public static function stdin($raw = false)
-	{
-		return $raw ? fgets(STDIN) : rtrim(fgets(STDIN), PHP_EOL);
-	}
-
-	/**
-	 * Prints a string to STDOUT.
-	 *
-	 * @param string $string the string to print
-	 * @return int|boolean Number of bytes printed or false on error
-	 */
-	public static function stdout($string)
-	{
-		return fwrite(STDOUT, $string);
-	}
-
-	/**
-	 * Prints a string to STDERR.
-	 *
-	 * @param string $string the string to print
-	 * @return int|boolean Number of bytes printed or false on error
-	 */
-	public static function stderr($string)
-	{
-		return fwrite(STDERR, $string);
-	}
-
-	/**
-	 * Asks the user for input. Ends when the user types a carriage return (PHP_EOL). Optionally, It also provides a
-	 * prompt.
-	 *
-	 * @param string $prompt the prompt (optional)
-	 * @return string the user's input
-	 */
-	public static function input($prompt = null)
-	{
-		if (isset($prompt)) {
-			static::stdout($prompt);
-		}
-		return static::stdin();
-	}
-
-	/**
-	 * Prints text to STDOUT appended with a carriage return (PHP_EOL).
-	 *
-	 * @param string $text
-	 * @param bool $raw
-	 *
-	 * @return mixed Number of bytes printed or bool false on error
-	 */
-	public static function output($text = null)
-	{
-		return static::stdout($text . PHP_EOL);
-	}
-
-	/**
-	 * Prints text to STDERR appended with a carriage return (PHP_EOL).
-	 *
-	 * @param string $text
-	 * @param bool   $raw
-	 *
-	 * @return mixed Number of bytes printed or false on error
-	 */
-	public static function error($text = null)
-	{
-		return static::stderr($text . PHP_EOL);
-	}
-
-	/**
-	 * Prompts the user for input and validates it
-	 *
-	 * @param string $text prompt string
-	 * @param array $options the options to validate the input:
-	 *  - required: whether it is required or not
-	 *  - default: default value if no input is inserted by the user
-	 *  - pattern: regular expression pattern to validate user input
-	 *  - validator: a callable function to validate input. The function must accept two parameters:
-	 *      - $input: the user input to validate
-	 *      - $error: the error value passed by reference if validation failed.
-	 * @return string the user input
-	 */
-	public static function prompt($text, $options = array())
-	{
-		$options = ArrayHelper::merge(
-			$options,
-			array(
-				'required'  => false,
-				'default'   => null,
-				'pattern'   => null,
-				'validator' => null,
-				'error'     => 'Invalid input.',
-			)
-		);
-		$error   = null;
-
-		top:
-		$input = $options['default']
-			? static::input("$text [" . $options['default'] . ']: ')
-			: static::input("$text: ");
-
-		if (!strlen($input)) {
-			if (isset($options['default'])) {
-				$input = $options['default'];
-			} elseif ($options['required']) {
-				static::output($options['error']);
-				goto top;
-			}
-		} elseif ($options['pattern'] && !preg_match($options['pattern'], $input)) {
-			static::output($options['error']);
-			goto top;
-		} elseif ($options['validator'] &&
-			!call_user_func_array($options['validator'], array($input, &$error))
-		) {
-			static::output(isset($error) ? $error : $options['error']);
-			goto top;
-		}
-
-		return $input;
-	}
-
-	/**
-	 * Asks user to confirm by typing y or n.
-	 *
-	 * @param string $message to echo out before waiting for user input
-	 * @param boolean $default this value is returned if no selection is made.
-	 * @return boolean whether user confirmed
-	 */
-	public static function confirm($message, $default = true)
-	{
-		echo $message . ' (yes|no) [' . ($default ? 'yes' : 'no') . ']:';
-		$input = trim(static::stdin());
-		return empty($input) ? $default : !strncasecmp($input, 'y', 1);
-	}
-
-	/**
-	 * Gives the user an option to choose from. Giving '?' as an input will show
-	 * a list of options to choose from and their explanations.
-	 *
-	 * @param string $prompt the prompt message
-	 * @param array  $options Key-value array of options to choose from
-	 *
-	 * @return string An option character the user chose
-	 */
-	public static function select($prompt, $options = array())
-	{
-		top:
-		static::stdout("$prompt [" . implode(',', array_keys($options)) . ",?]: ");
-		$input = static::stdin();
-		if ($input === '?') {
-			foreach ($options as $key => $value) {
-				echo " $key - $value\n";
-			}
-			echo " ? - Show help\n";
-			goto top;
-		} elseif (!in_array($input, array_keys($options))) {
-			goto top;
-		}
-		return $input;
-	}
-
-	/**
-	 * Displays and updates a simple progress bar on screen.
-	 *
-	 * @param integer $done the number of items that are completed
-	 * @param integer $total the total value of items that are to be done
-	 * @param integer $size the size of the status bar (optional)
-	 * @see http://snipplr.com/view/29548/
-	 */
-	public static function showProgress($done, $total, $size = 30)
-	{
-		static $start;
-
-		// if we go over our bound, just ignore it
-		if ($done > $total) {
-			return;
-		}
-
-		if (empty($start)) {
-			$start = time();
-		}
-
-		$now = time();
-
-		$percent = (double)($done / $total);
-		$bar     = floor($percent * $size);
-
-		$status = "\r[";
-		$status .= str_repeat("=", $bar);
-		if ($bar < $size) {
-			$status .= ">";
-			$status .= str_repeat(" ", $size - $bar);
-		} else {
-			$status .= "=";
-		}
-
-		$display = number_format($percent * 100, 0);
-
-		$status .= "] $display%  $done/$total";
-
-		$rate = ($now - $start) / $done;
-		$left = $total - $done;
-		$eta  = round($rate * $left, 2);
-
-		$elapsed = $now - $start;
-
-		$status .= " remaining: " . number_format($eta) . " sec.  elapsed: " . number_format($elapsed) . " sec.";
-
-		static::stdout("$status  ");
-
-		flush();
-
-		// when done, send a newline
-		if ($done == $total) {
-			echo "\n";
-		}
-	}
-}
diff --git a/framework/helpers/base/FileHelper.php b/framework/helpers/base/FileHelper.php
deleted file mode 100644
index 954c86e..0000000
--- a/framework/helpers/base/FileHelper.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-/**
- * Filesystem helper class file.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\helpers\base;
-
-use Yii;
-
-/**
- * Filesystem helper
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @author Alex Makarov <sam@rmcreative.ru>
- * @since 2.0
- */
-class FileHelper
-{
-	/**
-	 * Normalizes a file/directory path.
-	 * After normalization, the directory separators in the path will be `DIRECTORY_SEPARATOR`,
-	 * and any trailing directory separators will be removed. For example, '/home\demo/' on Linux
-	 * will be normalized as '/home/demo'.
-	 * @param string $path the file/directory path to be normalized
-	 * @param string $ds the directory separator to be used in the normalized result. Defaults to `DIRECTORY_SEPARATOR`.
-	 * @return string the normalized file/directory path
-	 */
-	public static function normalizePath($path, $ds = DIRECTORY_SEPARATOR)
-	{
-		return rtrim(strtr($path, array('/' => $ds, '\\' => $ds)), $ds);
-	}
-
-	/**
-	 * Returns the localized version of a specified file.
-	 *
-	 * The searching is based on the specified language code. In particular,
-	 * a file with the same name will be looked for under the subdirectory
-	 * whose name is the same as the language code. For example, given the file "path/to/view.php"
-	 * and language code "zh_CN", the localized file will be looked for as
-	 * "path/to/zh_CN/view.php". If the file is not found, the original file
-	 * will be returned.
-	 *
-	 * If the target and the source language codes are the same,
-	 * the original file will be returned.
-	 *
-	 * @param string $file the original file
-	 * @param string $language the target language that the file should be localized to.
-	 * If not set, the value of [[\yii\base\Application::language]] will be used.
-	 * @param string $sourceLanguage the language that the original file is in.
-	 * If not set, the value of [[\yii\base\Application::sourceLanguage]] will be used.
-	 * @return string the matching localized file, or the original file if the localized version is not found.
-	 * If the target and the source language codes are the same, the original file will be returned.
-	 */
-	public static function localize($file, $language = null, $sourceLanguage = null)
-	{
-		if ($language === null) {
-			$language = Yii::$app->language;
-		}
-		if ($sourceLanguage === null) {
-			$sourceLanguage = Yii::$app->sourceLanguage;
-		}
-		if ($language === $sourceLanguage) {
-			return $file;
-		}
-		$desiredFile = dirname($file) . DIRECTORY_SEPARATOR . $sourceLanguage . DIRECTORY_SEPARATOR . basename($file);
-		return is_file($desiredFile) ? $desiredFile : $file;
-	}
-
-	/**
-	 * Determines the MIME type of the specified file.
-	 * This method will first try to determine the MIME type based on
-	 * [finfo_open](http://php.net/manual/en/function.finfo-open.php). If this doesn't work, it will
-	 * fall back to [[getMimeTypeByExtension()]].
-	 * @param string $file the file name.
-	 * @param string $magicFile name of the optional magic database file, usually something like `/path/to/magic.mime`.
-	 * This will be passed as the second parameter to [finfo_open](http://php.net/manual/en/function.finfo-open.php).
-	 * @param boolean $checkExtension whether to use the file extension to determine the MIME type in case
-	 * `finfo_open()` cannot determine it.
-	 * @return string the MIME type (e.g. `text/plain`). Null is returned if the MIME type cannot be determined.
-	 */
-	public static function getMimeType($file, $magicFile = null, $checkExtension = true)
-	{
-		if (function_exists('finfo_open')) {
-			$info = finfo_open(FILEINFO_MIME_TYPE, $magicFile);
-			if ($info) {
-				$result = finfo_file($info, $file);
-				finfo_close($info);
-				if ($result !== false) {
-					return $result;
-				}
-			}
-		}
-
-		return $checkExtension ? self::getMimeTypeByExtension($file) : null;
-	}
-
-	/**
-	 * Determines the MIME type based on the extension name of the specified file.
-	 * This method will use a local map between extension names and MIME types.
-	 * @param string $file the file name.
-	 * @param string $magicFile the path of the file that contains all available MIME type information.
-	 * If this is not set, the default file aliased by `@yii/util/mimeTypes.php` will be used.
-	 * @return string the MIME type. Null is returned if the MIME type cannot be determined.
-	 */
-	public static function getMimeTypeByExtension($file, $magicFile = null)
-	{
-		static $mimeTypes = array();
-		if ($magicFile === null) {
-			$magicFile = __DIR__ . '/mimeTypes.php';
-		}
-		if (!isset($mimeTypes[$magicFile])) {
-			$mimeTypes[$magicFile] = require($magicFile);
-		}
-		if (($ext = pathinfo($file, PATHINFO_EXTENSION)) !== '') {
-			$ext = strtolower($ext);
-			if (isset($mimeTypes[$magicFile][$ext])) {
-				return $mimeTypes[$magicFile][$ext];
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Copies a whole directory as another one.
-	 * The files and sub-directories will also be copied over.
-	 * @param string $src the source directory
-	 * @param string $dst the destination directory
-	 * @param array $options options for directory copy. Valid options are:
-	 *
-	 * - dirMode: integer, the permission to be set for newly copied directories. Defaults to 0777.
-	 * - fileMode:  integer, the permission to be set for newly copied files. Defaults to the current environment setting.
-	 * - beforeCopy: callback, a PHP callback that is called before copying each sub-directory or file.
-	 *   If the callback returns false, the copy operation for the sub-directory or file will be cancelled.
-	 *   The signature of the callback should be: `function ($from, $to)`, where `$from` is the sub-directory or
- 	 *   file to be copied from, while `$to` is the copy target.
-	 * - afterCopy: callback, a PHP callback that is called after a sub-directory or file is successfully copied.
-	 *   The signature of the callback is similar to that of `beforeCopy`.
-	 */
-	public static function copyDirectory($src, $dst, $options = array())
-	{
-		if (!is_dir($dst)) {
-			mkdir($dst, isset($options['dirMode']) ? $options['dirMode'] : 0777, true);
-		}
-
-		$handle = opendir($src);
-		while (($file = readdir($handle)) !== false) {
-			if ($file === '.' || $file === '..') {
-				continue;
-			}
-			$from = $src . DIRECTORY_SEPARATOR . $file;
-			$to = $dst . DIRECTORY_SEPARATOR . $file;
-			if (!isset($options['beforeCopy']) || call_user_func($options['beforeCopy'], $from, $to)) {
-				if (is_file($from)) {
-					copy($from, $to);
-					if (isset($options['fileMode'])) {
-						@chmod($to, $options['fileMode']);
-					}
-				} else {
-					static::copyDirectory($from, $to, $options);
-				}
-				if (isset($options['afterCopy'])) {
-					call_user_func($options['afterCopy'], $from, $to);
-				}
-			}
-		}
-		closedir($handle);
-	}
-}
diff --git a/framework/helpers/base/Html.php b/framework/helpers/base/Html.php
deleted file mode 100644
index f601772..0000000
--- a/framework/helpers/base/Html.php
+++ /dev/null
@@ -1,1483 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\helpers\base;
-
-use Yii;
-use yii\base\InvalidParamException;
-use yii\web\Request;
-use yii\base\Model;
-
-/**
- * Html provides a set of static methods for generating commonly used HTML tags.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Html
-{
-	/**
-	 * @var boolean whether to close void (empty) elements. Defaults to true.
-	 * @see voidElements
-	 */
-	public static $closeVoidElements = true;
-	/**
-	 * @var array list of void elements (element name => 1)
-	 * @see closeVoidElements
-	 * @see http://www.w3.org/TR/html-markup/syntax.html#void-element
-	 */
-	public static $voidElements = array(
-		'area' => 1,
-		'base' => 1,
-		'br' => 1,
-		'col' => 1,
-		'command' => 1,
-		'embed' => 1,
-		'hr' => 1,
-		'img' => 1,
-		'input' => 1,
-		'keygen' => 1,
-		'link' => 1,
-		'meta' => 1,
-		'param' => 1,
-		'source' => 1,
-		'track' => 1,
-		'wbr' => 1,
-	);
-	/**
-	 * @var boolean whether to show the values of boolean attributes in element tags.
-	 * If false, only the attribute names will be generated.
-	 * @see booleanAttributes
-	 */
-	public static $showBooleanAttributeValues = true;
-	/**
-	 * @var array list of boolean attributes. The presence of a boolean attribute on
-	 * an element represents the true value, and the absence of the attribute represents the false value.
-	 * @see showBooleanAttributeValues
-	 * @see http://www.w3.org/TR/html5/infrastructure.html#boolean-attributes
-	 */
-	public static $booleanAttributes = array(
-		'async' => 1,
-		'autofocus' => 1,
-		'autoplay' => 1,
-		'checked' => 1,
-		'controls' => 1,
-		'declare' => 1,
-		'default' => 1,
-		'defer' => 1,
-		'disabled' => 1,
-		'formnovalidate' => 1,
-		'hidden' => 1,
-		'ismap' => 1,
-		'loop' => 1,
-		'multiple' => 1,
-		'muted' => 1,
-		'nohref' => 1,
-		'noresize' => 1,
-		'novalidate' => 1,
-		'open' => 1,
-		'readonly' => 1,
-		'required' => 1,
-		'reversed' => 1,
-		'scoped' => 1,
-		'seamless' => 1,
-		'selected' => 1,
-		'typemustmatch' => 1,
-	);
-	/**
-	 * @var array the preferred order of attributes in a tag. This mainly affects the order of the attributes
-	 * that are rendered by [[renderAttributes()]].
-	 */
-	public static $attributeOrder = array(
-		'type',
-		'id',
-		'class',
-		'name',
-		'value',
-
-		'href',
-		'src',
-		'action',
-		'method',
-
-		'selected',
-		'checked',
-		'readonly',
-		'disabled',
-		'multiple',
-
-		'size',
-		'maxlength',
-		'width',
-		'height',
-		'rows',
-		'cols',
-
-		'alt',
-		'title',
-		'rel',
-		'media',
-	);
-
-	/**
-	 * Encodes special characters into HTML entities.
-	 * The [[yii\base\Application::charset|application charset]] will be used for encoding.
-	 * @param string $content the content to be encoded
-	 * @param boolean $doubleEncode whether to encode HTML entities in `$content`. If false,
-	 * HTML entities in `$content` will not be further encoded.
-	 * @return string the encoded content
-	 * @see decode
-	 * @see http://www.php.net/manual/en/function.htmlspecialchars.php
-	 */
-	public static function encode($content, $doubleEncode = true)
-	{
-		return htmlspecialchars($content, ENT_QUOTES, Yii::$app->charset, $doubleEncode);
-	}
-
-	/**
-	 * Decodes special HTML entities back to the corresponding characters.
-	 * This is the opposite of [[encode()]].
-	 * @param string $content the content to be decoded
-	 * @return string the decoded content
-	 * @see encode
-	 * @see http://www.php.net/manual/en/function.htmlspecialchars-decode.php
-	 */
-	public static function decode($content)
-	{
-		return htmlspecialchars_decode($content, ENT_QUOTES);
-	}
-
-	/**
-	 * Generates a complete HTML tag.
-	 * @param string $name the tag name
-	 * @param string $content the content to be enclosed between the start and end tags. It will not be HTML-encoded.
-	 * If this is coming from end users, you should consider [[encode()]] it to prevent XSS attacks.
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * If a value is null, the corresponding attribute will not be rendered.
-	 * @return string the generated HTML tag
-	 * @see beginTag
-	 * @see endTag
-	 */
-	public static function tag($name, $content = '', $options = array())
-	{
-		$html = '<' . $name . static::renderTagAttributes($options);
-		if (isset(static::$voidElements[strtolower($name)])) {
-			return $html . (static::$closeVoidElements ? ' />' : '>');
-		} else {
-			return $html . ">$content</$name>";
-		}
-	}
-
-	/**
-	 * Generates a start tag.
-	 * @param string $name the tag name
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * If a value is null, the corresponding attribute will not be rendered.
-	 * @return string the generated start tag
-	 * @see endTag
-	 * @see tag
-	 */
-	public static function beginTag($name, $options = array())
-	{
-		return '<' . $name . static::renderTagAttributes($options) . '>';
-	}
-
-	/**
-	 * Generates an end tag.
-	 * @param string $name the tag name
-	 * @return string the generated end tag
-	 * @see beginTag
-	 * @see tag
-	 */
-	public static function endTag($name)
-	{
-		return "</$name>";
-	}
-
-	/**
-	 * Encloses the given content within a CDATA tag.
-	 * @param string $content the content to be enclosed within the CDATA tag
-	 * @return string the CDATA tag with the enclosed content.
-	 */
-	public static function cdata($content)
-	{
-		return '<![CDATA[' . $content . ']]>';
-	}
-
-	/**
-	 * Generates a style tag.
-	 * @param string $content the style content
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * If a value is null, the corresponding attribute will not be rendered.
-	 * If the options does not contain "type", a "type" attribute with value "text/css" will be used.
-	 * @return string the generated style tag
-	 */
-	public static function style($content, $options = array())
-	{
-		if (!isset($options['type'])) {
-			$options['type'] = 'text/css';
-		}
-		return static::tag('style', "/*<![CDATA[*/\n{$content}\n/*]]>*/", $options);
-	}
-
-	/**
-	 * Generates a script tag.
-	 * @param string $content the script content
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * If a value is null, the corresponding attribute will not be rendered.
-	 * If the options does not contain "type", a "type" attribute with value "text/javascript" will be rendered.
-	 * @return string the generated script tag
-	 */
-	public static function script($content, $options = array())
-	{
-		if (!isset($options['type'])) {
-			$options['type'] = 'text/javascript';
-		}
-		return static::tag('script', "/*<![CDATA[*/\n{$content}\n/*]]>*/", $options);
-	}
-
-	/**
-	 * Generates a link tag that refers to an external CSS file.
-	 * @param array|string $url the URL of the external CSS file. This parameter will be processed by [[url()]].
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * If a value is null, the corresponding attribute will not be rendered.
-	 * @return string the generated link tag
-	 * @see url
-	 */
-	public static function cssFile($url, $options = array())
-	{
-		$options['rel'] = 'stylesheet';
-		$options['type'] = 'text/css';
-		$options['href'] = static::url($url);
-		return static::tag('link', '', $options);
-	}
-
-	/**
-	 * Generates a script tag that refers to an external JavaScript file.
-	 * @param string $url the URL of the external JavaScript file. This parameter will be processed by [[url()]].
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * If a value is null, the corresponding attribute will not be rendered.
-	 * @return string the generated script tag
-	 * @see url
-	 */
-	public static function jsFile($url, $options = array())
-	{
-		$options['type'] = 'text/javascript';
-		$options['src'] = static::url($url);
-		return static::tag('script', '', $options);
-	}
-
-	/**
-	 * Generates a form start tag.
-	 * @param array|string $action the form action URL. This parameter will be processed by [[url()]].
-	 * @param string $method the form submission method, such as "post", "get", "put", "delete" (case-insensitive).
-	 * Since most browsers only support "post" and "get", if other methods are given, they will
-	 * be simulated using "post", and a hidden input will be added which contains the actual method type.
-	 * See [[\yii\web\Request::restVar]] for more details.
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * If a value is null, the corresponding attribute will not be rendered.
-	 * @return string the generated form start tag.
-	 * @see endForm
-	 */
-	public static function beginForm($action = '', $method = 'post', $options = array())
-	{
-		$action = static::url($action);
-
-		$hiddenInputs = array();
-
-		$request = Yii::$app->getRequest();
-		if ($request instanceof Request) {
-			if (strcasecmp($method, 'get') && strcasecmp($method, 'post')) {
-				// simulate PUT, DELETE, etc. via POST
-				$hiddenInputs[] = static::hiddenInput($request->restVar, $method);
-				$method = 'post';
-			}
-			if ($request->enableCsrfValidation) {
-				$hiddenInputs[] = static::hiddenInput($request->csrfTokenName, $request->getCsrfToken());
-			}
-		}
-
-		if (!strcasecmp($method, 'get') && ($pos = strpos($action, '?')) !== false) {
-			// query parameters in the action are ignored for GET method
-			// we use hidden fields to add them back
-			foreach (explode('&', substr($action, $pos + 1)) as $pair) {
-				if (($pos1 = strpos($pair, '=')) !== false) {
-					$hiddenInputs[] = static::hiddenInput(urldecode(substr($pair, 0, $pos1)), urldecode(substr($pair, $pos1 + 1)));
-				} else {
-					$hiddenInputs[] = static::hiddenInput(urldecode($pair), '');
-				}
-			}
-			$action = substr($action, 0, $pos);
-		}
-
-		$options['action'] = $action;
-		$options['method'] = $method;
-		$form = static::beginTag('form', $options);
-		if (!empty($hiddenInputs)) {
-			$form .= "\n" . implode("\n", $hiddenInputs);
-		}
-
-		return $form;
-	}
-
-	/**
-	 * Generates a form end tag.
-	 * @return string the generated tag
-	 * @see beginForm
-	 */
-	public static function endForm()
-	{
-		return '</form>';
-	}
-
-	/**
-	 * Generates a hyperlink tag.
-	 * @param string $text link body. It will NOT be HTML-encoded. Therefore you can pass in HTML code
-	 * such as an image tag. If this is is coming from end users, you should consider [[encode()]]
-	 * it to prevent XSS attacks.
-	 * @param array|string|null $url the URL for the hyperlink tag. This parameter will be processed by [[url()]]
-	 * and will be used for the "href" attribute of the tag. If this parameter is null, the "href" attribute
-	 * will not be generated.
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * If a value is null, the corresponding attribute will not be rendered.
-	 * @return string the generated hyperlink
-	 * @see url
-	 */
-	public static function a($text, $url = null, $options = array())
-	{
-		if ($url !== null) {
-			$options['href'] = static::url($url);
-		}
-		return static::tag('a', $text, $options);
-	}
-
-	/**
-	 * Generates a mailto hyperlink.
-	 * @param string $text link body. It will NOT be HTML-encoded. Therefore you can pass in HTML code
-	 * such as an image tag. If this is is coming from end users, you should consider [[encode()]]
-	 * it to prevent XSS attacks.
-	 * @param string $email email address. If this is null, the first parameter (link body) will be treated
-	 * as the email address and used.
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * If a value is null, the corresponding attribute will not be rendered.
-	 * @return string the generated mailto link
-	 */
-	public static function mailto($text, $email = null, $options = array())
-	{
-		$options['href'] = 'mailto:' . ($email === null ? $text : $email);
-		return static::tag('a', $text, $options);
-	}
-
-	/**
-	 * Generates an image tag.
-	 * @param string $src the image URL. This parameter will be processed by [[url()]].
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * If a value is null, the corresponding attribute will not be rendered.
-	 * @return string the generated image tag
-	 */
-	public static function img($src, $options = array())
-	{
-		$options['src'] = static::url($src);
-		if (!isset($options['alt'])) {
-			$options['alt'] = '';
-		}
-		return static::tag('img', null, $options);
-	}
-
-	/**
-	 * Generates a label tag.
-	 * @param string $content label text. It will NOT be HTML-encoded. Therefore you can pass in HTML code
-	 * such as an image tag. If this is is coming from end users, you should [[encode()]]
-	 * it to prevent XSS attacks.
-	 * @param string $for the ID of the HTML element that this label is associated with.
-	 * If this is null, the "for" attribute will not be generated.
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * If a value is null, the corresponding attribute will not be rendered.
-	 * @return string the generated label tag
-	 */
-	public static function label($content, $for = null, $options = array())
-	{
-		$options['for'] = $for;
-		return static::tag('label', $content, $options);
-	}
-
-	/**
-	 * Generates a button tag.
-	 * @param string $content the content enclosed within the button tag. It will NOT be HTML-encoded.
-	 * Therefore you can pass in HTML code such as an image tag. If this is is coming from end users,
-	 * you should consider [[encode()]] it to prevent XSS attacks.
-	 * @param string $name the name attribute. If it is null, the name attribute will not be generated.
-	 * @param string $value the value attribute. If it is null, the value attribute will not be generated.
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * If a value is null, the corresponding attribute will not be rendered.
-	 * If the options does not contain "type", a "type" attribute with value "button" will be rendered.
-	 * @return string the generated button tag
-	 */
-	public static function button($content = 'Button', $name = null, $value = null, $options = array())
-	{
-		$options['name'] = $name;
-		$options['value'] = $value;
-		if (!isset($options['type'])) {
-			$options['type'] = 'button';
-		}
-		return static::tag('button', $content, $options);
-	}
-
-	/**
-	 * Generates a submit button tag.
-	 * @param string $content the content enclosed within the button tag. It will NOT be HTML-encoded.
-	 * Therefore you can pass in HTML code such as an image tag. If this is is coming from end users,
-	 * you should consider [[encode()]] it to prevent XSS attacks.
-	 * @param string $name the name attribute. If it is null, the name attribute will not be generated.
-	 * @param string $value the value attribute. If it is null, the value attribute will not be generated.
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * If a value is null, the corresponding attribute will not be rendered.
-	 * @return string the generated submit button tag
-	 */
-	public static function submitButton($content = 'Submit', $name = null, $value = null, $options = array())
-	{
-		$options['type'] = 'submit';
-		return static::button($content, $name, $value, $options);
-	}
-
-	/**
-	 * Generates a reset button tag.
-	 * @param string $content the content enclosed within the button tag. It will NOT be HTML-encoded.
-	 * Therefore you can pass in HTML code such as an image tag. If this is is coming from end users,
-	 * you should consider [[encode()]] it to prevent XSS attacks.
-	 * @param string $name the name attribute. If it is null, the name attribute will not be generated.
-	 * @param string $value the value attribute. If it is null, the value attribute will not be generated.
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * If a value is null, the corresponding attribute will not be rendered.
-	 * @return string the generated reset button tag
-	 */
-	public static function resetButton($content = 'Reset', $name = null, $value = null, $options = array())
-	{
-		$options['type'] = 'reset';
-		return static::button($content, $name, $value, $options);
-	}
-
-	/**
-	 * Generates an input type of the given type.
-	 * @param string $type the type attribute.
-	 * @param string $name the name attribute. If it is null, the name attribute will not be generated.
-	 * @param string $value the value attribute. If it is null, the value attribute will not be generated.
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * If a value is null, the corresponding attribute will not be rendered.
-	 * @return string the generated input tag
-	 */
-	public static function input($type, $name = null, $value = null, $options = array())
-	{
-		$options['type'] = $type;
-		$options['name'] = $name;
-		$options['value'] = $value;
-		return static::tag('input', null, $options);
-	}
-
-	/**
-	 * Generates an input button.
-	 * @param string $name the name attribute.
-	 * @param string $value the value attribute. If it is null, the value attribute will not be generated.
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * If a value is null, the corresponding attribute will not be rendered.
-	 * @return string the generated button tag
-	 */
-	public static function buttonInput($name, $value = 'Button', $options = array())
-	{
-		return static::input('button', $name, $value, $options);
-	}
-
-	/**
-	 * Generates a submit input button.
-	 * @param string $name the name attribute. If it is null, the name attribute will not be generated.
-	 * @param string $value the value attribute. If it is null, the value attribute will not be generated.
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * If a value is null, the corresponding attribute will not be rendered.
-	 * @return string the generated button tag
-	 */
-	public static function submitInput($name = null, $value = 'Submit', $options = array())
-	{
-		return static::input('submit', $name, $value, $options);
-	}
-
-	/**
-	 * Generates a reset input button.
-	 * @param string $name the name attribute. If it is null, the name attribute will not be generated.
-	 * @param string $value the value attribute. If it is null, the value attribute will not be generated.
-	 * @param array $options the attributes of the button tag. The values will be HTML-encoded using [[encode()]].
-	 * Attributes whose value is null will be ignored and not put in the tag returned.
-	 * @return string the generated button tag
-	 */
-	public static function resetInput($name = null, $value = 'Reset', $options = array())
-	{
-		return static::input('reset', $name, $value, $options);
-	}
-
-	/**
-	 * Generates a text input field.
-	 * @param string $name the name attribute.
-	 * @param string $value the value attribute. If it is null, the value attribute will not be generated.
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * If a value is null, the corresponding attribute will not be rendered.
-	 * @return string the generated button tag
-	 */
-	public static function textInput($name, $value = null, $options = array())
-	{
-		return static::input('text', $name, $value, $options);
-	}
-
-	/**
-	 * Generates a hidden input field.
-	 * @param string $name the name attribute.
-	 * @param string $value the value attribute. If it is null, the value attribute will not be generated.
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * If a value is null, the corresponding attribute will not be rendered.
-	 * @return string the generated button tag
-	 */
-	public static function hiddenInput($name, $value = null, $options = array())
-	{
-		return static::input('hidden', $name, $value, $options);
-	}
-
-	/**
-	 * Generates a password input field.
-	 * @param string $name the name attribute.
-	 * @param string $value the value attribute. If it is null, the value attribute will not be generated.
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * If a value is null, the corresponding attribute will not be rendered.
-	 * @return string the generated button tag
-	 */
-	public static function passwordInput($name, $value = null, $options = array())
-	{
-		return static::input('password', $name, $value, $options);
-	}
-
-	/**
-	 * Generates a file input field.
-	 * To use a file input field, you should set the enclosing form's "enctype" attribute to
-	 * be "multipart/form-data". After the form is submitted, the uploaded file information
-	 * can be obtained via $_FILES[$name] (see PHP documentation).
-	 * @param string $name the name attribute.
-	 * @param string $value the value attribute. If it is null, the value attribute will not be generated.
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * If a value is null, the corresponding attribute will not be rendered.
-	 * @return string the generated button tag
-	 */
-	public static function fileInput($name, $value = null, $options = array())
-	{
-		return static::input('file', $name, $value, $options);
-	}
-
-	/**
-	 * Generates a text area input.
-	 * @param string $name the input name
-	 * @param string $value the input value. Note that it will be encoded using [[encode()]].
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * If a value is null, the corresponding attribute will not be rendered.
-	 * @return string the generated text area tag
-	 */
-	public static function textarea($name, $value = '', $options = array())
-	{
-		$options['name'] = $name;
-		return static::tag('textarea', static::encode($value), $options);
-	}
-
-	/**
-	 * Generates a radio button input.
-	 * @param string $name the name attribute.
-	 * @param boolean $checked whether the radio button should be checked.
-	 * @param array $options the tag options in terms of name-value pairs. The following options are specially handled:
-	 *
-	 * - uncheck: string, the value associated with the uncheck state of the radio button. When this attribute
-	 *   is present, a hidden input will be generated so that if the radio button is not checked and is submitted,
-	 *   the value of this attribute will still be submitted to the server via the hidden input.
-	 *
-	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will
-	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
-	 *
-	 * @return string the generated radio button tag
-	 */
-	public static function radio($name, $checked = false, $options = array())
-	{
-		$options['checked'] = $checked;
-		$value = array_key_exists('value', $options) ? $options['value'] : '1';
-		if (isset($options['uncheck'])) {
-			// add a hidden field so that if the radio button is not selected, it still submits a value
-			$hidden = static::hiddenInput($name, $options['uncheck']);
-			unset($options['uncheck']);
-		} else {
-			$hidden = '';
-		}
-		return $hidden . static::input('radio', $name, $value, $options);
-	}
-
-	/**
-	 * Generates a checkbox input.
-	 * @param string $name the name attribute.
-	 * @param boolean $checked whether the checkbox should be checked.
-	 * @param array $options the tag options in terms of name-value pairs. The following options are specially handled:
-	 *
-	 * - uncheck: string, the value associated with the uncheck state of the checkbox. When this attribute
-	 *   is present, a hidden input will be generated so that if the checkbox is not checked and is submitted,
-	 *   the value of this attribute will still be submitted to the server via the hidden input.
-	 *
-	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will
-	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
-	 *
-	 * @return string the generated checkbox tag
-	 */
-	public static function checkbox($name, $checked = false, $options = array())
-	{
-		$options['checked'] = $checked;
-		$value = array_key_exists('value', $options) ? $options['value'] : '1';
-		if (isset($options['uncheck'])) {
-			// add a hidden field so that if the checkbox is not selected, it still submits a value
-			$hidden = static::hiddenInput($name, $options['uncheck']);
-			unset($options['uncheck']);
-		} else {
-			$hidden = '';
-		}
-		return $hidden . static::input('checkbox', $name, $value, $options);
-	}
-
-	/**
-	 * Generates a drop-down list.
-	 * @param string $name the input name
-	 * @param string $selection the selected value
-	 * @param array $items the option data items. The array keys are option values, and the array values
-	 * are the corresponding option labels. The array can also be nested (i.e. some array values are arrays too).
-	 * For each sub-array, an option group will be generated whose label is the key associated with the sub-array.
-	 * If you have a list of data models, you may convert them into the format described above using
-	 * [[\yii\helpers\ArrayHelper::map()]].
-	 *
-	 * Note, the values and labels will be automatically HTML-encoded by this method, and the blank spaces in
-	 * the labels will also be HTML-encoded.
-	 * @param array $options the tag options in terms of name-value pairs. The following options are specially handled:
-	 *
-	 * - prompt: string, a prompt text to be displayed as the first option;
-	 * - options: array, the attributes for the select option tags. The array keys must be valid option values,
-	 *   and the array values are the extra attributes for the corresponding option tags. For example,
-	 *
-	 * ~~~
-	 * array(
-	 *     'value1' => array('disabled' => true),
-	 *     'value2' => array('label' => 'value 2'),
-	 * );
-	 * ~~~
-	 *
-	 * - groups: array, the attributes for the optgroup tags. The structure of this is similar to that of 'options',
-	 *   except that the array keys represent the optgroup labels specified in $items.
-	 *
-	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will
-	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
-	 *
-	 * @return string the generated drop-down list tag
-	 */
-	public static function dropDownList($name, $selection = null, $items = array(), $options = array())
-	{
-		$options['name'] = $name;
-		$selectOptions = static::renderSelectOptions($selection, $items, $options);
-		return static::tag('select', "\n" . $selectOptions . "\n", $options);
-	}
-
-	/**
-	 * Generates a list box.
-	 * @param string $name the input name
-	 * @param string|array $selection the selected value(s)
-	 * @param array $items the option data items. The array keys are option values, and the array values
-	 * are the corresponding option labels. The array can also be nested (i.e. some array values are arrays too).
-	 * For each sub-array, an option group will be generated whose label is the key associated with the sub-array.
-	 * If you have a list of data models, you may convert them into the format described above using
-	 * [[\yii\helpers\ArrayHelper::map()]].
-	 *
-	 * Note, the values and labels will be automatically HTML-encoded by this method, and the blank spaces in
-	 * the labels will also be HTML-encoded.
-	 * @param array $options the tag options in terms of name-value pairs. The following options are specially handled:
-	 *
-	 * - prompt: string, a prompt text to be displayed as the first option;
-	 * - options: array, the attributes for the select option tags. The array keys must be valid option values,
-	 *   and the array values are the extra attributes for the corresponding option tags. For example,
-	 *
-	 * ~~~
-	 * array(
-	 *     'value1' => array('disabled' => true),
-	 *     'value2' => array('label' => 'value 2'),
-	 * );
-	 * ~~~
-	 *
-	 * - groups: array, the attributes for the optgroup tags. The structure of this is similar to that of 'options',
-	 *   except that the array keys represent the optgroup labels specified in $items.
-	 * - unselect: string, the value that will be submitted when no option is selected.
-	 *   When this attribute is set, a hidden field will be generated so that if no option is selected in multiple
-	 *   mode, we can still obtain the posted unselect value.
-	 *
-	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will
-	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
-	 *
-	 * @return string the generated list box tag
-	 */
-	public static function listBox($name, $selection = null, $items = array(), $options = array())
-	{
-		if (!isset($options['size'])) {
-			$options['size'] = 4;
-		}
-		if (!empty($options['multiple']) && substr($name, -2) !== '[]') {
-			$name .= '[]';
-		}
-		$options['name'] = $name;
-		if (isset($options['unselect'])) {
-			// add a hidden field so that if the list box has no option being selected, it still submits a value
-			if (substr($name, -2) === '[]') {
-				$name = substr($name, 0, -2);
-			}
-			$hidden = static::hiddenInput($name, $options['unselect']);
-			unset($options['unselect']);
-		} else {
-			$hidden = '';
-		}
-		$selectOptions = static::renderSelectOptions($selection, $items, $options);
-		return $hidden . static::tag('select', "\n" . $selectOptions . "\n", $options);
-	}
-
-	/**
-	 * Generates a list of checkboxes.
-	 * A checkbox list allows multiple selection, like [[listBox()]].
-	 * As a result, the corresponding submitted value is an array.
-	 * @param string $name the name attribute of each checkbox.
-	 * @param string|array $selection the selected value(s).
-	 * @param array $items the data item used to generate the checkboxes.
-	 * The array keys are the labels, while the array values are the corresponding checkbox values.
-	 * Note that the labels will NOT be HTML-encoded, while the values will.
-	 * @param array $options options (name => config) for the checkbox list. The following options are supported:
-	 *
-	 * - unselect: string, the value that should be submitted when none of the checkboxes is selected.
-	 *   By setting this option, a hidden input will be generated.
-	 * - separator: string, the HTML code that separates items.
-	 * - item: callable, a callback that can be used to customize the generation of the HTML code
-	 *   corresponding to a single item in $items. The signature of this callback must be:
-	 *
-	 * ~~~
-	 * function ($index, $label, $name, $checked, $value)
-	 * ~~~
-	 *
-	 * where $index is the zero-based index of the checkbox in the whole list; $label
-	 * is the label for the checkbox; and $name, $value and $checked represent the name,
-	 * value and the checked status of the checkbox input, respectively.
-	 * @return string the generated checkbox list
-	 */
-	public static function checkboxList($name, $selection = null, $items = array(), $options = array())
-	{
-		if (substr($name, -2) !== '[]') {
-			$name .= '[]';
-		}
-
-		$formatter = isset($options['item']) ? $options['item'] : null;
-		$lines = array();
-		$index = 0;
-		foreach ($items as $value => $label) {
-			$checked = $selection !== null &&
-				(!is_array($selection) && !strcmp($value, $selection)
-					|| is_array($selection) && in_array($value, $selection));
-			if ($formatter !== null) {
-				$lines[] = call_user_func($formatter, $index, $label, $name, $checked, $value);
-			} else {
-				$lines[] = static::label(static::checkbox($name, $checked, array('value' => $value)) . ' ' . $label);
-			}
-			$index++;
-		}
-
-		if (isset($options['unselect'])) {
-			// add a hidden field so that if the list box has no option being selected, it still submits a value
-			$name2 = substr($name, -2) === '[]' ? substr($name, 0, -2) : $name;
-			$hidden = static::hiddenInput($name2, $options['unselect']);
-		} else {
-			$hidden = '';
-		}
-		$separator = isset($options['separator']) ? $options['separator'] : "\n";
-
-		return $hidden . implode($separator, $lines);
-	}
-
-	/**
-	 * Generates a list of radio buttons.
-	 * A radio button list is like a checkbox list, except that it only allows single selection.
-	 * @param string $name the name attribute of each radio button.
-	 * @param string|array $selection the selected value(s).
-	 * @param array $items the data item used to generate the radio buttons.
-	 * The array keys are the labels, while the array values are the corresponding radio button values.
-	 * Note that the labels will NOT be HTML-encoded, while the values will.
-	 * @param array $options options (name => config) for the radio button list. The following options are supported:
-	 *
-	 * - unselect: string, the value that should be submitted when none of the radio buttons is selected.
-	 *   By setting this option, a hidden input will be generated.
-	 * - separator: string, the HTML code that separates items.
-	 * - item: callable, a callback that can be used to customize the generation of the HTML code
-	 *   corresponding to a single item in $items. The signature of this callback must be:
-	 *
-	 * ~~~
-	 * function ($index, $label, $name, $checked, $value)
-	 * ~~~
-	 *
-	 * where $index is the zero-based index of the radio button in the whole list; $label
-	 * is the label for the radio button; and $name, $value and $checked represent the name,
-	 * value and the checked status of the radio button input, respectively.
-	 * @return string the generated radio button list
-	 */
-	public static function radioList($name, $selection = null, $items = array(), $options = array())
-	{
-		$formatter = isset($options['item']) ? $options['item'] : null;
-		$lines = array();
-		$index = 0;
-		foreach ($items as $value => $label) {
-			$checked = $selection !== null &&
-				(!is_array($selection) && !strcmp($value, $selection)
-					|| is_array($selection) && in_array($value, $selection));
-			if ($formatter !== null) {
-				$lines[] = call_user_func($formatter, $index, $label, $name, $checked, $value);
-			} else {
-				$lines[] = static::label(static::radio($name, $checked, array('value' => $value)) . ' ' . $label);
-			}
-			$index++;
-		}
-
-		$separator = isset($options['separator']) ? $options['separator'] : "\n";
-		if (isset($options['unselect'])) {
-			// add a hidden field so that if the list box has no option being selected, it still submits a value
-			$hidden = static::hiddenInput($name, $options['unselect']);
-		} else {
-			$hidden = '';
-		}
-
-		return $hidden . implode($separator, $lines);
-	}
-
-	/**
-	 * Generates a label tag for the given model attribute.
-	 * The label text is the label associated with the attribute, obtained via [[Model::getAttributeLabel()]].
-	 * @param Model $model the model object
-	 * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format
-	 * about attribute expression.
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * If a value is null, the corresponding attribute will not be rendered.
-	 * The following options are specially handled:
-	 *
-	 * - label: this specifies the label to be displayed. Note that this will NOT be [[encoded()]].
-	 *   If this is not set, [[Model::getAttributeLabel()]] will be called to get the label for display
-	 *   (after encoding).
-	 *
-	 * @return string the generated label tag
-	 */
-	public static function activeLabel($model, $attribute, $options = array())
-	{
-		$attribute = static::getAttributeName($attribute);
-		$label = isset($options['label']) ? $options['label'] : static::encode($model->getAttributeLabel($attribute));
-		$for = array_key_exists('for', $options) ? $options['for'] : static::getInputId($model, $attribute);
-		unset($options['label'], $options['for']);
-		return static::label($label, $for, $options);
-	}
-
-	/**
-	 * Generates an input tag for the given model attribute.
-	 * This method will generate the "name" and "value" tag attributes automatically for the model attribute
-	 * unless they are explicitly specified in `$options`.
-	 * @param string $type the input type (e.g. 'text', 'password')
-	 * @param Model $model the model object
-	 * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format
-	 * about attribute expression.
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * @return string the generated input tag
-	 */
-	public static function activeInput($type, $model, $attribute, $options = array())
-	{
-		$name = isset($options['name']) ? $options['name'] : static::getInputName($model, $attribute);
-		$value = isset($options['value']) ? $options['value'] : static::getAttributeValue($model, $attribute);
-		if (!array_key_exists('id', $options)) {
-			$options['id'] = static::getInputId($model, $attribute);
-		}
-		return static::input($type, $name, $value, $options);
-	}
-
-	/**
-	 * Generates a text input tag for the given model attribute.
-	 * This method will generate the "name" and "value" tag attributes automatically for the model attribute
-	 * unless they are explicitly specified in `$options`.
-	 * @param Model $model the model object
-	 * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format
-	 * about attribute expression.
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * @return string the generated input tag
-	 */
-	public static function activeTextInput($model, $attribute, $options = array())
-	{
-		return static::activeInput('text', $model, $attribute, $options);
-	}
-
-	/**
-	 * Generates a hidden input tag for the given model attribute.
-	 * This method will generate the "name" and "value" tag attributes automatically for the model attribute
-	 * unless they are explicitly specified in `$options`.
-	 * @param Model $model the model object
-	 * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format
-	 * about attribute expression.
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * @return string the generated input tag
-	 */
-	public static function activeHiddenInput($model, $attribute, $options = array())
-	{
-		return static::activeInput('hidden', $model, $attribute, $options);
-	}
-
-	/**
-	 * Generates a password input tag for the given model attribute.
-	 * This method will generate the "name" and "value" tag attributes automatically for the model attribute
-	 * unless they are explicitly specified in `$options`.
-	 * @param Model $model the model object
-	 * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format
-	 * about attribute expression.
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * @return string the generated input tag
-	 */
-	public static function activePasswordInput($model, $attribute, $options = array())
-	{
-		return static::activeInput('password', $model, $attribute, $options);
-	}
-
-	/**
-	 * Generates a file input tag for the given model attribute.
-	 * This method will generate the "name" and "value" tag attributes automatically for the model attribute
-	 * unless they are explicitly specified in `$options`.
-	 * @param Model $model the model object
-	 * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format
-	 * about attribute expression.
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * @return string the generated input tag
-	 */
-	public static function activeFileInput($model, $attribute, $options = array())
-	{
-		return static::activeInput('file', $model, $attribute, $options);
-	}
-
-	/**
-	 * Generates a textarea tag for the given model attribute.
-	 * The model attribute value will be used as the content in the textarea.
-	 * @param Model $model the model object
-	 * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format
-	 * about attribute expression.
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * @return string the generated textarea tag
-	 */
-	public static function activeTextarea($model, $attribute, $options = array())
-	{
-		$name = static::getInputName($model, $attribute);
-		$value = static::getAttributeValue($model, $attribute);
-		if (!array_key_exists('id', $options)) {
-			$options['id'] = static::getInputId($model, $attribute);
-		}
-		return static::textarea($name, $value, $options);
-	}
-
-	/**
-	 * Generates a radio button tag for the given model attribute.
-	 * This method will generate the "name" tag attribute automatically unless it is explicitly specified in `$options`.
-	 * This method will generate the "checked" tag attribute according to the model attribute value.
-	 * @param Model $model the model object
-	 * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format
-	 * about attribute expression.
-	 * @param array $options the tag options in terms of name-value pairs. The following options are specially handled:
-	 *
-	 * - uncheck: string, the value associated with the uncheck state of the radio button. If not set,
-	 *   it will take the default value '0'. This method will render a hidden input so that if the radio button
-	 *   is not checked and is submitted, the value of this attribute will still be submitted to the server
-	 *   via the hidden input.
-	 *
-	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will
-	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
-	 *
-	 * @return string the generated radio button tag
-	 */
-	public static function activeRadio($model, $attribute, $options = array())
-	{
-		$name = isset($options['name']) ? $options['name'] : static::getInputName($model, $attribute);
-		$checked = static::getAttributeValue($model, $attribute);
-		if (!array_key_exists('uncheck', $options)) {
-			$options['uncheck'] = '0';
-		}
-		if (!array_key_exists('id', $options)) {
-			$options['id'] = static::getInputId($model, $attribute);
-		}
-		return static::radio($name, $checked, $options);
-	}
-
-	/**
-	 * Generates a checkbox tag for the given model attribute.
-	 * This method will generate the "name" tag attribute automatically unless it is explicitly specified in `$options`.
-	 * This method will generate the "checked" tag attribute according to the model attribute value.
-	 * @param Model $model the model object
-	 * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format
-	 * about attribute expression.
-	 * @param array $options the tag options in terms of name-value pairs. The following options are specially handled:
-	 *
-	 * - uncheck: string, the value associated with the uncheck state of the radio button. If not set,
-	 *   it will take the default value '0'. This method will render a hidden input so that if the radio button
-	 *   is not checked and is submitted, the value of this attribute will still be submitted to the server
-	 *   via the hidden input.
-	 *
-	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will
-	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
-	 *
-	 * @return string the generated checkbox tag
-	 */
-	public static function activeCheckbox($model, $attribute, $options = array())
-	{
-		$name = isset($options['name']) ? $options['name'] : static::getInputName($model, $attribute);
-		$checked = static::getAttributeValue($model, $attribute);
-		if (!array_key_exists('uncheck', $options)) {
-			$options['uncheck'] = '0';
-		}
-		if (!array_key_exists('id', $options)) {
-			$options['id'] = static::getInputId($model, $attribute);
-		}
-		return static::checkbox($name, $checked, $options);
-	}
-
-	/**
-	 * Generates a drop-down list for the given model attribute.
-	 * The selection of the drop-down list is taken from the value of the model attribute.
-	 * @param Model $model the model object
-	 * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format
-	 * about attribute expression.
-	 * @param array $items the option data items. The array keys are option values, and the array values
-	 * are the corresponding option labels. The array can also be nested (i.e. some array values are arrays too).
-	 * For each sub-array, an option group will be generated whose label is the key associated with the sub-array.
-	 * If you have a list of data models, you may convert them into the format described above using
-	 * [[\yii\helpers\ArrayHelper::map()]].
-	 *
-	 * Note, the values and labels will be automatically HTML-encoded by this method, and the blank spaces in
-	 * the labels will also be HTML-encoded.
-	 * @param array $options the tag options in terms of name-value pairs. The following options are specially handled:
-	 *
-	 * - prompt: string, a prompt text to be displayed as the first option;
-	 * - options: array, the attributes for the select option tags. The array keys must be valid option values,
-	 *   and the array values are the extra attributes for the corresponding option tags. For example,
-	 *
-	 * ~~~
-	 * array(
-	 *     'value1' => array('disabled' => true),
-	 *     'value2' => array('label' => 'value 2'),
-	 * );
-	 * ~~~
-	 *
-	 * - groups: array, the attributes for the optgroup tags. The structure of this is similar to that of 'options',
-	 *   except that the array keys represent the optgroup labels specified in $items.
-	 *
-	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will
-	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
-	 *
-	 * @return string the generated drop-down list tag
-	 */
-	public static function activeDropDownList($model, $attribute, $items, $options = array())
-	{
-		$name = isset($options['name']) ? $options['name'] : static::getInputName($model, $attribute);
-		$checked = static::getAttributeValue($model, $attribute);
-		if (!array_key_exists('id', $options)) {
-			$options['id'] = static::getInputId($model, $attribute);
-		}
-		return static::dropDownList($name, $checked, $items, $options);
-	}
-
-	/**
-	 * Generates a list box.
-	 * The selection of the list box is taken from the value of the model attribute.
-	 * @param Model $model the model object
-	 * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format
-	 * about attribute expression.
-	 * @param array $items the option data items. The array keys are option values, and the array values
-	 * are the corresponding option labels. The array can also be nested (i.e. some array values are arrays too).
-	 * For each sub-array, an option group will be generated whose label is the key associated with the sub-array.
-	 * If you have a list of data models, you may convert them into the format described above using
-	 * [[\yii\helpers\ArrayHelper::map()]].
-	 *
-	 * Note, the values and labels will be automatically HTML-encoded by this method, and the blank spaces in
-	 * the labels will also be HTML-encoded.
-	 * @param array $options the tag options in terms of name-value pairs. The following options are specially handled:
-	 *
-	 * - prompt: string, a prompt text to be displayed as the first option;
-	 * - options: array, the attributes for the select option tags. The array keys must be valid option values,
-	 *   and the array values are the extra attributes for the corresponding option tags. For example,
-	 *
-	 * ~~~
-	 * array(
-	 *     'value1' => array('disabled' => true),
-	 *     'value2' => array('label' => 'value 2'),
-	 * );
-	 * ~~~
-	 *
-	 * - groups: array, the attributes for the optgroup tags. The structure of this is similar to that of 'options',
-	 *   except that the array keys represent the optgroup labels specified in $items.
-	 * - unselect: string, the value that will be submitted when no option is selected.
-	 *   When this attribute is set, a hidden field will be generated so that if no option is selected in multiple
-	 *   mode, we can still obtain the posted unselect value.
-	 *
-	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will
-	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
-	 *
-	 * @return string the generated list box tag
-	 */
-	public static function activeListBox($model, $attribute, $items, $options = array())
-	{
-		$name = isset($options['name']) ? $options['name'] : static::getInputName($model, $attribute);
-		$checked = static::getAttributeValue($model, $attribute);
-		if (!array_key_exists('unselect', $options)) {
-			$options['unselect'] = '0';
-		}
-		if (!array_key_exists('id', $options)) {
-			$options['id'] = static::getInputId($model, $attribute);
-		}
-		return static::listBox($name, $checked, $items, $options);
-	}
-
-	/**
-	 * Generates a list of checkboxes.
-	 * A checkbox list allows multiple selection, like [[listBox()]].
-	 * As a result, the corresponding submitted value is an array.
-	 * The selection of the checkbox list is taken from the value of the model attribute.
-	 * @param Model $model the model object
-	 * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format
-	 * about attribute expression.
-	 * @param array $items the data item used to generate the checkboxes.
-	 * The array keys are the labels, while the array values are the corresponding checkbox values.
-	 * Note that the labels will NOT be HTML-encoded, while the values will.
-	 * @param array $options options (name => config) for the checkbox list. The following options are specially handled:
-	 *
-	 * - unselect: string, the value that should be submitted when none of the checkboxes is selected.
-	 *   By setting this option, a hidden input will be generated.
-	 * - separator: string, the HTML code that separates items.
-	 * - item: callable, a callback that can be used to customize the generation of the HTML code
-	 *   corresponding to a single item in $items. The signature of this callback must be:
-	 *
-	 * ~~~
-	 * function ($index, $label, $name, $checked, $value)
-	 * ~~~
-	 *
-	 * where $index is the zero-based index of the checkbox in the whole list; $label
-	 * is the label for the checkbox; and $name, $value and $checked represent the name,
-	 * value and the checked status of the checkbox input.
-	 * @return string the generated checkbox list
-	 */
-	public static function activeCheckboxList($model, $attribute, $items, $options = array())
-	{
-		$name = isset($options['name']) ? $options['name'] : static::getInputName($model, $attribute);
-		$checked = static::getAttributeValue($model, $attribute);
-		if (!array_key_exists('unselect', $options)) {
-			$options['unselect'] = '0';
-		}
-		return static::checkboxList($name, $checked, $items, $options);
-	}
-
-	/**
-	 * Generates a list of radio buttons.
-	 * A radio button list is like a checkbox list, except that it only allows single selection.
-	 * The selection of the radio buttons is taken from the value of the model attribute.
-	 * @param Model $model the model object
-	 * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format
-	 * about attribute expression.
-	 * @param array $items the data item used to generate the radio buttons.
-	 * The array keys are the labels, while the array values are the corresponding radio button values.
-	 * Note that the labels will NOT be HTML-encoded, while the values will.
-	 * @param array $options options (name => config) for the radio button list. The following options are specially handled:
-	 *
-	 * - unselect: string, the value that should be submitted when none of the radio buttons is selected.
-	 *   By setting this option, a hidden input will be generated.
-	 * - separator: string, the HTML code that separates items.
-	 * - item: callable, a callback that can be used to customize the generation of the HTML code
-	 *   corresponding to a single item in $items. The signature of this callback must be:
-	 *
-	 * ~~~
-	 * function ($index, $label, $name, $checked, $value)
-	 * ~~~
-	 *
-	 * where $index is the zero-based index of the radio button in the whole list; $label
-	 * is the label for the radio button; and $name, $value and $checked represent the name,
-	 * value and the checked status of the radio button input.
-	 * @return string the generated radio button list
-	 */
-	public static function activeRadioList($model, $attribute, $items, $options = array())
-	{
-		$name = isset($options['name']) ? $options['name'] : static::getInputName($model, $attribute);
-		$checked = static::getAttributeValue($model, $attribute);
-		if (!array_key_exists('unselect', $options)) {
-			$options['unselect'] = '0';
-		}
-		return static::radioList($name, $checked, $items, $options);
-	}
-
-	/**
-	 * Renders the option tags that can be used by [[dropDownList()]] and [[listBox()]].
-	 * @param string|array $selection the selected value(s). This can be either a string for single selection
-	 * or an array for multiple selections.
-	 * @param array $items the option data items. The array keys are option values, and the array values
-	 * are the corresponding option labels. The array can also be nested (i.e. some array values are arrays too).
-	 * For each sub-array, an option group will be generated whose label is the key associated with the sub-array.
-	 * If you have a list of data models, you may convert them into the format described above using
-	 * [[\yii\helpers\ArrayHelper::map()]].
-	 *
-	 * Note, the values and labels will be automatically HTML-encoded by this method, and the blank spaces in
-	 * the labels will also be HTML-encoded.
-	 * @param array $tagOptions the $options parameter that is passed to the [[dropDownList()]] or [[listBox()]] call.
-	 * This method will take out these elements, if any: "prompt", "options" and "groups". See more details
-	 * in [[dropDownList()]] for the explanation of these elements.
-	 *
-	 * @return string the generated list options
-	 */
-	public static function renderSelectOptions($selection, $items, &$tagOptions = array())
-	{
-		$lines = array();
-		if (isset($tagOptions['prompt'])) {
-			$prompt = str_replace(' ', '&nbsp;', static::encode($tagOptions['prompt']));
-			$lines[] = static::tag('option', $prompt, array('value' => ''));
-		}
-
-		$options = isset($tagOptions['options']) ? $tagOptions['options'] : array();
-		$groups = isset($tagOptions['groups']) ? $tagOptions['groups'] : array();
-		unset($tagOptions['prompt'], $tagOptions['options'], $tagOptions['groups']);
-
-		foreach ($items as $key => $value) {
-			if (is_array($value)) {
-				$groupAttrs = isset($groups[$key]) ? $groups[$key] : array();
-				$groupAttrs['label'] = $key;
-				$attrs = array('options' => $options, 'groups' => $groups);
-				$content = static::renderSelectOptions($selection, $value, $attrs);
-				$lines[] = static::tag('optgroup', "\n" . $content . "\n", $groupAttrs);
-			} else {
-				$attrs = isset($options[$key]) ? $options[$key] : array();
-				$attrs['value'] = $key;
-				$attrs['selected'] = $selection !== null &&
-					(!is_array($selection) && !strcmp($key, $selection)
-						|| is_array($selection) && in_array($key, $selection));
-				$lines[] = static::tag('option', str_replace(' ', '&nbsp;', static::encode($value)), $attrs);
-			}
-		}
-
-		return implode("\n", $lines);
-	}
-
-	/**
-	 * Renders the HTML tag attributes.
-	 * Boolean attributes such as s 'checked', 'disabled', 'readonly', will be handled specially
-	 * according to [[booleanAttributes]] and [[showBooleanAttributeValues]].
-	 * @param array $attributes attributes to be rendered. The attribute values will be HTML-encoded using [[encode()]].
-	 * Attributes whose value is null will be ignored and not put in the rendering result.
-	 * @return string the rendering result. If the attributes are not empty, they will be rendered
-	 * into a string with a leading white space (such that it can be directly appended to the tag name
-	 * in a tag. If there is no attribute, an empty string will be returned.
-	 */
-	public static function renderTagAttributes($attributes)
-	{
-		if (count($attributes) > 1) {
-			$sorted = array();
-			foreach (static::$attributeOrder as $name) {
-				if (isset($attributes[$name])) {
-					$sorted[$name] = $attributes[$name];
-				}
-			}
-			$attributes = array_merge($sorted, $attributes);
-		}
-
-		$html = '';
-		foreach ($attributes as $name => $value) {
-			if (isset(static::$booleanAttributes[strtolower($name)])) {
-				if ($value || strcasecmp($name, $value) === 0) {
-					$html .= static::$showBooleanAttributeValues ? " $name=\"$name\"" : " $name";
-				}
-			} elseif ($value !== null) {
-				$html .= " $name=\"" . static::encode($value) . '"';
-			}
-		}
-		return $html;
-	}
-
-	/**
-	 * Normalizes the input parameter to be a valid URL.
-	 *
-	 * If the input parameter
-	 *
-	 * - is an empty string: the currently requested URL will be returned;
-	 * - is a non-empty string: it will first be processed by [[Yii::getAlias()]]. If the result
-	 *   is an absolute URL, it will be returned with any change further; Otherwise, the result
-	 *   will be prefixed with [[\yii\web\Request::baseUrl]] and returned.
-	 * - is an array: the first array element is considered a route, while the rest of the name-value
-	 *   pairs are treated as the parameters to be used for URL creation using [[\yii\web\Controller::createUrl()]].
-	 *   For example: `array('post/index', 'page' => 2)`, `array('index')`.
-	 *
-	 * @param array|string $url the parameter to be used to generate a valid URL
-	 * @return string the normalized URL
-	 * @throws InvalidParamException if the parameter is invalid.
-	 */
-	public static function url($url)
-	{
-		if (is_array($url)) {
-			if (isset($url[0])) {
-				$route = $url[0];
-				$params = array_splice($url, 1);
-				if (Yii::$app->controller !== null) {
-					return Yii::$app->controller->createUrl($route, $params);
-				} else {
-					return Yii::$app->getUrlManager()->createUrl($route, $params);
-				}
-			} else {
-				throw new InvalidParamException('The array specifying a URL must contain at least one element.');
-			}
-		} elseif ($url === '') {
-			return Yii::$app->getRequest()->getUrl();
-		} else {
-			$url = Yii::getAlias($url);
-			if ($url[0] === '/' || strpos($url, '://')) {
-				return $url;
-			} else {
-				return Yii::$app->getRequest()->getBaseUrl() . '/' . $url;
-			}
-		}
-	}
-
-	/**
-	 * Returns the real attribute name from the given attribute expression.
-	 *
-	 * An attribute expression is an attribute name prefixed and/or suffixed with array indexes.
-	 * It is mainly used in tabular data input and/or input of array type. Below are some examples:
-	 *
-	 * - `[0]content` is used in tabular data input to represent the "content" attribute
-	 *   for the first model in tabular input;
-	 * - `dates[0]` represents the first array element of the "dates" attribute;
-	 * - `[0]dates[0]` represents the first array element of the "dates" attribute
-	 *   for the first model in tabular input.
-	 *
-	 * If `$attribute` has neither prefix nor suffix, it will be returned back without change.
-	 * @param string $attribute the attribute name or expression
-	 * @return string the attribute name without prefix and suffix.
-	 * @throws InvalidParamException if the attribute name contains non-word characters.
-	 */
-	public static function getAttributeName($attribute)
-	{
-		if (preg_match('/(^|.*\])(\w+)(\[.*|$)/', $attribute, $matches)) {
-			return $matches[2];
-		} else {
-			throw new InvalidParamException('Attribute name must contain word characters only.');
-		}
-	}
-
-	/**
-	 * Returns the value of the specified attribute name or expression.
-	 *
-	 * For an attribute expression like `[0]dates[0]`, this method will return the value of `$model->dates[0]`.
-	 * See [[getAttributeName()]] for more details about attribute expression.
-	 *
-	 * @param Model $model the model object
-	 * @param string $attribute the attribute name or expression
-	 * @return mixed the corresponding attribute value
-	 * @throws InvalidParamException if the attribute name contains non-word characters.
-	 */
-	public static function getAttributeValue($model, $attribute)
-	{
-		if (!preg_match('/(^|.*\])(\w+)(\[.*|$)/', $attribute, $matches)) {
-			throw new InvalidParamException('Attribute name must contain word characters only.');
-		}
-		$attribute = $matches[2];
-		$index = $matches[3];
-		if ($index === '') {
-			return $model->$attribute;
-		} else {
-			$value = $model->$attribute;
-			foreach (explode('][', trim($index, '[]')) as $id) {
-				if ((is_array($value) || $value instanceof \ArrayAccess) && isset($value[$id])) {
-					$value = $value[$id];
-				} else {
-					return null;
-				}
-			}
-			return $value;
-		}
-	}
-
-	/**
-	 * Generates an appropriate input name for the specified attribute name or expression.
-	 *
-	 * This method generates a name that can be used as the input name to collect user input
-	 * for the specified attribute. The name is generated according to the [[Model::formName|form name]]
-	 * of the model and the given attribute name. For example, if the form name of the `Post` model
-	 * is `Post`, then the input name generated for the `content` attribute would be `Post[content]`.
-	 *
-	 * See [[getAttributeName()]] for explanation of attribute expression.
-	 *
-	 * @param Model $model the model object
-	 * @param string $attribute the attribute name or expression
-	 * @return string the generated input name
-	 * @throws InvalidParamException if the attribute name contains non-word characters.
-	 */
-	public static function getInputName($model, $attribute)
-	{
-		$formName = $model->formName();
-		if (!preg_match('/(^|.*\])(\w+)(\[.*|$)/', $attribute, $matches)) {
-			throw new InvalidParamException('Attribute name must contain word characters only.');
-		}
-		$prefix = $matches[1];
-		$attribute = $matches[2];
-		$suffix = $matches[3];
-		if ($formName === '' && $prefix === '') {
-			return $attribute . $suffix;
-		} elseif ($formName !== '') {
-			return $formName . $prefix . "[$attribute]" . $suffix;
-		} else {
-			throw new InvalidParamException(get_class($model) . '::formName() cannot be empty for tabular inputs.');
-		}
-	}
-
-	/**
-	 * Generates an appropriate input ID for the specified attribute name or expression.
-	 *
-	 * This method converts the result [[getInputName()]] into a valid input ID.
-	 * For example, [[getInputName()]] returns `Post[content]`, this method will return `Post-method`.
-	 * @param Model $model the model object
-	 * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for explanation of attribute expression.
-	 * @return string the generated input ID
-	 * @throws InvalidParamException if the attribute name contains non-word characters.
-	 */
-	public static function getInputId($model, $attribute)
-	{
-		$name = strtolower(static::getInputName($model, $attribute));
-		return str_replace(array('[]', '][', '[', ']', ' '), array('', '-', '-', '', '-'), $name);
-	}
-
-}
diff --git a/framework/helpers/base/Json.php b/framework/helpers/base/Json.php
deleted file mode 100644
index 8de55f9..0000000
--- a/framework/helpers/base/Json.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\helpers\base;
-
-use yii\base\InvalidParamException;
-use yii\web\JsExpression;
-
-/**
- * Json is a helper class providing JSON data encoding and decoding.
- * It enhances the PHP built-in functions `json_encode()` and `json_decode()`
- * by supporting encoding JavaScript expressions and throwing exceptions when decoding fails.
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Json
-{
-	/**
-	 * Encodes the given value into a JSON string.
-	 * The method enhances `json_encode()` by supporting JavaScript expressions.
-	 * In particular, the method will not encode a JavaScript expression that is
-	 * represented in terms of a [[JsExpression]] object.
-	 * @param mixed $value the data to be encoded
-	 * @param integer $options the encoding options. For more details please refer to
-	 * [[http://www.php.net/manual/en/function.json-encode.php]]
-	 * @return string the encoding result
-	 */
-	public static function encode($value, $options = 0)
-	{
-		$expressions = array();
-		$value = static::processData($value, $expressions);
-		$json = json_encode($value, $options);
-		return empty($expressions) ? $json : strtr($json, $expressions);
-	}
-
-	/**
-	 * Decodes the given JSON string into a PHP data structure.
-	 * @param string $json the JSON string to be decoded
-	 * @param boolean $asArray whether to return objects in terms of associative arrays.
-	 * @return mixed the PHP data
-	 * @throws InvalidParamException if there is any decoding error
-	 */
-	public static function decode($json, $asArray = true)
-	{
-		if (is_array($json)) {
-			throw new InvalidParamException('Invalid JSON data.');
-		}
-		$decode = json_decode((string)$json, $asArray);
-		switch (json_last_error()) {
-			case JSON_ERROR_NONE:
-				break;
-			case JSON_ERROR_DEPTH:
-				throw new InvalidParamException('The maximum stack depth has been exceeded.');
-			case JSON_ERROR_CTRL_CHAR:
-				throw new InvalidParamException('Control character error, possibly incorrectly encoded.');
-			case JSON_ERROR_SYNTAX:
-				throw new InvalidParamException('Syntax error.');
-			case JSON_ERROR_STATE_MISMATCH:
-				throw new InvalidParamException('Invalid or malformed JSON.');
-			case JSON_ERROR_UTF8:
-				throw new InvalidParamException('Malformed UTF-8 characters, possibly incorrectly encoded.');
-			default:
-				throw new InvalidParamException('Unknown JSON decoding error.');
-		}
-
-		return $decode;
-	}
-
-	/**
-	 * Pre-processes the data before sending it to `json_encode()`.
-	 * @param mixed $data the data to be processed
-	 * @param array $expressions collection of JavaScript expressions
-	 * @return mixed the processed data
-	 */
-	protected static function processData($data, &$expressions)
-	{
-		if (is_array($data)) {
-			foreach ($data as $key => $value) {
-				if (is_array($value) || is_object($value)) {
-					$data[$key] = static::processData($value, $expressions);
-				}
-			}
-			return $data;
-		} elseif (is_object($data)) {
-			if ($data instanceof JsExpression) {
-				$token = '!{[' . count($expressions) . ']}!';
-				$expressions['"' . $token . '"'] = $data->expression;
-				return $token;
-			}
-			$result = array();
-			foreach ($data as $key => $value) {
-				if (is_array($value) || is_object($value)) {
-					$result[$key] = static::processData($value, $expressions);
-				} else {
-					$result[$key] = $value;
-				}
-			}
-			return $result;
-		} else {
-			return $data;
-		}
-	}
-}
diff --git a/framework/helpers/base/Markdown.php b/framework/helpers/base/Markdown.php
deleted file mode 100644
index 1efdccb..0000000
--- a/framework/helpers/base/Markdown.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @link http://www.yiiframework.com/
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\helpers\base;
-
-use Michelf\MarkdownExtra;
-
-/**
- * Markdown provides an ability to transform markdown into HTML.
- *
- * Basic usage is the following:
- *
- * ```php
- * $myHtml = Markdown::process($myText);
- * ```
- *
- * If you want to configure the parser:
- *
- * ```php
- * $myHtml = Markdown::process($myText, array(
- *     'fn_id_prefix' => 'footnote_',
- * ));
- * ```
- *
- * For more details please refer to [PHP Markdown library documentation](http://michelf.ca/projects/php-markdown/).
- * @author Alexander Makarov <sam@rmcreative.ru>
- * @since 2.0
- */
-class Markdown
-{
-	/**
-	 * @var MarkdownExtra
-	 */
-	protected static $markdown;
-
-	public static function process($content, $config = array())
-	{
-		if (static::$markdown===null) {
-			static::$markdown = new MarkdownExtra();
-		}
-		foreach ($config as $name => $value) {
-			static::$markdown->{$name} = $value;
-		}
-		return static::$markdown->transform($content);
-	}
-}
diff --git a/framework/helpers/base/Purifier.php b/framework/helpers/base/Purifier.php
deleted file mode 100644
index 2c5d334..0000000
--- a/framework/helpers/base/Purifier.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @link http://www.yiiframework.com/
- * @license http://www.yiiframework.com/license/
- */
-namespace yii\helpers\base;
-
-/**
- * Purifier provides an ability to clean up HTML from any harmful code.
- *
- * Basic usage is the following:
- *
- * ```php
- * $my_html = Purifier::process($my_text);
- * ```
- *
- * If you want to configure it:
- *
- * ```php
- * $my_html = Purifier::process($my_text, array(
- *     'Attr.EnableID' => true,
- * ));
- * ```
- *
- * For more details please refer to HTMLPurifier documentation](http://htmlpurifier.org/).
- *
- * @author Alexander Makarov <sam@rmcreative.ru>
- * @since 2.0
- */
-class Purifier
-{
-	public static function process($content, $config = null)
-	{
-		$purifier=\HTMLPurifier::instance($config);
-		$purifier->config->set('Cache.SerializerPath', \Yii::$app->getRuntimePath());
-		return $purifier->purify($content);
-	}
-}
diff --git a/framework/helpers/base/SecurityHelper.php b/framework/helpers/base/SecurityHelper.php
deleted file mode 100644
index 3f69fee..0000000
--- a/framework/helpers/base/SecurityHelper.php
+++ /dev/null
@@ -1,275 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\helpers\base;
-
-use Yii;
-use yii\base\Exception;
-use yii\base\InvalidConfigException;
-use yii\base\InvalidParamException;
-
-/**
- * SecurityHelper provides a set of methods to handle common security-related tasks.
- *
- * In particular, SecurityHelper supports the following features:
- *
- * - Encryption/decryption: [[encrypt()]] and [[decrypt()]]
- * - Data tampering prevention: [[hashData()]] and [[validateData()]]
- * - Password validation: [[generatePasswordHash()]] and [[validatePassword()]]
- *
- * Additionally, SecurityHelper provides [[getSecretKey()]] to support generating
- * named secret keys. These secret keys, once generated, will be stored in a file
- * and made available in future requests.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @author Tom Worster <fsb@thefsb.org>
- * @since 2.0
- */
-class SecurityHelper
-{
-	/**
-	 * Encrypts data.
-	 * @param string $data data to be encrypted.
-	 * @param string $key the encryption secret key
-	 * @return string the encrypted data
-	 * @throws Exception if PHP Mcrypt extension is not loaded or failed to be initialized
-	 * @see decrypt()
-	 */
-	public static function encrypt($data, $key)
-	{
-		$module = static::openCryptModule();
-		// 192-bit (24 bytes) key size
-		$key = StringHelper::substr($key, 0, 24);
-		srand();
-		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($module), MCRYPT_RAND);
-		mcrypt_generic_init($module, $key, $iv);
-		$encrypted = $iv . mcrypt_generic($module, $data);
-		mcrypt_generic_deinit($module);
-		mcrypt_module_close($module);
-		return $encrypted;
-	}
-
-	/**
-	 * Decrypts data
-	 * @param string $data data to be decrypted.
-	 * @param string $key the decryption secret key
-	 * @return string the decrypted data
-	 * @throws Exception if PHP Mcrypt extension is not loaded or failed to be initialized
-	 * @see encrypt()
-	 */
-	public static function decrypt($data, $key)
-	{
-		$module = static::openCryptModule();
-		// 192-bit (24 bytes) key size
-		$key = StringHelper::substr($key, 0, 24);
-		$ivSize = mcrypt_enc_get_iv_size($module);
-		$iv = StringHelper::substr($data, 0, $ivSize);
-		mcrypt_generic_init($module, $key, $iv);
-		$decrypted = mdecrypt_generic($module, StringHelper::substr($data, $ivSize, StringHelper::strlen($data)));
-		mcrypt_generic_deinit($module);
-		mcrypt_module_close($module);
-		return rtrim($decrypted, "\0");
-	}
-
-	/**
-	 * Prefixes data with a keyed hash value so that it can later be detected if it is tampered.
-	 * @param string $data the data to be protected
-	 * @param string $key the secret key to be used for generating hash
-	 * @param string $algorithm the hashing algorithm (e.g. "md5", "sha1", "sha256", etc.). Call PHP "hash_algos()"
-	 * function to see the supported hashing algorithms on your system.
-	 * @return string the data prefixed with the keyed hash
-	 * @see validateData()
-	 * @see getSecretKey()
-	 */
-	public static function hashData($data, $key, $algorithm = 'sha256')
-	{
-		return hash_hmac($algorithm, $data, $key) . $data;
-	}
-
-	/**
-	 * Validates if the given data is tampered.
-	 * @param string $data the data to be validated. The data must be previously
-	 * generated by [[hashData()]].
-	 * @param string $key the secret key that was previously used to generate the hash for the data in [[hashData()]].
-	 * @param string $algorithm the hashing algorithm (e.g. "md5", "sha1", "sha256", etc.). Call PHP "hash_algos()"
-	 * function to see the supported hashing algorithms on your system. This must be the same
-	 * as the value passed to [[hashData()]] when generating the hash for the data.
-	 * @return string the real data with the hash stripped off. False if the data is tampered.
-	 * @see hashData()
-	 */
-	public static function validateData($data, $key, $algorithm = 'sha256')
-	{
-		$hashSize = StringHelper::strlen(hash_hmac($algorithm, 'test', $key));
-		$n = StringHelper::strlen($data);
-		if ($n >= $hashSize) {
-			$hash = StringHelper::substr($data, 0, $hashSize);
-			$data2 = StringHelper::substr($data, $hashSize, $n - $hashSize);
-			return $hash === hash_hmac($algorithm, $data2, $key) ? $data2 : false;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Returns a secret key associated with the specified name.
-	 * If the secret key does not exist, a random key will be generated
-	 * and saved in the file "keys.php" under the application's runtime directory
-	 * so that the same secret key can be returned in future requests.
-	 * @param string $name the name that is associated with the secret key
-	 * @param integer $length the length of the key that should be generated if not exists
-	 * @return string the secret key associated with the specified name
-	 */
-	public static function getSecretKey($name, $length = 32)
-	{
-		static $keys;
-		$keyFile = Yii::$app->getRuntimePath() . '/keys.php';
-		if ($keys === null) {
-			$keys = is_file($keyFile) ? require($keyFile) : array();
-		}
-		if (!isset($keys[$name])) {
-			// generate a 32-char random key
-			$chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-			$keys[$name] = substr(str_shuffle(str_repeat($chars, 5)), 0, $length);
-			file_put_contents($keyFile, "<?php\nreturn " . var_export($keys, true) . ";\n");
-		}
-		return $keys[$name];
-	}
-
-	/**
-	 * Opens the mcrypt module.
-	 * @return resource the mcrypt module handle.
-	 * @throws InvalidConfigException if mcrypt extension is not installed
-	 * @throws Exception if mcrypt initialization fails
-	 */
-	protected static function openCryptModule()
-	{
-		if (!extension_loaded('mcrypt')) {
-			throw new InvalidConfigException('The mcrypt PHP extension is not installed.');
-		}
-		// AES uses a 128-bit block size
-		$module = @mcrypt_module_open('rijndael-128', '', 'cbc', '');
-		if ($module === false) {
-			throw new Exception('Failed to initialize the mcrypt module.');
-		}
-		return $module;
-	}
-
-	/**
-	 * Generates a secure hash from a password and a random salt.
-	 *
-	 * The generated hash can be stored in database (e.g. `CHAR(64) CHARACTER SET latin1` on MySQL).
-	 * Later when a password needs to be validated, the hash can be fetched and passed
-	 * to [[validatePassword()]]. For example,
-	 *
-	 * ~~~
-	 * // generates the hash (usually done during user registration or when the password is changed)
-	 * $hash = SecurityHelper::generatePasswordHash($password);
-	 * // ...save $hash in database...
-	 *
-	 * // during login, validate if the password entered is correct using $hash fetched from database
-	 * if (SecurityHelper::verifyPassword($password, $hash) {
-	 *     // password is good
-	 * } else {
-	 *     // password is bad
-	 * }
-	 * ~~~
-	 *
-	 * @param string $password The password to be hashed.
-	 * @param integer $cost Cost parameter used by the Blowfish hash algorithm.
-	 * The higher the value of cost,
-	 * the longer it takes to generate the hash and to verify a password against it. Higher cost
-	 * therefore slows down a brute-force attack. For best protection against brute for attacks,
-	 * set it to the highest value that is tolerable on production servers. The time taken to
-	 * compute the hash doubles for every increment by one of $cost. So, for example, if the
-	 * hash takes 1 second to compute when $cost is 14 then then the compute time varies as
-	 * 2^($cost - 14) seconds.
-	 * @throws Exception on bad password parameter or cost parameter
-	 * @return string The password hash string, ASCII and not longer than 64 characters.
-	 * @see validatePassword()
-	 */
-	public static function generatePasswordHash($password, $cost = 13)
-	{
-		$salt = static::generateSalt($cost);
-		$hash = crypt($password, $salt);
-
-		if (!is_string($hash) || strlen($hash) < 32) {
-			throw new Exception('Unknown error occurred while generating hash.');
-		}
-
-		return $hash;
-	}
-
-	/**
-	 * Verifies a password against a hash.
-	 * @param string $password The password to verify.
-	 * @param string $hash The hash to verify the password against.
-	 * @return boolean whether the password is correct.
-	 * @throws InvalidParamException on bad password or hash parameters or if crypt() with Blowfish hash is not available.
-	 * @see generatePasswordHash()
-	 */
-	public static function validatePassword($password, $hash)
-	{
-		if (!is_string($password) || $password === '') {
-			throw new InvalidParamException('Password must be a string and cannot be empty.');
-		}
-
-		if (!preg_match('/^\$2[axy]\$(\d\d)\$[\.\/0-9A-Za-z]{22}/', $hash, $matches) || $matches[1] < 4 || $matches[1] > 30) {
-			throw new InvalidParamException('Hash is invalid.');
-		}
-
-		$test = crypt($password, $hash);
-		$n = strlen($test);
-		if (strlen($test) < 32 || $n !== strlen($hash)) {
-			return false;
-		}
-
-		// Use a for-loop to compare two strings to prevent timing attacks. See:
-		// http://codereview.stackexchange.com/questions/13512
-		$check = 0;
-		for ($i = 0; $i < $n; ++$i) {
-			$check |= (ord($test[$i]) ^ ord($hash[$i]));
-		}
-
-		return $check === 0;
-	}
-
-	/**
-	 * Generates a salt that can be used to generate a password hash.
-	 *
-	 * The PHP [crypt()](http://php.net/manual/en/function.crypt.php) built-in function
-	 * requires, for the Blowfish hash algorithm, a salt string in a specific format:
-	 * "$2a$", "$2x$" or "$2y$", a two digit cost parameter, "$", and 22 characters
-	 * from the alphabet "./0-9A-Za-z".
-	 *
-	 * @param integer $cost the cost parameter
-	 * @return string the random salt value.
-	 * @throws InvalidParamException if the cost parameter is not between 4 and 30
-	 */
-	protected static function generateSalt($cost = 13)
-	{
-		$cost = (int)$cost;
-		if ($cost < 4 || $cost > 30) {
-			throw new InvalidParamException('Cost must be between 4 and 31.');
-		}
-
-		// Get 20 * 8bits of pseudo-random entropy from mt_rand().
-		$rand = '';
-		for ($i = 0; $i < 20; ++$i) {
-			$rand .= chr(mt_rand(0, 255));
-		}
-
-		// Add the microtime for a little more entropy.
-		$rand .= microtime();
-		// Mix the bits cryptographically into a 20-byte binary string.
-		$rand = sha1($rand, true);
-		// Form the prefix that specifies Blowfish algorithm and cost parameter.
-		$salt = sprintf("$2y$%02d$", $cost);
-		// Append the random salt data in the required base64 format.
-		$salt .= str_replace('+', '.', substr(base64_encode($rand), 0, 22));
-		return $salt;
-	}
-}
diff --git a/framework/helpers/base/StringHelper.php b/framework/helpers/base/StringHelper.php
deleted file mode 100644
index 646bcbb..0000000
--- a/framework/helpers/base/StringHelper.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\helpers\base;
-
-/**
- * StringHelper
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @author Alex Makarov <sam@rmcreative.ru>
- * @since 2.0
- */
-class StringHelper
-{
-	/**
-	 * Returns the number of bytes in the given string.
-	 * This method ensures the string is treated as a byte array.
-	 * It will use `mb_strlen()` if it is available.
-	 * @param string $string the string being measured for length
-	 * @return integer the number of bytes in the given string.
-	 */
-	public static function strlen($string)
-	{
-		return function_exists('mb_strlen') ? mb_strlen($string, '8bit') : strlen($string);
-	}
-
-	/**
-	 * Returns the portion of string specified by the start and length parameters.
-	 * This method ensures the string is treated as a byte array.
-	 * It will use `mb_substr()` if it is available.
-	 * @param string $string the input string. Must be one character or longer.
-	 * @param integer $start the starting position
-	 * @param integer $length the desired portion length
-	 * @return string the extracted part of string, or FALSE on failure or an empty string.
-	 * @see http://www.php.net/manual/en/function.substr.php
-	 */
-	public static function substr($string, $start, $length)
-	{
-		return function_exists('mb_substr') ? mb_substr($string, $start, $length, '8bit') : substr($string, $start, $length);
-	}
-
-	/**
-	 * Returns the trailing name component of a path.
-	 * This method does the same as the php function basename() except that it will
-	 * always use \ and / as directory separators, independent of the operating system.
-	 * Note: basename() operates naively on the input string, and is not aware of the
-	 * actual filesystem, or path components such as "..".
-	 * @param string $path A path string.
-	 * @param string $suffix If the name component ends in suffix this will also be cut off.
-	 * @return string the trailing name component of the given path.
-	 * @see http://www.php.net/manual/en/function.basename.php
-	 */
-	public static function basename($path, $suffix = '')
-	{
-		if (($len = mb_strlen($suffix)) > 0 && mb_substr($path, -$len) == $suffix) {
-			$path = mb_substr($path, 0, -$len);
-		}
-		$path = rtrim(str_replace('\\', '/', $path), '/\\');
-		if (($pos = mb_strrpos($path, '/')) !== false) {
-			return mb_substr($path, $pos + 1);
-		}
-		return $path;
-	}
-
-	/**
-	 * Converts a word to its plural form.
-	 * Note that this is for English only!
-	 * For example, 'apple' will become 'apples', and 'child' will become 'children'.
-	 * @param string $name the word to be pluralized
-	 * @return string the pluralized word
-	 */
-	public static function pluralize($name)
-	{
-		static $rules = array(
-			'/(m)ove$/i' => '\1oves',
-			'/(f)oot$/i' => '\1eet',
-			'/(c)hild$/i' => '\1hildren',
-			'/(h)uman$/i' => '\1umans',
-			'/(m)an$/i' => '\1en',
-			'/(s)taff$/i' => '\1taff',
-			'/(t)ooth$/i' => '\1eeth',
-			'/(p)erson$/i' => '\1eople',
-			'/([m|l])ouse$/i' => '\1ice',
-			'/(x|ch|ss|sh|us|as|is|os)$/i' => '\1es',
-			'/([^aeiouy]|qu)y$/i' => '\1ies',
-			'/(?:([^f])fe|([lr])f)$/i' => '\1\2ves',
-			'/(shea|lea|loa|thie)f$/i' => '\1ves',
-			'/([ti])um$/i' => '\1a',
-			'/(tomat|potat|ech|her|vet)o$/i' => '\1oes',
-			'/(bu)s$/i' => '\1ses',
-			'/(ax|test)is$/i' => '\1es',
-			'/s$/' => 's',
-		);
-		foreach ($rules as $rule => $replacement) {
-			if (preg_match($rule, $name)) {
-				return preg_replace($rule, $replacement, $name);
-			}
-		}
-		return $name . 's';
-	}
-
-	/**
-	 * Converts a CamelCase name into space-separated words.
-	 * For example, 'PostTag' will be converted to 'Post Tag'.
-	 * @param string $name the string to be converted
-	 * @param boolean $ucwords whether to capitalize the first letter in each word
-	 * @return string the resulting words
-	 */
-	public static function camel2words($name, $ucwords = true)
-	{
-		$label = trim(strtolower(str_replace(array('-', '_', '.'), ' ', preg_replace('/(?<![A-Z])[A-Z]/', ' \0', $name))));
-		return $ucwords ? ucwords($label) : $label;
-	}
-
-	/**
-	 * Converts a CamelCase name into an ID in lowercase.
-	 * Words in the ID may be concatenated using the specified character (defaults to '-').
-	 * For example, 'PostTag' will be converted to 'post-tag'.
-	 * @param string $name the string to be converted
-	 * @param string $separator the character used to concatenate the words in the ID
-	 * @return string the resulting ID
-	 */
-	public static function camel2id($name, $separator = '-')
-	{
-		if ($separator === '_') {
-			return trim(strtolower(preg_replace('/(?<![A-Z])[A-Z]/', '_\0', $name)), '_');
-		} else {
-			return trim(strtolower(str_replace('_', $separator, preg_replace('/(?<![A-Z])[A-Z]/', $separator . '\0', $name))), $separator);
-		}
-	}
-
-	/**
-	 * Converts an ID into a CamelCase name.
-	 * Words in the ID separated by `$separator` (defaults to '-') will be concatenated into a CamelCase name.
-	 * For example, 'post-tag' is converted to 'PostTag'.
-	 * @param string $id the ID to be converted
-	 * @param string $separator the character used to separate the words in the ID
-	 * @return string the resulting CamelCase name
-	 */
-	public static function id2camel($id, $separator = '-')
-	{
-		return str_replace(' ', '', ucwords(implode(' ', explode($separator, $id))));
-	}
-}
diff --git a/framework/helpers/base/VarDumper.php b/framework/helpers/base/VarDumper.php
deleted file mode 100644
index 730aafe..0000000
--- a/framework/helpers/base/VarDumper.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/**
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\helpers\base;
-
-/**
- * VarDumper is intended to replace the buggy PHP function var_dump and print_r.
- * It can correctly identify the recursively referenced objects in a complex
- * object structure. It also has a recursive depth control to avoid indefinite
- * recursive display of some peculiar variables.
- *
- * VarDumper can be used as follows,
- *
- * ~~~
- * VarDumper::dump($var);
- * ~~~
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class VarDumper
-{
-	private static $_objects;
-	private static $_output;
-	private static $_depth;
-
-	/**
-	 * Displays a variable.
-	 * This method achieves the similar functionality as var_dump and print_r
-	 * but is more robust when handling complex objects such as Yii controllers.
-	 * @param mixed $var variable to be dumped
-	 * @param integer $depth maximum depth that the dumper should go into the variable. Defaults to 10.
-	 * @param boolean $highlight whether the result should be syntax-highlighted
-	 */
-	public static function dump($var, $depth = 10, $highlight = false)
-	{
-		echo static::dumpAsString($var, $depth, $highlight);
-	}
-
-	/**
-	 * Dumps a variable in terms of a string.
-	 * This method achieves the similar functionality as var_dump and print_r
-	 * but is more robust when handling complex objects such as Yii controllers.
-	 * @param mixed $var variable to be dumped
-	 * @param integer $depth maximum depth that the dumper should go into the variable. Defaults to 10.
-	 * @param boolean $highlight whether the result should be syntax-highlighted
-	 * @return string the string representation of the variable
-	 */
-	public static function dumpAsString($var, $depth = 10, $highlight = false)
-	{
-		self::$_output = '';
-		self::$_objects = array();
-		self::$_depth = $depth;
-		self::dumpInternal($var, 0);
-		if ($highlight) {
-			$result = highlight_string("<?php\n" . self::$_output, true);
-			self::$_output = preg_replace('/&lt;\\?php<br \\/>/', '', $result, 1);
-		}
-		return self::$_output;
-	}
-
-	/**
-	 * @param mixed $var variable to be dumped
-	 * @param integer $level depth level
-	 */
-	private static function dumpInternal($var, $level)
-	{
-		switch (gettype($var)) {
-			case 'boolean':
-				self::$_output .= $var ? 'true' : 'false';
-				break;
-			case 'integer':
-				self::$_output .= "$var";
-				break;
-			case 'double':
-				self::$_output .= "$var";
-				break;
-			case 'string':
-				self::$_output .= "'" . addslashes($var) . "'";
-				break;
-			case 'resource':
-				self::$_output .= '{resource}';
-				break;
-			case 'NULL':
-				self::$_output .= "null";
-				break;
-			case 'unknown type':
-				self::$_output .= '{unknown}';
-				break;
-			case 'array':
-				if (self::$_depth <= $level) {
-					self::$_output .= 'array(...)';
-				} elseif (empty($var)) {
-					self::$_output .= 'array()';
-				} else {
-					$keys = array_keys($var);
-					$spaces = str_repeat(' ', $level * 4);
-					self::$_output .= "array\n" . $spaces . '(';
-					foreach ($keys as $key) {
-						self::$_output .= "\n" . $spaces . '    ';
-						self::dumpInternal($key, 0);
-						self::$_output .= ' => ';
-						self::dumpInternal($var[$key], $level + 1);
-					}
-					self::$_output .= "\n" . $spaces . ')';
-				}
-				break;
-			case 'object':
-				if (($id = array_search($var, self::$_objects, true)) !== false) {
-					self::$_output .= get_class($var) . '#' . ($id + 1) . '(...)';
-				} elseif (self::$_depth <= $level) {
-					self::$_output .= get_class($var) . '(...)';
-				} else {
-					$id = array_push(self::$_objects, $var);
-					$className = get_class($var);
-					$members = (array)$var;
-					$spaces = str_repeat(' ', $level * 4);
-					self::$_output .= "$className#$id\n" . $spaces . '(';
-					foreach ($members as $key => $value) {
-						$keyDisplay = strtr(trim($key), array("\0" => ':'));
-						self::$_output .= "\n" . $spaces . "    [$keyDisplay] => ";
-						self::dumpInternal($value, $level + 1);
-					}
-					self::$_output .= "\n" . $spaces . ')';
-				}
-				break;
-		}
-	}
-}
diff --git a/framework/helpers/base/mimeTypes.php b/framework/helpers/base/mimeTypes.php
deleted file mode 100644
index ffdba4b..0000000
--- a/framework/helpers/base/mimeTypes.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-/**
- * MIME types.
- *
- * This file contains most commonly used MIME types
- * according to file extension names.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- * @since 2.0
- */
-
-return array(
-	'ai' => 'application/postscript',
-	'aif' => 'audio/x-aiff',
-	'aifc' => 'audio/x-aiff',
-	'aiff' => 'audio/x-aiff',
-	'anx' => 'application/annodex',
-	'asc' => 'text/plain',
-	'au' => 'audio/basic',
-	'avi' => 'video/x-msvideo',
-	'axa' => 'audio/annodex',
-	'axv' => 'video/annodex',
-	'bcpio' => 'application/x-bcpio',
-	'bin' => 'application/octet-stream',
-	'bmp' => 'image/bmp',
-	'c' => 'text/plain',
-	'cc' => 'text/plain',
-	'ccad' => 'application/clariscad',
-	'cdf' => 'application/x-netcdf',
-	'class' => 'application/octet-stream',
-	'cpio' => 'application/x-cpio',
-	'cpt' => 'application/mac-compactpro',
-	'csh' => 'application/x-csh',
-	'css' => 'text/css',
-	'dcr' => 'application/x-director',
-	'dir' => 'application/x-director',
-	'dms' => 'application/octet-stream',
-	'doc' => 'application/msword',
-	'drw' => 'application/drafting',
-	'dvi' => 'application/x-dvi',
-	'dwg' => 'application/acad',
-	'dxf' => 'application/dxf',
-	'dxr' => 'application/x-director',
-	'eps' => 'application/postscript',
-	'etx' => 'text/x-setext',
-	'exe' => 'application/octet-stream',
-	'ez' => 'application/andrew-inset',
-	'f' => 'text/plain',
-	'f90' => 'text/plain',
-	'flac' => 'audio/flac',
-	'fli' => 'video/x-fli',
-	'flv' => 'video/x-flv',
-	'gif' => 'image/gif',
-	'gtar' => 'application/x-gtar',
-	'gz' => 'application/x-gzip',
-	'h' => 'text/plain',
-	'hdf' => 'application/x-hdf',
-	'hh' => 'text/plain',
-	'hqx' => 'application/mac-binhex40',
-	'htm' => 'text/html',
-	'html' => 'text/html',
-	'ice' => 'x-conference/x-cooltalk',
-	'ief' => 'image/ief',
-	'iges' => 'model/iges',
-	'igs' => 'model/iges',
-	'ips' => 'application/x-ipscript',
-	'ipx' => 'application/x-ipix',
-	'jpe' => 'image/jpeg',
-	'jpeg' => 'image/jpeg',
-	'jpg' => 'image/jpeg',
-	'js' => 'application/x-javascript',
-	'kar' => 'audio/midi',
-	'latex' => 'application/x-latex',
-	'lha' => 'application/octet-stream',
-	'lsp' => 'application/x-lisp',
-	'lzh' => 'application/octet-stream',
-	'm' => 'text/plain',
-	'man' => 'application/x-troff-man',
-	'me' => 'application/x-troff-me',
-	'mesh' => 'model/mesh',
-	'mid' => 'audio/midi',
-	'midi' => 'audio/midi',
-	'mif' => 'application/vnd.mif',
-	'mime' => 'www/mime',
-	'mov' => 'video/quicktime',
-	'movie' => 'video/x-sgi-movie',
-	'mp2' => 'audio/mpeg',
-	'mp3' => 'audio/mpeg',
-	'mpe' => 'video/mpeg',
-	'mpeg' => 'video/mpeg',
-	'mpg' => 'video/mpeg',
-	'mpga' => 'audio/mpeg',
-	'ms' => 'application/x-troff-ms',
-	'msh' => 'model/mesh',
-	'nc' => 'application/x-netcdf',
-	'oga' => 'audio/ogg',
-	'ogg' => 'audio/ogg',
-	'ogv' => 'video/ogg',
-	'ogx' => 'application/ogg',
-	'oda' => 'application/oda',
-	'pbm' => 'image/x-portable-bitmap',
-	'pdb' => 'chemical/x-pdb',
-	'pdf' => 'application/pdf',
-	'pgm' => 'image/x-portable-graymap',
-	'pgn' => 'application/x-chess-pgn',
-	'png' => 'image/png',
-	'pnm' => 'image/x-portable-anymap',
-	'pot' => 'application/mspowerpoint',
-	'ppm' => 'image/x-portable-pixmap',
-	'pps' => 'application/mspowerpoint',
-	'ppt' => 'application/mspowerpoint',
-	'ppz' => 'application/mspowerpoint',
-	'pre' => 'application/x-freelance',
-	'prt' => 'application/pro_eng',
-	'ps' => 'application/postscript',
-	'qt' => 'video/quicktime',
-	'ra' => 'audio/x-realaudio',
-	'ram' => 'audio/x-pn-realaudio',
-	'ras' => 'image/cmu-raster',
-	'rgb' => 'image/x-rgb',
-	'rm' => 'audio/x-pn-realaudio',
-	'roff' => 'application/x-troff',
-	'rpm' => 'audio/x-pn-realaudio-plugin',
-	'rtf' => 'text/rtf',
-	'rtx' => 'text/richtext',
-	'scm' => 'application/x-lotusscreencam',
-	'set' => 'application/set',
-	'sgm' => 'text/sgml',
-	'sgml' => 'text/sgml',
-	'sh' => 'application/x-sh',
-	'shar' => 'application/x-shar',
-	'silo' => 'model/mesh',
-	'sit' => 'application/x-stuffit',
-	'skd' => 'application/x-koan',
-	'skm' => 'application/x-koan',
-	'skp' => 'application/x-koan',
-	'skt' => 'application/x-koan',
-	'smi' => 'application/smil',
-	'smil' => 'application/smil',
-	'snd' => 'audio/basic',
-	'sol' => 'application/solids',
-	'spl' => 'application/x-futuresplash',
-	'spx' => 'audio/ogg',
-	'src' => 'application/x-wais-source',
-	'step' => 'application/STEP',
-	'stl' => 'application/SLA',
-	'stp' => 'application/STEP',
-	'sv4cpio' => 'application/x-sv4cpio',
-	'sv4crc' => 'application/x-sv4crc',
-	'swf' => 'application/x-shockwave-flash',
-	't' => 'application/x-troff',
-	'tar' => 'application/x-tar',
-	'tcl' => 'application/x-tcl',
-	'tex' => 'application/x-tex',
-	'texi' => 'application/x-texinfo',
-	'texinfo' => 'application/x-texinfo',
-	'tif' => 'image/tiff',
-	'tiff' => 'image/tiff',
-	'tr' => 'application/x-troff',
-	'tsi' => 'audio/TSP-audio',
-	'tsp' => 'application/dsptype',
-	'tsv' => 'text/tab-separated-values',
-	'txt' => 'text/plain',
-	'unv' => 'application/i-deas',
-	'ustar' => 'application/x-ustar',
-	'vcd' => 'application/x-cdlink',
-	'vda' => 'application/vda',
-	'viv' => 'video/vnd.vivo',
-	'vivo' => 'video/vnd.vivo',
-	'vrml' => 'model/vrml',
-	'wav' => 'audio/x-wav',
-	'wrl' => 'model/vrml',
-	'xbm' => 'image/x-xbitmap',
-	'xlc' => 'application/vnd.ms-excel',
-	'xll' => 'application/vnd.ms-excel',
-	'xlm' => 'application/vnd.ms-excel',
-	'xls' => 'application/vnd.ms-excel',
-	'xlw' => 'application/vnd.ms-excel',
-	'xml' => 'application/xml',
-	'xpm' => 'image/x-xpixmap',
-	'xspf' => 'application/xspf+xml',
-	'xwd' => 'image/x-xwindowdump',
-	'xyz' => 'chemical/x-pdb',
-	'zip' => 'application/zip',
-);
diff --git a/framework/i18n/I18N.php b/framework/i18n/I18N.php
deleted file mode 100644
index 7fae5b0..0000000
--- a/framework/i18n/I18N.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\i18n;
-
-use Yii;
-use yii\base\Component;
-use yii\base\InvalidConfigException;
-use yii\base\InvalidParamException;
-
-/**
- * I18N provides features related with internationalization (I18N) and localization (L10N).
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class I18N extends Component
-{
-	/**
-	 * @var array list of [[MessageSource]] configurations or objects. The array keys are message
-	 * categories, and the array values are the corresponding [[MessageSource]] objects or the configurations
-	 * for creating the [[MessageSource]] objects. The message categories can contain the wildcard '*' at the end
-	 * to match multiple categories with the same prefix. For example, 'app\*' matches both 'app\cat1' and 'app\cat2'.
-	 *
-	 * This property may be modified on the fly by extensions who want to have their own message sources
-	 * registered under their own namespaces.
-	 *
-	 * The category "yii" and "app" are always defined. The former refers to the messages used in the Yii core
-	 * framework code, while the latter refers to the default message category for custom application code.
-	 * By default, both of these categories use [[PhpMessageSource]] and the corresponding message files are
-	 * stored under "@yii/messages" and "@app/messages", respectively.
-	 *
-	 * You may override the configuration of both categories.
-	 */
-	public $translations;
-	/**
-	 * @var string the path or path alias of the file that contains the plural rules.
-	 * By default, this refers to a file shipped with the Yii distribution. The file is obtained
-	 * by converting from the data file in the CLDR project.
-	 *
-	 * If the default rule file does not contain the expected rules, you may copy and modify it
-	 * for your application, and then configure this property to point to your modified copy.
-	 *
-	 * @see http://www.unicode.org/cldr/charts/supplemental/language_plural_rules.html
-	 */
-	public $pluralRuleFile = '@yii/i18n/data/plurals.php';
-
-	/**
-	 * Initializes the component by configuring the default message categories.
-	 */
-	public function init()
-	{
-		parent::init();
-		if (!isset($this->translations['yii'])) {
-			$this->translations['yii'] = array(
-				'class' => 'yii\i18n\PhpMessageSource',
-				'sourceLanguage' => 'en_US',
-				'basePath' => '@yii/messages',
-			);
-		}
-		if (!isset($this->translations['app'])) {
-			$this->translations['app'] = array(
-				'class' => 'yii\i18n\PhpMessageSource',
-				'sourceLanguage' => 'en_US',
-				'basePath' => '@app/messages',
-			);
-		}
-	}
-
-	/**
-	 * Translates a message to the specified language.
-	 * If the first parameter in `$params` is a number and it is indexed by 0, appropriate plural rules
-	 * will be applied to the translated message.
-	 * @param string $message the message to be translated.
-	 * @param array $params the parameters that will be used to replace the corresponding placeholders in the message.
-	 * @param string $language the language code (e.g. `en_US`, `en`). If this is null, the current
-	 * [[\yii\base\Application::language|application language]] will be used.
-	 * @return string the translated message.
-	 */
-	public function translate($message, $params = array(), $language = null)
-	{
-		if ($language === null) {
-			$language = Yii::$app->language;
-		}
-
-		// allow chars for category: word chars, ".", "-", "/","\"
-		if (strpos($message, '|') !== false && preg_match('/^([\w\-\\/\.\\\\]+)\|(.*)/', $message, $matches)) {
-			$category = $matches[1];
-			$message = $matches[2];
-		} else {
-			$category = 'app';
-		}
-
-		$message = $this->getMessageSource($category)->translate($category, $message, $language);
-
-		if (!is_array($params)) {
-			$params = array($params);
-		}
-
-		if (isset($params[0])) {
-			$message = $this->applyPluralRules($message, $params[0], $language);
-			if (!isset($params['{n}'])) {
-				$params['{n}'] = $params[0];
-			}
-			unset($params[0]);
-		}
-
-		return empty($params) ? $message : strtr($message, $params);
-	}
-
-	/**
-	 * Returns the message source for the given category.
-	 * @param string $category the category name.
-	 * @return MessageSource the message source for the given category.
-	 * @throws InvalidConfigException if there is no message source available for the specified category.
-	 */
-	public function getMessageSource($category)
-	{
-		if (isset($this->translations[$category])) {
-			$source = $this->translations[$category];
-		} else {
-			// try wildcard matching
-			foreach ($this->translations as $pattern => $config) {
-				if (substr($pattern, -1) === '*' && strpos($category, rtrim($pattern, '*')) === 0) {
-					$source = $config;
-					break;
-				}
-			}
-		}
-		if (isset($source)) {
-			return $source instanceof MessageSource ? $source : Yii::createObject($source);
-		} else {
-			throw new InvalidConfigException("Unable to locate message source for category '$category'.");
-		}
-	}
-
-	/**
-	 * Applies appropriate plural rules to the given message.
-	 * @param string $message the message to be applied with plural rules
-	 * @param mixed $number the number by which plural rules will be applied
-	 * @param string $language the language code that determines which set of plural rules to be applied.
-	 * @return string the message that has applied plural rules
-	 */
-	protected function applyPluralRules($message, $number, $language)
-	{
-		if (strpos($message, '|') === false) {
-			return $message;
-		}
-		$chunks = explode('|', $message);
-
-		$rules = $this->getPluralRules($language);
-		foreach ($rules as $i => $rule) {
-			if (isset($chunks[$i]) && $this->evaluate($rule, $number)) {
-				return $chunks[$i];
-			}
-		}
-		$n = count($rules);
-		return isset($chunks[$n]) ? $chunks[$n] : $chunks[0];
-	}
-
-	private $_pluralRules = array(); // language => rule set
-
-	/**
-	 * Returns the plural rules for the given language code.
-	 * @param string $language the language code (e.g. `en_US`, `en`).
-	 * @return array the plural rules
-	 * @throws InvalidParamException if the language code is invalid.
-	 */
-	protected function getPluralRules($language)
-	{
-		if (isset($this->_pluralRules[$language])) {
-			return $this->_pluralRules;
-		}
-		$allRules = require(Yii::getAlias($this->pluralRuleFile));
-		if (isset($allRules[$language])) {
-			return $this->_pluralRules[$language] = $allRules[$language];
-		} elseif (preg_match('/^[a-z]+/', strtolower($language), $matches)) {
-			return $this->_pluralRules[$language] = isset($allRules[$matches[0]]) ? $allRules[$matches[0]] : array();
-		} else {
-			throw new InvalidParamException("Invalid language code: $language");
-		}
-	}
-
-	/**
-	 * Evaluates a PHP expression with the given number value.
-	 * @param string $expression the PHP expression
-	 * @param mixed $n the number value
-	 * @return boolean the expression result
-	 */
-	protected function evaluate($expression, $n)
-	{
-		return eval("return $expression;");
-	}
-}
diff --git a/framework/i18n/MessageSource.php b/framework/i18n/MessageSource.php
deleted file mode 100644
index cf23338..0000000
--- a/framework/i18n/MessageSource.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\i18n;
-
-use Yii;
-use yii\base\Component;
-
-/**
- * MessageSource is the base class for message translation repository classes.
- *
- * A message source stores message translations in some persistent storage.
- *
- * Child classes should override [[loadMessages()]] to provide translated messages.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class MessageSource extends Component
-{
-	/**
-	 * @event MissingTranslationEvent an event that is triggered when a message translation is not found.
-	 */
-	const EVENT_MISSING_TRANSLATION = 'missingTranslation';
-
-	/**
-	 * @var boolean whether to force message translation when the source and target languages are the same.
-	 * Defaults to false, meaning translation is only performed when source and target languages are different.
-	 */
-	public $forceTranslation = false;
-	/**
-	 * @var string the language that the original messages are in. If not set, it will use the value of
-	 * [[\yii\base\Application::sourceLanguage]].
-	 */
-	public $sourceLanguage;
-
-	private $_messages = array();
-
-	/**
-	 * Initializes this component.
-	 */
-	public function init()
-	{
-		parent::init();
-		if ($this->sourceLanguage === null) {
-			$this->sourceLanguage = Yii::$app->sourceLanguage;
-		}
-	}
-
-	/**
-	 * Loads the message translation for the specified language and category.
-	 * Child classes should override this method to return the message translations of
-	 * the specified language and category.
-	 * @param string $category the message category
-	 * @param string $language the target language
-	 * @return array the loaded messages. The keys are original messages, and the values
-	 * are translated messages.
-	 */
-	protected function loadMessages($category, $language)
-	{
-		return array();
-	}
-
-	/**
-	 * Translates a message to the specified language.
-	 *
-	 * Note that unless [[forceTranslation]] is true, if the target language
-	 * is the same as the [[sourceLanguage|source language]], the message
-	 * will NOT be translated.
-	 *
-	 * If a translation is not found, a [[missingTranslation]] event will be triggered.
-	 *
-	 * @param string $category the message category
-	 * @param string $message the message to be translated
-	 * @param string $language the target language
-	 * @return string the translated message (or the original message if translation is not needed)
-	 */
-	public function translate($category, $message, $language)
-	{
-		if ($this->forceTranslation || $language !== $this->sourceLanguage) {
-			return $this->translateMessage($category, $message, $language);
-		} else {
-			return $message;
-		}
-	}
-
-	/**
-	 * Translates the specified message.
-	 * If the message is not found, a [[missingTranslation]] event will be triggered
-	 * and the original message will be returned.
-	 * @param string $category the category that the message belongs to
-	 * @param string $message the message to be translated
-	 * @param string $language the target language
-	 * @return string the translated message
-	 */
-	protected function translateMessage($category, $message, $language)
-	{
-		$key = $language . '/' . $category;
-		if (!isset($this->_messages[$key])) {
-			$this->_messages[$key] = $this->loadMessages($category, $language);
-		}
-		if (isset($this->_messages[$key][$message]) && $this->_messages[$key][$message] !== '') {
-			return $this->_messages[$key][$message];
-		} elseif ($this->hasEventHandlers('missingTranslation')) {
-			$event = new MissingTranslationEvent(array(
-				'category' => $category,
-				'message' => $message,
-				'language' => $language,
-			));
-			$this->trigger(self::EVENT_MISSING_TRANSLATION, $event);
-			return $this->_messages[$key] = $event->message;
-		} else {
-			return $message;
-		}
-	}
-}
-
diff --git a/framework/i18n/MissingTranslationEvent.php b/framework/i18n/MissingTranslationEvent.php
deleted file mode 100644
index 9ac337a..0000000
--- a/framework/i18n/MissingTranslationEvent.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\i18n;
-
-use yii\base\Event;
-
-/**
- * MissingTranslationEvent represents the parameter for the [[MessageSource::missingTranslation]] event.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class MissingTranslationEvent extends Event
-{
-	/**
-	 * @var string the message to be translated. An event handler may overwrite this property
-	 * with a translated version if possible.
-	 */
-	public $message;
-	/**
-	 * @var string the category that the message belongs to
-	 */
-	public $category;
-	/**
-	 * @var string the language ID (e.g. en_US) that the message is to be translated to
-	 */
-	public $language;
-}
diff --git a/framework/i18n/PhpMessageSource.php b/framework/i18n/PhpMessageSource.php
deleted file mode 100644
index f62939f..0000000
--- a/framework/i18n/PhpMessageSource.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\i18n;
-
-use Yii;
-
-/**
- * PhpMessageSource represents a message source that stores translated messages in PHP scripts.
- *
- * PhpMessageSource uses PHP arrays to keep message translations.
- *
- * - Each PHP script contains one array which stores the message translations in one particular
- *   language and for a single message category;
- * - Each PHP script is saved as a file named as `[[basePath]]/LanguageID/CategoryName.php`;
- * - Within each PHP script, the message translations are returned as an array like the following:
- *
- * ~~~
- * return array(
- *     'original message 1' => 'translated message 1',
- *     'original message 2' => 'translated message 2',
- * );
- * ~~~
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class PhpMessageSource extends MessageSource
-{
-	/**
-	 * @var string the base path for all translated messages. Defaults to null, meaning
-	 * the "messages" subdirectory of the application directory (e.g. "protected/messages").
-	 */
-	public $basePath = '@app/messages';
-	/**
-	 * @var array mapping between message categories and the corresponding message file paths.
-	 * The file paths are relative to [[basePath]]. For example,
-	 *
-	 * ~~~
-	 * array(
-	 *     'core' => 'core.php',
-	 *     'ext' => 'extensions.php',
-	 * )
-	 * ~~~
-	 */
-	public $fileMap;
-
-	/**
-	 * Loads the message translation for the specified language and category.
-	 * @param string $category the message category
-	 * @param string $language the target language
-	 * @return array the loaded messages
-	 */
-	protected function loadMessages($category, $language)
-	{
-		$messageFile = Yii::getAlias($this->basePath) . "/$language/";
-		if (isset($this->fileMap[$category])) {
-			$messageFile .= $this->fileMap[$category];
-		} elseif (($pos = strrpos($category, '\\')) !== false) {
-			$messageFile .= (substr($category, $pos) . '.php');
-		} else {
-			$messageFile .= "$category.php";
-		}
-		if (is_file($messageFile)) {
-			$messages = include($messageFile);
-			if (!is_array($messages)) {
-				$messages = array();
-			}
-			return $messages;
-		} else {
-			Yii::error("The message file for category '$category' does not exist: $messageFile", __METHOD__);
-			return array();
-		}
-	}
-}
diff --git a/framework/i18n/data/plurals.php b/framework/i18n/data/plurals.php
deleted file mode 100644
index 468f7e2..0000000
--- a/framework/i18n/data/plurals.php
+++ /dev/null
@@ -1,627 +0,0 @@
-<?php
-/**
- * Plural rules.
- *
- * This file is automatically generated by the "yiic locale/plural" command under the "build" folder.
- * Do not modify it directly.
- *
- * The original plural rule data used for generating this file has the following copyright terms:
- *
- * Copyright © 1991-2007 Unicode, Inc. All rights reserved.
- * Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
- *
- * @revision 6008 (of the original plural file)
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-return array (
-  'ar' => 
-  array (
-    0 => '$n==0',
-    1 => '$n==1',
-    2 => '$n==2',
-    3 => 'in_array(fmod($n,100),range(3,10))',
-    4 => 'in_array(fmod($n,100),range(11,99))',
-  ),
-  'asa' => 
-  array (
-    0 => '$n==1',
-  ),
-  'af' => 
-  array (
-    0 => '$n==1',
-  ),
-  'bem' => 
-  array (
-    0 => '$n==1',
-  ),
-  'bez' => 
-  array (
-    0 => '$n==1',
-  ),
-  'bg' => 
-  array (
-    0 => '$n==1',
-  ),
-  'bn' => 
-  array (
-    0 => '$n==1',
-  ),
-  'brx' => 
-  array (
-    0 => '$n==1',
-  ),
-  'ca' => 
-  array (
-    0 => '$n==1',
-  ),
-  'cgg' => 
-  array (
-    0 => '$n==1',
-  ),
-  'chr' => 
-  array (
-    0 => '$n==1',
-  ),
-  'da' => 
-  array (
-    0 => '$n==1',
-  ),
-  'de' => 
-  array (
-    0 => '$n==1',
-  ),
-  'dv' => 
-  array (
-    0 => '$n==1',
-  ),
-  'ee' => 
-  array (
-    0 => '$n==1',
-  ),
-  'el' => 
-  array (
-    0 => '$n==1',
-  ),
-  'en' => 
-  array (
-    0 => '$n==1',
-  ),
-  'eo' => 
-  array (
-    0 => '$n==1',
-  ),
-  'es' => 
-  array (
-    0 => '$n==1',
-  ),
-  'et' => 
-  array (
-    0 => '$n==1',
-  ),
-  'eu' => 
-  array (
-    0 => '$n==1',
-  ),
-  'fi' => 
-  array (
-    0 => '$n==1',
-  ),
-  'fo' => 
-  array (
-    0 => '$n==1',
-  ),
-  'fur' => 
-  array (
-    0 => '$n==1',
-  ),
-  'fy' => 
-  array (
-    0 => '$n==1',
-  ),
-  'gl' => 
-  array (
-    0 => '$n==1',
-  ),
-  'gsw' => 
-  array (
-    0 => '$n==1',
-  ),
-  'gu' => 
-  array (
-    0 => '$n==1',
-  ),
-  'ha' => 
-  array (
-    0 => '$n==1',
-  ),
-  'haw' => 
-  array (
-    0 => '$n==1',
-  ),
-  'he' => 
-  array (
-    0 => '$n==1',
-  ),
-  'is' => 
-  array (
-    0 => '$n==1',
-  ),
-  'it' => 
-  array (
-    0 => '$n==1',
-  ),
-  'jmc' => 
-  array (
-    0 => '$n==1',
-  ),
-  'kaj' => 
-  array (
-    0 => '$n==1',
-  ),
-  'kcg' => 
-  array (
-    0 => '$n==1',
-  ),
-  'kk' => 
-  array (
-    0 => '$n==1',
-  ),
-  'kl' => 
-  array (
-    0 => '$n==1',
-  ),
-  'ksb' => 
-  array (
-    0 => '$n==1',
-  ),
-  'ku' => 
-  array (
-    0 => '$n==1',
-  ),
-  'lb' => 
-  array (
-    0 => '$n==1',
-  ),
-  'lg' => 
-  array (
-    0 => '$n==1',
-  ),
-  'mas' => 
-  array (
-    0 => '$n==1',
-  ),
-  'ml' => 
-  array (
-    0 => '$n==1',
-  ),
-  'mn' => 
-  array (
-    0 => '$n==1',
-  ),
-  'mr' => 
-  array (
-    0 => '$n==1',
-  ),
-  'nah' => 
-  array (
-    0 => '$n==1',
-  ),
-  'nb' => 
-  array (
-    0 => '$n==1',
-  ),
-  'nd' => 
-  array (
-    0 => '$n==1',
-  ),
-  'ne' => 
-  array (
-    0 => '$n==1',
-  ),
-  'nl' => 
-  array (
-    0 => '$n==1',
-  ),
-  'nn' => 
-  array (
-    0 => '$n==1',
-  ),
-  'no' => 
-  array (
-    0 => '$n==1',
-  ),
-  'nr' => 
-  array (
-    0 => '$n==1',
-  ),
-  'ny' => 
-  array (
-    0 => '$n==1',
-  ),
-  'nyn' => 
-  array (
-    0 => '$n==1',
-  ),
-  'om' => 
-  array (
-    0 => '$n==1',
-  ),
-  'or' => 
-  array (
-    0 => '$n==1',
-  ),
-  'pa' => 
-  array (
-    0 => '$n==1',
-  ),
-  'pap' => 
-  array (
-    0 => '$n==1',
-  ),
-  'ps' => 
-  array (
-    0 => '$n==1',
-  ),
-  'pt' => 
-  array (
-    0 => '$n==1',
-  ),
-  'rof' => 
-  array (
-    0 => '$n==1',
-  ),
-  'rm' => 
-  array (
-    0 => '$n==1',
-  ),
-  'rwk' => 
-  array (
-    0 => '$n==1',
-  ),
-  'saq' => 
-  array (
-    0 => '$n==1',
-  ),
-  'seh' => 
-  array (
-    0 => '$n==1',
-  ),
-  'sn' => 
-  array (
-    0 => '$n==1',
-  ),
-  'so' => 
-  array (
-    0 => '$n==1',
-  ),
-  'sq' => 
-  array (
-    0 => '$n==1',
-  ),
-  'ss' => 
-  array (
-    0 => '$n==1',
-  ),
-  'ssy' => 
-  array (
-    0 => '$n==1',
-  ),
-  'st' => 
-  array (
-    0 => '$n==1',
-  ),
-  'sv' => 
-  array (
-    0 => '$n==1',
-  ),
-  'sw' => 
-  array (
-    0 => '$n==1',
-  ),
-  'syr' => 
-  array (
-    0 => '$n==1',
-  ),
-  'ta' => 
-  array (
-    0 => '$n==1',
-  ),
-  'te' => 
-  array (
-    0 => '$n==1',
-  ),
-  'teo' => 
-  array (
-    0 => '$n==1',
-  ),
-  'tig' => 
-  array (
-    0 => '$n==1',
-  ),
-  'tk' => 
-  array (
-    0 => '$n==1',
-  ),
-  'tn' => 
-  array (
-    0 => '$n==1',
-  ),
-  'ts' => 
-  array (
-    0 => '$n==1',
-  ),
-  'ur' => 
-  array (
-    0 => '$n==1',
-  ),
-  'wae' => 
-  array (
-    0 => '$n==1',
-  ),
-  've' => 
-  array (
-    0 => '$n==1',
-  ),
-  'vun' => 
-  array (
-    0 => '$n==1',
-  ),
-  'xh' => 
-  array (
-    0 => '$n==1',
-  ),
-  'xog' => 
-  array (
-    0 => '$n==1',
-  ),
-  'zu' => 
-  array (
-    0 => '$n==1',
-  ),
-  'ak' => 
-  array (
-    0 => '($n==0||$n==1)',
-  ),
-  'am' => 
-  array (
-    0 => '($n==0||$n==1)',
-  ),
-  'bh' => 
-  array (
-    0 => '($n==0||$n==1)',
-  ),
-  'fil' => 
-  array (
-    0 => '($n==0||$n==1)',
-  ),
-  'tl' => 
-  array (
-    0 => '($n==0||$n==1)',
-  ),
-  'guw' => 
-  array (
-    0 => '($n==0||$n==1)',
-  ),
-  'hi' => 
-  array (
-    0 => '($n==0||$n==1)',
-  ),
-  'ln' => 
-  array (
-    0 => '($n==0||$n==1)',
-  ),
-  'mg' => 
-  array (
-    0 => '($n==0||$n==1)',
-  ),
-  'nso' => 
-  array (
-    0 => '($n==0||$n==1)',
-  ),
-  'ti' => 
-  array (
-    0 => '($n==0||$n==1)',
-  ),
-  'wa' => 
-  array (
-    0 => '($n==0||$n==1)',
-  ),
-  'ff' => 
-  array (
-    0 => '($n>=0&&$n<=2)&&$n!=2',
-  ),
-  'fr' => 
-  array (
-    0 => '($n>=0&&$n<=2)&&$n!=2',
-  ),
-  'kab' => 
-  array (
-    0 => '($n>=0&&$n<=2)&&$n!=2',
-  ),
-  'lv' => 
-  array (
-    0 => '$n==0',
-    1 => 'fmod($n,10)==1&&fmod($n,100)!=11',
-  ),
-  'iu' => 
-  array (
-    0 => '$n==1',
-    1 => '$n==2',
-  ),
-  'kw' => 
-  array (
-    0 => '$n==1',
-    1 => '$n==2',
-  ),
-  'naq' => 
-  array (
-    0 => '$n==1',
-    1 => '$n==2',
-  ),
-  'se' => 
-  array (
-    0 => '$n==1',
-    1 => '$n==2',
-  ),
-  'sma' => 
-  array (
-    0 => '$n==1',
-    1 => '$n==2',
-  ),
-  'smi' => 
-  array (
-    0 => '$n==1',
-    1 => '$n==2',
-  ),
-  'smj' => 
-  array (
-    0 => '$n==1',
-    1 => '$n==2',
-  ),
-  'smn' => 
-  array (
-    0 => '$n==1',
-    1 => '$n==2',
-  ),
-  'sms' => 
-  array (
-    0 => '$n==1',
-    1 => '$n==2',
-  ),
-  'ga' => 
-  array (
-    0 => '$n==1',
-    1 => '$n==2',
-    2 => 'in_array($n,array(3,4,5,6))',
-    3 => 'in_array($n,array(7,8,9,10))',
-  ),
-  'ro' => 
-  array (
-    0 => '$n==1',
-    1 => '$n==0||$n!=1&&in_array(fmod($n,100),range(1,19))',
-  ),
-  'mo' => 
-  array (
-    0 => '$n==1',
-    1 => '$n==0||$n!=1&&in_array(fmod($n,100),range(1,19))',
-  ),
-  'lt' => 
-  array (
-    0 => 'fmod($n,10)==1&&!in_array(fmod($n,100),range(11,19))',
-    1 => 'in_array(fmod($n,10),range(2,9))&&!in_array(fmod($n,100),range(11,19))',
-  ),
-  'be' => 
-  array (
-    0 => 'fmod($n,10)==1&&fmod($n,100)!=11',
-    1 => 'in_array(fmod($n,10),array(2,3,4))&&!in_array(fmod($n,100),array(12,13,14))',
-    2 => 'fmod($n,10)==0||in_array(fmod($n,10),array(5,6,7,8,9))||in_array(fmod($n,100),array(11,12,13,14))',
-  ),
-  'bs' => 
-  array (
-    0 => 'fmod($n,10)==1&&fmod($n,100)!=11',
-    1 => 'in_array(fmod($n,10),array(2,3,4))&&!in_array(fmod($n,100),array(12,13,14))',
-    2 => 'fmod($n,10)==0||in_array(fmod($n,10),array(5,6,7,8,9))||in_array(fmod($n,100),array(11,12,13,14))',
-  ),
-  'hr' => 
-  array (
-    0 => 'fmod($n,10)==1&&fmod($n,100)!=11',
-    1 => 'in_array(fmod($n,10),array(2,3,4))&&!in_array(fmod($n,100),array(12,13,14))',
-    2 => 'fmod($n,10)==0||in_array(fmod($n,10),array(5,6,7,8,9))||in_array(fmod($n,100),array(11,12,13,14))',
-  ),
-  'ru' => 
-  array (
-    0 => 'fmod($n,10)==1&&fmod($n,100)!=11',
-    1 => 'in_array(fmod($n,10),array(2,3,4))&&!in_array(fmod($n,100),array(12,13,14))',
-    2 => 'fmod($n,10)==0||in_array(fmod($n,10),array(5,6,7,8,9))||in_array(fmod($n,100),array(11,12,13,14))',
-  ),
-  'sh' => 
-  array (
-    0 => 'fmod($n,10)==1&&fmod($n,100)!=11',
-    1 => 'in_array(fmod($n,10),array(2,3,4))&&!in_array(fmod($n,100),array(12,13,14))',
-    2 => 'fmod($n,10)==0||in_array(fmod($n,10),array(5,6,7,8,9))||in_array(fmod($n,100),array(11,12,13,14))',
-  ),
-  'sr' => 
-  array (
-    0 => 'fmod($n,10)==1&&fmod($n,100)!=11',
-    1 => 'in_array(fmod($n,10),array(2,3,4))&&!in_array(fmod($n,100),array(12,13,14))',
-    2 => 'fmod($n,10)==0||in_array(fmod($n,10),array(5,6,7,8,9))||in_array(fmod($n,100),array(11,12,13,14))',
-  ),
-  'uk' => 
-  array (
-    0 => 'fmod($n,10)==1&&fmod($n,100)!=11',
-    1 => 'in_array(fmod($n,10),array(2,3,4))&&!in_array(fmod($n,100),array(12,13,14))',
-    2 => 'fmod($n,10)==0||in_array(fmod($n,10),array(5,6,7,8,9))||in_array(fmod($n,100),array(11,12,13,14))',
-  ),
-  'cs' => 
-  array (
-    0 => '$n==1',
-    1 => 'in_array($n,array(2,3,4))',
-  ),
-  'sk' => 
-  array (
-    0 => '$n==1',
-    1 => 'in_array($n,array(2,3,4))',
-  ),
-  'pl' => 
-  array (
-    0 => '$n==1',
-    1 => 'in_array(fmod($n,10),array(2,3,4))&&!in_array(fmod($n,100),array(12,13,14))',
-    2 => '$n!=1&&in_array(fmod($n,10),array(0,1))||in_array(fmod($n,10),array(5,6,7,8,9))||in_array(fmod($n,100),array(12,13,14))',
-  ),
-  'sl' => 
-  array (
-    0 => 'fmod($n,100)==1',
-    1 => 'fmod($n,100)==2',
-    2 => 'in_array(fmod($n,100),array(3,4))',
-  ),
-  'mt' => 
-  array (
-    0 => '$n==1',
-    1 => '$n==0||in_array(fmod($n,100),range(2,10))',
-    2 => 'in_array(fmod($n,100),range(11,19))',
-  ),
-  'mk' => 
-  array (
-    0 => 'fmod($n,10)==1&&$n!=11',
-  ),
-  'cy' => 
-  array (
-    0 => '$n==0',
-    1 => '$n==1',
-    2 => '$n==2',
-    3 => '$n==3',
-    4 => '$n==6',
-  ),
-  'lag' => 
-  array (
-    0 => '$n==0',
-    1 => '($n>=0&&$n<=2)&&$n!=0&&$n!=2',
-  ),
-  'shi' => 
-  array (
-    0 => '($n>=0&&$n<=1)',
-    1 => 'in_array($n,range(2,10))',
-  ),
-  'br' => 
-  array (
-    0 => 'fmod($n,10)==1&&!in_array(fmod($n,100),array(11,71,91))',
-    1 => 'fmod($n,10)==2&&!in_array(fmod($n,100),array(12,72,92))',
-    2 => 'in_array(fmod($n,10),array(3,4,9))&&!in_array(fmod($n,100),array_merge(range(10,19),range(70,79),range(90,99)))',
-    3 => 'fmod($n,1000000)==0&&$n!=0',
-  ),
-  'ksh' => 
-  array (
-    0 => '$n==0',
-    1 => '$n==1',
-  ),
-  'tzm' => 
-  array (
-    0 => '($n==0||$n==1)||in_array($n,range(11,99))',
-  ),
-  'gv' => 
-  array (
-    0 => 'in_array(fmod($n,10),array(1,2))||fmod($n,20)==0',
-  ),
-);
diff --git a/framework/i18n/data/plurals.xml b/framework/i18n/data/plurals.xml
deleted file mode 100644
index 9227dc6..0000000
--- a/framework/i18n/data/plurals.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE supplementalData SYSTEM "../../common/dtd/ldmlSupplemental.dtd">
-<supplementalData>
-    <version number="$Revision: 6008 $"/>
-    <generation date="$Date: 2011-07-12 13:18:01 -0500 (Tue, 12 Jul 2011) $"/>
-    <plurals>
-        <!-- if locale is known to have no plurals, there are no rules -->
-        <pluralRules locales="az bm bo dz fa id ig ii hu ja jv ka kde kea km kn ko lo ms my sah ses sg th to tr vi wo yo zh"/> 
-        <pluralRules locales="ar">
-            <pluralRule count="zero">n is 0</pluralRule>
-            <pluralRule count="one">n is 1</pluralRule>
-            <pluralRule count="two">n is 2</pluralRule>
-            <pluralRule count="few">n mod 100 in 3..10</pluralRule>
-            <pluralRule count="many">n mod 100 in 11..99</pluralRule>
-        </pluralRules>
-        <pluralRules locales="asa af bem bez bg bn brx ca cgg chr da de dv ee el en eo es et eu fi fo fur fy gl gsw gu ha haw he is it jmc kaj kcg kk kl ksb ku lb lg mas ml mn mr nah nb nd ne nl nn no nr ny nyn om or pa pap ps pt rof rm rwk saq seh sn so sq ss ssy st sv sw syr ta te teo tig tk tn ts ur wae ve vun xh xog zu">
-            <pluralRule count="one">n is 1</pluralRule>
-        </pluralRules>
-        <pluralRules locales="ak am bh fil tl guw hi ln mg nso ti wa">
-            <pluralRule count="one">n in 0..1</pluralRule>
-        </pluralRules>
-        <pluralRules locales="ff fr kab">
-            <pluralRule count="one">n within 0..2 and n is not 2</pluralRule>
-        </pluralRules>
-        <pluralRules locales="lv">
-            <pluralRule count="zero">n is 0</pluralRule>
-            <pluralRule count="one">n mod 10 is 1 and n mod 100 is not 11</pluralRule>
-        </pluralRules>
-        <pluralRules locales="iu kw naq se sma smi smj smn sms">
-            <pluralRule count="one">n is 1</pluralRule>
-            <pluralRule count="two">n is 2</pluralRule>
-        </pluralRules>
-        <pluralRules locales="ga"> <!-- http://unicode.org/cldr/trac/ticket/3915 -->
-            <pluralRule count="one">n is 1</pluralRule>
-            <pluralRule count="two">n is 2</pluralRule>
-            <pluralRule count="few">n in 3..6</pluralRule>
-            <pluralRule count="many">n in 7..10</pluralRule>
-        </pluralRules>
-        <pluralRules locales="ro mo">
-            <pluralRule count="one">n is 1</pluralRule>
-            <pluralRule count="few">n is 0 OR n is not 1 AND n mod 100 in 1..19</pluralRule>
-        </pluralRules>
-        <pluralRules locales="lt">
-            <pluralRule count="one">n mod 10 is 1 and n mod 100 not in 11..19</pluralRule>
-            <pluralRule count="few">n mod 10 in 2..9 and n mod 100 not in 11..19</pluralRule>
-        </pluralRules>
-        <pluralRules locales="be bs hr ru sh sr uk">
-            <pluralRule count="one">n mod 10 is 1 and n mod 100 is not 11</pluralRule>
-            <pluralRule count="few">n mod 10 in 2..4 and n mod 100 not in 12..14</pluralRule>
-            <pluralRule count="many">n mod 10 is 0 or n mod 10 in 5..9 or n mod 100 in 11..14</pluralRule>
-            <!-- others are fractions -->
-        </pluralRules>
-        <pluralRules locales="cs sk">
-            <pluralRule count="one">n is 1</pluralRule>
-            <pluralRule count="few">n in 2..4</pluralRule>
-        </pluralRules>
-        <pluralRules locales="pl">
-            <pluralRule count="one">n is 1</pluralRule>
-            <pluralRule count="few">n mod 10 in 2..4 and n mod 100 not in 12..14</pluralRule>
-            <pluralRule count="many">n is not 1 and n mod 10 in 0..1 or n mod 10 in 5..9 or n mod 100 in 12..14</pluralRule>
-            <!-- others are fractions -->
-            <!-- and n mod 100 not in 22..24 from Tamplin -->
-        </pluralRules>
-        <pluralRules locales="sl">
-            <pluralRule count="one">n mod 100 is 1</pluralRule>
-            <pluralRule count="two">n mod 100 is 2</pluralRule>
-            <pluralRule count="few">n mod 100 in 3..4</pluralRule>
-        </pluralRules>
-        <pluralRules locales="mt"> <!-- from Tamplin's data -->
-            <pluralRule count="one">n is 1</pluralRule>
-            <pluralRule count="few">n is 0 or n mod 100 in 2..10</pluralRule>
-            <pluralRule count="many">n mod 100 in 11..19</pluralRule>
-        </pluralRules>
-        <pluralRules locales="mk"> <!-- from Tamplin's data -->
-            <pluralRule count="one">n mod 10 is 1 and n is not 11</pluralRule>
-        </pluralRules>
-        <pluralRules locales="cy"> <!-- from http://www.saltcymru.org/wordpress/?p=99&lang=en -->
-            <pluralRule count="zero">n is 0</pluralRule>
-            <pluralRule count="one">n is 1</pluralRule>
-            <pluralRule count="two">n is 2</pluralRule>
-            <pluralRule count="few">n is 3</pluralRule>
-            <pluralRule count="many">n is 6</pluralRule>
-        </pluralRules>
-        <pluralRules locales="lag">
-            <pluralRule count="zero">n is 0</pluralRule>
-            <pluralRule count="one">n within 0..2 and n is not 0 and n is not 2</pluralRule>
-        </pluralRules>
-        <pluralRules locales="shi">
-            <pluralRule count="one">n within 0..1</pluralRule>
-            <pluralRule count="few">n in 2..10</pluralRule>
-        </pluralRules>
-        <pluralRules locales="br"> <!-- from http://unicode.org/cldr/trac/ticket/2886 -->
-            <pluralRule count="one">n mod 10 is 1 and n mod 100 not in 11,71,91</pluralRule>
-            <pluralRule count="two">n mod 10 is 2 and n mod 100 not in 12,72,92</pluralRule>
-            <pluralRule count="few">n mod 10 in 3..4,9 and n mod 100 not in 10..19,70..79,90..99</pluralRule>
-            <pluralRule count="many">n mod 1000000 is 0 and n is not 0</pluralRule>
-        </pluralRules>
-        <pluralRules locales="ksh">
-            <pluralRule count="zero">n is 0</pluralRule>
-            <pluralRule count="one">n is 1</pluralRule>
-        </pluralRules>
-        <pluralRules locales="tzm">
-            <pluralRule count="one">n in 0..1 or n in 11..99</pluralRule>
-        </pluralRules>
-        <pluralRules locales="gv">
-            <pluralRule count="one">n mod 10 in 1..2 or n mod 20 is 0</pluralRule>
-        </pluralRules>
-    </plurals>
-</supplementalData>
diff --git a/framework/logging/DbTarget.php b/framework/logging/DbTarget.php
deleted file mode 100644
index ce9d843..0000000
--- a/framework/logging/DbTarget.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\logging;
-
-use Yii;
-use yii\db\Connection;
-use yii\base\InvalidConfigException;
-
-/**
- * DbTarget stores log messages in a database table.
- *
- * By default, DbTarget stores the log messages in a DB table named 'tbl_log'. This table
- * must be pre-created. The table name can be changed by setting [[logTable]].
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class DbTarget extends Target
-{
-	/**
-	 * @var Connection|string the DB connection object or the application component ID of the DB connection.
-	 * After the DbTarget object is created, if you want to change this property, you should only assign it
-	 * with a DB connection object.
-	 */
-	public $db = 'db';
-	/**
-	 * @var string name of the DB table to store cache content.
-	 * The table should be pre-created as follows:
-	 *
-	 * ~~~
-	 * CREATE TABLE tbl_log (
-	 *	   id       BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-	 *	   level    INTEGER,
-	 *	   category VARCHAR(255),
-	 *	   log_time INTEGER,
-	 *	   message  TEXT,
-	 *     INDEX idx_log_level (level),
-	 *     INDEX idx_log_category (category)
-	 * )
-	 * ~~~
-	 *
-	 * Note that the 'id' column must be created as an auto-incremental column.
-	 * The above SQL uses the MySQL syntax. If you are using other DBMS, you need
-	 * to adjust it accordingly. For example, in PostgreSQL, it should be `id SERIAL PRIMARY KEY`.
-	 *
-	 * The indexes declared above are not required. They are mainly used to improve the performance
-	 * of some queries about message levels and categories. Depending on your actual needs, you may
-	 * want to create additional indexes (e.g. index on `log_time`).
-	 */
-	public $logTable = 'tbl_log';
-
-	/**
-	 * Initializes the DbTarget component.
-	 * This method will initialize the [[db]] property to make sure it refers to a valid DB connection.
-	 * @throws InvalidConfigException if [[db]] is invalid.
-	 */
-	public function init()
-	{
-		parent::init();
-		if (is_string($this->db)) {
-			$this->db = Yii::$app->getComponent($this->db);
-		}
-		if (!$this->db instanceof Connection) {
-			throw new InvalidConfigException("DbTarget::db must be either a DB connection instance or the application component ID of a DB connection.");
-		}
-	}
-
-	/**
-	 * Stores log messages to DB.
-	 * @param array $messages the messages to be exported. See [[Logger::messages]] for the structure
-	 * of each message.
-	 */
-	public function export($messages)
-	{
-		$tableName = $this->db->quoteTableName($this->logTable);
-		$sql = "INSERT INTO $tableName ([[level]], [[category]], [[log_time]], [[message]])
-				VALUES (:level, :category, :log_time, :message)";
-		$command = $this->db->createCommand($sql);
-		foreach ($messages as $message) {
-			$command->bindValues(array(
-				':level' => $message[1],
-				':category' => $message[2],
-				':log_time' => $message[3],
-				':message' => $message[0],
-			))->execute();
-		}
-	}
-}
diff --git a/framework/logging/EmailTarget.php b/framework/logging/EmailTarget.php
deleted file mode 100644
index bb02e34..0000000
--- a/framework/logging/EmailTarget.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\logging;
-
-/**
- * EmailTarget sends selected log messages to the specified email addresses.
- *
- * The target email addresses may be specified via [[emails]] property.
- * Optionally, you may set the email [[subject]], [[sentFrom]] address and
- * additional [[headers]].
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class EmailTarget extends Target
-{
-	/**
-	 * @var array list of destination email addresses.
-	 */
-	public $emails = array();
-	/**
-	 * @var string email subject
-	 */
-	public $subject;
-	/**
-	 * @var string email sent-from address
-	 */
-	public $sentFrom;
-	/**
-	 * @var array list of additional headers to use when sending an email.
-	 */
-	public $headers = array();
-
-	/**
-	 * Sends log messages to specified email addresses.
-	 * @param array $messages the messages to be exported. See [[Logger::messages]] for the structure
-	 * of each message.
-	 */
-	public function export($messages)
-	{
-		$body = '';
-		foreach ($messages as $message) {
-			$body .= $this->formatMessage($message);
-		}
-		$body = wordwrap($body, 70);
-		$subject = $this->subject === null ? \Yii::t('yii|Application Log') : $this->subject;
-		foreach ($this->emails as $email) {
-			$this->sendEmail($subject, $body, $email, $this->sentFrom, $this->headers);
-		}
-	}
-
-	/**
-	 * Sends an email.
-	 * @param string $subject email subject
-	 * @param string $body email body
-	 * @param string $sentTo sent-to email address
-	 * @param string $sentFrom sent-from email address
-	 * @param array $headers additional headers to be used when sending the email
-	 */
-	protected function sendEmail($subject, $body, $sentTo, $sentFrom, $headers)
-	{
-		if ($sentFrom !== null) {
-			$headers[] = "From:  {$sentFrom}";
-		}
-		mail($sentTo, $subject, $body, implode("\r\n", $headers));
-	}
-}
diff --git a/framework/logging/FileTarget.php b/framework/logging/FileTarget.php
deleted file mode 100644
index 69799cd..0000000
--- a/framework/logging/FileTarget.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\logging;
-
-use Yii;
-use yii\base\InvalidConfigException;
-
-/**
- * FileTarget records log messages in a file.
- *
- * The log file is specified via [[logFile]]. If the size of the log file exceeds
- * [[maxFileSize]] (in kilo-bytes), a rotation will be performed, which renames
- * the current log file by suffixing the file name with '.1'. All existing log
- * files are moved backwards by one place, i.e., '.2' to '.3', '.1' to '.2', and so on.
- * The property [[maxLogFiles]] specifies how many files to keep.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class FileTarget extends Target
-{
-	/**
-	 * @var string log file path or path alias. If not set, it will use the "runtime/logs/app.log" file.
-	 * The directory containing the log files will be automatically created if not existing.
-	 */
-	public $logFile;
-	/**
-	 * @var integer maximum log file size, in kilo-bytes. Defaults to 10240, meaning 10MB.
-	 */
-	public $maxFileSize = 10240; // in KB
-	/**
-	 * @var integer number of log files used for rotation. Defaults to 5.
-	 */
-	public $maxLogFiles = 5;
-
-
-	/**
-	 * Initializes the route.
-	 * This method is invoked after the route is created by the route manager.
-	 */
-	public function init()
-	{
-		parent::init();
-		if ($this->logFile === null) {
-			$this->logFile = Yii::$app->getRuntimePath() . '/logs/app.log';
-		} else {
-			$this->logFile = Yii::getAlias($this->logFile);
-		}
-		$logPath = dirname($this->logFile);
-		if (!is_dir($logPath)) {
-			@mkdir($logPath, 0777, true);
-		}
-		if ($this->maxLogFiles < 1) {
-			$this->maxLogFiles = 1;
-		}
-		if ($this->maxFileSize < 1) {
-			$this->maxFileSize = 1;
-		}
-	}
-
-	/**
-	 * Sends log messages to specified email addresses.
-	 * @param array $messages the messages to be exported. See [[Logger::messages]] for the structure
-	 * of each message.
-	 * @throws InvalidConfigException if unable to open the log file for writing
-	 */
-	public function export($messages)
-	{
-		$text = '';
-		foreach ($messages as $message) {
-			$text .= $this->formatMessage($message);
-		}
-		if (($fp = @fopen($this->logFile, 'a')) === false) {
-			throw new InvalidConfigException("Unable to append to log file: {$this->logFile}");
-		}
-		@flock($fp, LOCK_EX);
-		if (@filesize($this->logFile) > $this->maxFileSize * 1024) {
-			$this->rotateFiles();
-			@flock($fp,LOCK_UN);
-			@fclose($fp);
-			@file_put_contents($this->logFile, $text, FILE_APPEND | LOCK_EX);
-		} else {
-			@fwrite($fp, $text);
-			@flock($fp,LOCK_UN);
-			@fclose($fp);
-		}
-	}
-
-	/**
-	 * Rotates log files.
-	 */
-	protected function rotateFiles()
-	{
-		$file = $this->logFile;
-		for ($i = $this->maxLogFiles; $i > 0; --$i) {
-			$rotateFile = $file . '.' . $i;
-			if (is_file($rotateFile)) {
-				// suppress errors because it's possible multiple processes enter into this section
-				if ($i === $this->maxLogFiles) {
-					@unlink($rotateFile);
-				} else {
-					@rename($rotateFile, $file . '.' . ($i + 1));
-				}
-			}
-		}
-		if (is_file($file)) {
-			@rename($file, $file . '.1'); // suppress errors because it's possible multiple processes enter into this section
-		}
-	}
-}
diff --git a/framework/logging/Logger.php b/framework/logging/Logger.php
deleted file mode 100644
index b557c5e..0000000
--- a/framework/logging/Logger.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\logging;
-
-use \yii\base\Component;
-use \yii\base\InvalidConfigException;
-
-/**
- * Logger records logged messages in memory.
- *
- * When the application ends or [[flushInterval]] is reached, Logger will call [[flush()]]
- * to send logged messages to different log targets, such as file, email, Web.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Logger extends Component
-{
-	/**
-	 * Error message level. An error message is one that indicates the abnormal termination of the
-	 * application and may require developer's handling.
-	 */
-	const LEVEL_ERROR = 0x01;
-	/**
-	 * Warning message level. A warning message is one that indicates some abnormal happens but
-	 * the application is able to continue to run. Developers should pay attention to this message.
-	 */
-	const LEVEL_WARNING = 0x02;
-	/**
-	 * Informational message level. An informational message is one that includes certain information
-	 * for developers to review.
-	 */
-	const LEVEL_INFO = 0x04;
-	/**
-	 * Tracing message level. An tracing message is one that reveals the code execution flow.
-	 */
-	const LEVEL_TRACE = 0x08;
-	/**
-	 * Profiling message level. This indicates the message is for profiling purpose.
-	 */
-	const LEVEL_PROFILE = 0x40;
-	/**
-	 * Profiling message level. This indicates the message is for profiling purpose. It marks the
-	 * beginning of a profiling block.
-	 */
-	const LEVEL_PROFILE_BEGIN = 0x50;
-	/**
-	 * Profiling message level. This indicates the message is for profiling purpose. It marks the
-	 * end of a profiling block.
-	 */
-	const LEVEL_PROFILE_END = 0x60;
-
-
-	/**
-	 * @var integer how many messages should be logged before they are flushed from memory and sent to targets.
-	 * Defaults to 1000, meaning the [[flush]] method will be invoked once every 1000 messages logged.
-	 * Set this property to be 0 if you don't want to flush messages until the application terminates.
-	 * This property mainly affects how much memory will be taken by the logged messages.
-	 * A smaller value means less memory, but will increase the execution time due to the overhead of [[flush()]].
-	 */
-	public $flushInterval = 1000;
-	/**
-	 * @var array logged messages. This property is mainly managed by [[log()]] and [[flush()]].
-	 * Each log message is of the following structure:
-	 *
-	 * ~~~
-	 * array(
-	 *   [0] => message (mixed, can be a string or some complex data, such as an exception object)
-	 *   [1] => level (integer)
-	 *   [2] => category (string)
-	 *   [3] => timestamp (float, obtained by microtime(true))
-	 * )
-	 * ~~~
-	 */
-	public $messages = array();
-	/**
-	 * @var Router the log target router registered with this logger.
-	 */
-	public $router;
-	/**
-	 * @var string a tag that uniquely identifies the current request. This can be used
-	 * to differentiate the log messages for different requests.
-	 */
-	public $tag;
-
-	/**
-	 * Initializes the logger by registering [[flush()]] as a shutdown function.
-	 */
-	public function init()
-	{
-		parent::init();
-		$this->tag = date('Ymd-His', microtime(true));
-		register_shutdown_function(array($this, 'flush'), true);
-	}
-
-	/**
-	 * Logs a message with the given type and category.
-	 * If `YII_DEBUG` is true and `YII_TRACE_LEVEL` is greater than 0, then additional
-	 * call stack information about application code will be appended to the message.
-	 * @param string $message the message to be logged.
-	 * @param integer $level the level of the message. This must be one of the following:
-	 * `Logger::LEVEL_ERROR`, `Logger::LEVEL_WARNING`, `Logger::LEVEL_INFO`, `Logger::LEVEL_TRACE`,
-	 * `Logger::LEVEL_PROFILE_BEGIN`, `Logger::LEVEL_PROFILE_END`.
-	 * @param string $category the category of the message.
-	 */
-	public function log($message, $level, $category = 'application')
-	{
-		$time = microtime(true);
-		if (YII_DEBUG && YII_TRACE_LEVEL > 0) {
-			$traces = debug_backtrace();
-			$count = 0;
-			foreach ($traces as $trace) {
-				if (isset($trace['file'], $trace['line']) && strpos($trace['file'], YII_PATH) !== 0) {
-					$message .= "\nin {$trace['file']} ({$trace['line']})";
-					if (++$count >= YII_TRACE_LEVEL) {
-						break;
-					}
-				}
-			}
-		}
-		$this->messages[] = array($message, $level, $category, $time);
-		if ($this->flushInterval > 0 && count($this->messages) >= $this->flushInterval) {
-			$this->flush();
-		}
-	}
-
-	/**
-	 * Flushes log messages from memory to targets.
-	 * This method will trigger an [[EVENT_FLUSH]] or [[EVENT_FINAL_FLUSH]] event depending on the $final value.
-	 * @param boolean $final whether this is a final call during a request.
-	 */
-	public function flush($final = false)
-	{
-		if ($this->router) {
-			$this->router->dispatch($this->messages, $final);
-		}
-		$this->messages = array();
-	}
-
-	/**
-	 * Returns the total elapsed time since the start of the current request.
-	 * This method calculates the difference between now and the timestamp
-	 * defined by constant `YII_BEGIN_TIME` which is evaluated at the beginning
-	 * of [[YiiBase]] class file.
-	 * @return float the total elapsed time in seconds for current request.
-	 */
-	public function getElapsedTime()
-	{
-		return microtime(true) - YII_BEGIN_TIME;
-	}
-
-	/**
-	 * Returns the profiling results.
-	 *
-	 * By default, all profiling results will be returned. You may provide
-	 * `$categories` and `$excludeCategories` as parameters to retrieve the
-	 * results that you are interested in.
-	 *
-	 * @param array $categories list of categories that you are interested in.
-	 * You can use an asterisk at the end of a category to do a prefix match.
-	 * For example, 'yii\db\*' will match categories starting with 'yii\db\',
-	 * such as 'yii\db\Connection'.
-	 * @param array $excludeCategories list of categories that you want to exclude
-	 * @return array the profiling results. Each array element has the following structure:
-	 *  `array($token, $category, $time)`.
-	 */
-	public function getProfiling($categories = array(), $excludeCategories = array())
-	{
-		$timings = $this->calculateTimings();
-		if (empty($categories) && empty($excludeCategories)) {
-			return $timings;
-		}
-
-		foreach ($timings as $i => $timing) {
-			$matched = empty($categories);
-			foreach ($categories as $category) {
-				$prefix = rtrim($category, '*');
-				if (strpos($timing[1], $prefix) === 0 && ($timing[1] === $category || $prefix !== $category)) {
-					$matched = true;
-					break;
-				}
-			}
-
-			if ($matched) {
-				foreach ($excludeCategories as $category) {
-					$prefix = rtrim($category, '*');
-					foreach ($timings as $i => $timing) {
-						if (strpos($timing[1], $prefix) === 0 && ($timing[1] === $category || $prefix !== $category)) {
-							$matched = false;
-							break;
-						}
-					}
-				}
-			}
-
-			if (!$matched) {
-				unset($timings[$i]);
-			}
-		}
-		return array_values($timings);
-	}
-
-	private function calculateTimings()
-	{
-		$timings = array();
-
-		$stack = array();
-		foreach ($this->messages as $log) {
-			list($token, $level, $category, $timestamp) = $log;
-			if ($level == self::LEVEL_PROFILE_BEGIN) {
-				$stack[] = $log;
-			} elseif ($level == self::LEVEL_PROFILE_END) {
-				if (($last = array_pop($stack)) !== null && $last[0] === $token) {
-					$timings[] = array($token, $category, $timestamp - $last[3]);
-				} else {
-					throw new InvalidConfigException("Unmatched profiling block: $token");
-				}
-			}
-		}
-
-		$now = microtime(true);
-		while (($last = array_pop($stack)) !== null) {
-			$delta = $now - $last[3];
-			$timings[] = array($last[0], $last[2], $delta);
-		}
-
-		return $timings;
-	}
-}
diff --git a/framework/logging/ProfileTarget.php b/framework/logging/ProfileTarget.php
deleted file mode 100644
index 335e172..0000000
--- a/framework/logging/ProfileTarget.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-/**
- * CProfileLogRoute displays the profiling results in Web page.
- *
- * The profiling is done by calling {@link YiiBase::beginProfile()} and {@link YiiBase::endProfile()},
- * which marks the begin and end of a code block.
- *
- * CProfileLogRoute supports two types of report by setting the {@link setReport report} property:
- * <ul>
- * <li>summary: list the execution time of every marked code block</li>
- * <li>callstack: list the mark code blocks in a hierarchical view reflecting their calling sequence.</li>
- * </ul>
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class CProfileLogRoute extends CWebLogRoute
-{
-	/**
-	 * @var boolean whether to aggregate results according to profiling tokens.
-	 * If false, the results will be aggregated by categories.
-	 * Defaults to true. Note that this property only affects the summary report
-	 * that is enabled when {@link report} is 'summary'.
-	 */
-	public $groupByToken = true;
-	/**
-	 * @var string type of profiling report to display
-	 */
-	private $_report = 'summary';
-
-	/**
-	 * Initializes the route.
-	 * This method is invoked after the route is created by the route manager.
-	 */
-	public function init()
-	{
-		$this->levels = CLogger::LEVEL_PROFILE;
-	}
-
-	/**
-	 * @return string the type of the profiling report to display. Defaults to 'summary'.
-	 */
-	public function getReport()
-	{
-		return $this->_report;
-	}
-
-	/**
-	 * @param string $value the type of the profiling report to display. Valid values include 'summary' and 'callstack'.
-	 */
-	public function setReport($value)
-	{
-		if ($value === 'summary' || $value === 'callstack')
-			$this->_report = $value;
-		else
-			throw new CException(Yii::t('yii|CProfileLogRoute.report "{report}" is invalid. Valid values include "summary" and "callstack".',
-				array('{report}' => $value)));
-	}
-
-	/**
-	 * Displays the log messages.
-	 * @param array $logs list of log messages
-	 */
-	public function processLogs($logs)
-	{
-		$app = \Yii::$app;
-		if (!($app instanceof CWebApplication) || $app->getRequest()->getIsAjaxRequest())
-			return;
-
-		if ($this->getReport() === 'summary')
-			$this->displaySummary($logs);
-		else
-			$this->displayCallstack($logs);
-	}
-
-	/**
-	 * Displays the callstack of the profiling procedures for display.
-	 * @param array $logs list of logs
-	 */
-	protected function displayCallstack($logs)
-	{
-		$stack = array();
-		$results = array();
-		$n = 0;
-		foreach ($logs as $log)
-		{
-			if ($log[1] !== CLogger::LEVEL_PROFILE) {
-				continue;
-			}
-			$message = $log[0];
-			if (!strncasecmp($message, 'begin:', 6)) {
-				$log[0] = substr($message, 6);
-				$log[4] = $n;
-				$stack[] = $log;
-				$n++;
-			} elseif (!strncasecmp($message, 'end:', 4)) {
-				$token = substr($message, 4);
-				if (($last = array_pop($stack)) !== null && $last[0] === $token) {
-					$delta = $log[3] - $last[3];
-					$results[$last[4]] = array($token, $delta, count($stack));
-				} else
-				{
-					throw new CException(Yii::t('yii|CProfileLogRoute found a mismatching code block "{token}". Make sure the calls to Yii::beginProfile() and Yii::endProfile() be properly nested.',
-						array('{token}' => $token)));
-				}
-			}
-		}
-		// remaining entries should be closed here
-		$now = microtime(true);
-		while (($last = array_pop($stack)) !== null) {
-			$results[$last[4]] = array($last[0], $now - $last[3], count($stack));
-		}
-		ksort($results);
-		$this->render('profile-callstack', $results);
-	}
-
-	/**
-	 * Displays the summary report of the profiling result.
-	 * @param array $logs list of logs
-	 */
-	protected function displaySummary($logs)
-	{
-		$stack = array();
-		foreach ($logs as $log)
-		{
-			if ($log[1] !== CLogger::LEVEL_PROFILE)
-				continue;
-			$message = $log[0];
-			if (!strncasecmp($message, 'begin:', 6))
-			{
-				$log[0] = substr($message, 6);
-				$stack[] = $log;
-			} elseif (!strncasecmp($message, 'end:', 4))
-			{
-				$token = substr($message, 4);
-				if (($last = array_pop($stack)) !== null && $last[0] === $token)
-				{
-					$delta = $log[3] - $last[3];
-					if (!$this->groupByToken)
-						$token = $log[2];
-					if (isset($results[$token]))
-						$results[$token] = $this->aggregateResult($results[$token], $delta);
-					else
-						$results[$token] = array($token, 1, $delta, $delta, $delta);
-				} else
-					throw new CException(Yii::t('yii|CProfileLogRoute found a mismatching code block "{token}". Make sure the calls to Yii::beginProfile() and Yii::endProfile() be properly nested.',
-						array('{token}' => $token)));
-			}
-		}
-
-		$now = microtime(true);
-		while (($last = array_pop($stack)) !== null)
-		{
-			$delta = $now - $last[3];
-			$token = $this->groupByToken ? $last[0] : $last[2];
-			if (isset($results[$token]))
-				$results[$token] = $this->aggregateResult($results[$token], $delta);
-			else
-				$results[$token] = array($token, 1, $delta, $delta, $delta);
-		}
-
-		$entries = array_values($results);
-		$func = create_function('$a,$b', 'return $a[4]<$b[4]?1:0;');
-		usort($entries, $func);
-
-		$this->render('profile-summary', $entries);
-	}
-
-	/**
-	 * Aggregates the report result.
-	 * @param array $result log result for this code block
-	 * @param float $delta time spent for this code block
-	 * @return array
-	 */
-	protected function aggregateResult($result, $delta)
-	{
-		list($token, $calls, $min, $max, $total) = $result;
-		if ($delta < $min)
-			$min = $delta;
-		elseif ($delta > $max)
-			$max = $delta;
-		$calls++;
-		$total += $delta;
-		return array($token, $calls, $min, $max, $total);
-	}
-}
diff --git a/framework/logging/Router.php b/framework/logging/Router.php
deleted file mode 100644
index f544b72..0000000
--- a/framework/logging/Router.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\logging;
-
-use Yii;
-use yii\base\Component;
-use yii\base\Application;
-
-/**
- * Router manages [[Target|log targets]] that record log messages in different media.
- *
- * For example, a [[FileTarget|file log target]] records log messages
- * in files; an [[EmailTarget|email log target]] sends log messages
- * to specific email addresses. Each log target may specify filters on
- * message levels and categories to record specific messages only.
- *
- * Router and the targets it manages may be configured in application configuration,
- * like the following:
- *
- * ~~~
- * array(
- *     // preload log component when application starts
- *     'preload' => array('log'),
- *     'components' => array(
- *         'log' => array(
- *             'class' => 'yii\logging\Router',
- *             'targets' => array(
- *                 'file' => array(
- *                     'class' => 'yii\logging\FileTarget',
- *                     'levels' => array('trace', 'info'),
- *                     'categories' => array('yii\*'),
- *                 ),
- *                 'email' => array(
- *                     'class' => 'yii\logging\EmailTarget',
- *                     'levels' => array('error', 'warning'),
- *                     'emails' => array('admin@example.com'),
- *                 ),
- *             ),
- *         ),
- *     ),
- * )
- * ~~~
- *
- * Each log target can have a name and can be referenced via the [[targets]] property
- * as follows:
- *
- * ~~~
- * Yii::$app->log->targets['file']->enabled = false;
- * ~~~
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Router extends Component
-{
-	/**
-	 * @var Target[] list of log target objects or configurations. If the latter, target objects will
-	 * be created in [[init()]] by calling [[Yii::createObject()]] with the corresponding object configuration.
-	 */
-	public $targets = array();
-
-	/**
-	 * Initializes this application component.
-	 * This method is invoked when the Router component is created by the application.
-	 * The method attaches the [[processLogs]] method to both the [[Logger::EVENT_FLUSH]] event
-	 * and the [[Logger::EVENT_FINAL_FLUSH]] event.
-	 */
-	public function init()
-	{
-		parent::init();
-		foreach ($this->targets as $name => $target) {
-			if (!$target instanceof Target) {
-				$this->targets[$name] = Yii::createObject($target);
-			}
-		}
-		Yii::getLogger()->router = $this;
-	}
-
-	/**
-	 * Dispatches log messages to [[targets]].
-	 * This method is called by [[Logger]] when its [[Logger::flush()]] method is called.
-	 * It will forward the messages to each log target registered in [[targets]].
-	 * @param array $messages the messages to be processed
-	 * @param boolean $final whether this is the final call during a request cycle
-	 */
-	public function dispatch($messages, $final = false)
-	{
-		foreach ($this->targets as $target) {
-			if ($target->enabled) {
-				$target->collect($messages, $final);
-			}
-		}
-	}
-}
diff --git a/framework/logging/Target.php b/framework/logging/Target.php
deleted file mode 100644
index 311334d..0000000
--- a/framework/logging/Target.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\logging;
-
-use yii\base\InvalidConfigException;
-
-/**
- * Target is the base class for all log target classes.
- *
- * A log target object will filter the messages logged by [[Logger]] according
- * to its [[levels]] and [[categories]] properties. It may also export the filtered
- * messages to specific destination defined by the target, such as emails, files.
- *
- * Level filter and category filter are combinatorial, i.e., only messages
- * satisfying both filter conditions will be handled. Additionally, you
- * may specify [[except]] to exclude messages of certain categories.
- *
- * @property integer $levels the message levels that this target is interested in.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-abstract class Target extends \yii\base\Component
-{
-	/**
-	 * @var boolean whether to enable this log target. Defaults to true.
-	 */
-	public $enabled = true;
-	/**
-	 * @var array list of message categories that this target is interested in. Defaults to empty, meaning all categories.
-	 * You can use an asterisk at the end of a category so that the category may be used to
-	 * match those categories sharing the same common prefix. For example, 'yii\db\*' will match
-	 * categories starting with 'yii\db\', such as 'yii\db\Connection'.
-	 */
-	public $categories = array();
-	/**
-	 * @var array list of message categories that this target is NOT interested in. Defaults to empty, meaning no uninteresting messages.
-	 * If this property is not empty, then any category listed here will be excluded from [[categories]].
-	 * You can use an asterisk at the end of a category so that the category can be used to
-	 * match those categories sharing the same common prefix. For example, 'yii\db\*' will match
-	 * categories starting with 'yii\db\', such as 'yii\db\Connection'.
-	 * @see categories
-	 */
-	public $except = array();
-	/**
-	 * @var boolean whether to log a message containing the current user name and ID. Defaults to false.
-	 * @see \yii\web\User
-	 */
-	public $logUser = false;
-	/**
-	 * @var array list of the PHP predefined variables that should be logged in a message.
-	 * Note that a variable must be accessible via `$GLOBALS`. Otherwise it won't be logged.
-	 * Defaults to `array('_GET', '_POST', '_FILES', '_COOKIE', '_SESSION', '_SERVER')`.
-	 */
-	public $logVars = array('_GET', '_POST', '_FILES', '_COOKIE', '_SESSION', '_SERVER');
-	/**
-	 * @var integer how many messages should be accumulated before they are exported.
-	 * Defaults to 1000. Note that messages will always be exported when the application terminates.
-	 * Set this property to be 0 if you don't want to export messages until the application terminates.
-	 */
-	public $exportInterval = 1000;
-	/**
-	 * @var array the messages that are retrieved from the logger so far by this log target.
-	 */
-	private $_messages = array();
-
-	private $_levels = 0;
-
-	/**
-	 * Exports log messages to a specific destination.
-	 * Child classes must implement this method.
-	 * @param array $messages the messages to be exported. See [[Logger::messages]] for the structure
-	 * of each message.
-	 */
-	abstract public function export($messages);
-
-	/**
-	 * Processes the given log messages.
-	 * This method will filter the given messages with [[levels]] and [[categories]].
-	 * And if requested, it will also export the filtering result to specific medium (e.g. email).
-	 * @param array $messages log messages to be processed. See [[Logger::messages]] for the structure
-	 * of each message.
-	 * @param boolean $final whether this method is called at the end of the current application
-	 */
-	public function collect($messages, $final)
-	{
-		$this->_messages = array_merge($this->_messages, $this->filterMessages($messages));
-		$count = count($this->_messages);
-		if ($count > 0 && ($final || $this->exportInterval > 0 && $count >= $this->exportInterval)) {
-			if (($context = $this->getContextMessage()) !== '') {
-				$this->_messages[] = array($context, Logger::LEVEL_INFO, 'application', YII_BEGIN_TIME);
-			}
-			$this->export($this->_messages);
-			$this->_messages = array();
-		}
-	}
-
-	/**
-	 * Generates the context information to be logged.
-	 * The default implementation will dump user information, system variables, etc.
-	 * @return string the context information. If an empty string, it means no context information.
-	 */
-	protected function getContextMessage()
-	{
-		$context = array();
-		if ($this->logUser && ($user = \Yii::$app->getComponent('user', false)) !== null) {
-			$context[] = 'User: ' . $user->getName() . ' (ID: ' . $user->getId() . ')';
-		}
-
-		foreach ($this->logVars as $name) {
-			if (!empty($GLOBALS[$name])) {
-				$context[] = "\${$name} = " . var_export($GLOBALS[$name], true);
-			}
-		}
-
-		return implode("\n\n", $context);
-	}
-
-	/**
-	 * @return integer the message levels that this target is interested in. This is a bitmap of
-	 * level values. Defaults to 0, meaning  all available levels.
-	 */
-	public function getLevels()
-	{
-		return $this->_levels;
-	}
-
-	/**
-	 * Sets the message levels that this target is interested in.
-	 *
-	 * The parameter can be either an array of interested level names or an integer representing
-	 * the bitmap of the interested level values. Valid level names include: 'error',
-	 * 'warning', 'info', 'trace' and 'profile'; valid level values include:
-	 * [[Logger::LEVEL_ERROR]], [[Logger::LEVEL_WARNING]], [[Logger::LEVEL_INFO]],
-	 * [[Logger::LEVEL_TRACE]] and [[Logger::LEVEL_PROFILE]].
-	 *
-	 * For example,
-	 *
-	 * ~~~
-	 * array('error', 'warning')
-	 * // which is equivalent to:
-	 * Logger::LEVEL_ERROR | Logger::LEVEL_WARNING
-	 * ~~~
-	 *
-	 * @param array|integer $levels message levels that this target is interested in.
-	 * @throws InvalidConfigException if an unknown level name is given
-	 */
-	public function setLevels($levels)
-	{
-		static $levelMap = array(
-			'error' => Logger::LEVEL_ERROR,
-			'warning' => Logger::LEVEL_WARNING,
-			'info' => Logger::LEVEL_INFO,
-			'trace' => Logger::LEVEL_TRACE,
-			'profile' => Logger::LEVEL_PROFILE,
-		);
-		if (is_array($levels)) {
-			$this->_levels = 0;
-			foreach ($levels as $level) {
-				if (isset($levelMap[$level])) {
-					$this->_levels |= $levelMap[$level];
-				} else {
-					throw new InvalidConfigException("Unrecognized level: $level");
-				}
-			}
-		} else {
-			$this->_levels = $levels;
-		}
-	}
-
-	/**
-	 * Filters the given messages according to their categories and levels.
-	 * @param array $messages messages to be filtered
-	 * @return array the filtered messages.
-	 * @see filterByCategory
-	 * @see filterByLevel
-	 */
-	protected function filterMessages($messages)
-	{
-		$levels = $this->getLevels();
-
-		foreach ($messages as $i => $message) {
-			if ($levels && !($levels & $message[1])) {
-				unset($messages[$i]);
-				continue;
-			}
-
-			$matched = empty($this->categories);
-			foreach ($this->categories as $category) {
-				if ($message[2] === $category || substr($category, -1) === '*' && strpos($message[2], rtrim($category, '*')) === 0) {
-					$matched = true;
-					break;
-				}
-			}
-
-			if ($matched) {
-				foreach ($this->except as $category) {
-					$prefix = rtrim($category, '*');
-					foreach ($messages as $i => $message) {
-						if (strpos($message[2], $prefix) === 0 && ($message[2] === $category || $prefix !== $category)) {
-							$matched = false;
-							break;
-						}
-					}
-				}
-			}
-
-			if (!$matched) {
-				unset($messages[$i]);
-			}
-		}
-		return $messages;
-	}
-
-	/**
-	 * Formats a log message.
-	 * The message structure follows that in [[Logger::messages]].
-	 * @param array $message the log message to be formatted.
-	 * @return string the formatted message
-	 */
-	public function formatMessage($message)
-	{
-		static $levels = array(
-			Logger::LEVEL_ERROR => 'error',
-			Logger::LEVEL_WARNING => 'warning',
-			Logger::LEVEL_INFO => 'info',
-			Logger::LEVEL_TRACE => 'trace',
-			Logger::LEVEL_PROFILE_BEGIN => 'profile begin',
-			Logger::LEVEL_PROFILE_END => 'profile end',
-		);
-		list($text, $level, $category, $timestamp) = $message;
-		$level = isset($levels[$level]) ? $levels[$level] : 'unknown';
-		if (!is_string($text)) {
-			$text = var_export($text, true);
-		}
-		$ip = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '127.0.0.1';
-		return date('Y/m/d H:i:s', $timestamp) . " [$ip] [$level] [$category] $text\n";
-	}
-}
diff --git a/framework/logging/WebTarget.php b/framework/logging/WebTarget.php
deleted file mode 100644
index c98fd9f..0000000
--- a/framework/logging/WebTarget.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-/**
- * CWebLogRoute shows the log content in Web page.
- *
- * The log content can appear either at the end of the current Web page
- * or in FireBug console window (if {@link showInFireBug} is set true).
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class CWebLogRoute extends CLogRoute
-{
-	/**
-	 * @var boolean whether the log should be displayed in FireBug instead of browser window. Defaults to false.
-	 */
-	public $showInFireBug = false;
-
-	/**
-	 * @var boolean whether the log should be ignored in FireBug for ajax calls. Defaults to true.
-	 * This option should be used carefully, because an ajax call returns all output as a result data.
-	 * For example if the ajax call expects a json type result any output from the logger will cause ajax call to fail.
-	 */
-	public $ignoreAjaxInFireBug = true;
-
-	/**
-	 * Displays the log messages.
-	 * @param array $logs list of log messages
-	 */
-	public function processLogs($logs)
-	{
-		$this->render('log', $logs);
-	}
-
-	/**
-	 * Renders the view.
-	 * @param string $view the view name (file name without extension). The file is assumed to be located under framework/data/views.
-	 * @param array $data data to be passed to the view
-	 */
-	protected function render($view, $data)
-	{
-		$app = \Yii::$app;
-		$isAjax = $app->getRequest()->getIsAjaxRequest();
-
-		if ($this->showInFireBug)
-		{
-			if ($isAjax && $this->ignoreAjaxInFireBug)
-				return;
-			$view .= '-firebug';
-		} elseif (!($app instanceof CWebApplication) || $isAjax)
-			return;
-
-		$viewFile = YII_PATH . DIRECTORY_SEPARATOR . 'views' . DIRECTORY_SEPARATOR . $view . '.php';
-		include($app->findLocalizedFile($viewFile, 'en'));
-	}
-}
diff --git a/framework/renderers/SmartyViewRenderer.php b/framework/renderers/SmartyViewRenderer.php
deleted file mode 100644
index c6147c0..0000000
--- a/framework/renderers/SmartyViewRenderer.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * Smarty view renderer class file.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\renderers;
-
-use Yii;
-use Smarty;
-use yii\base\View;
-use yii\base\ViewRenderer;
-use yii\helpers\Html;
-
-/**
- * SmartyViewRenderer allows you to use Smarty templates in views.
- *
- * @author Alexander Makarov <sam@rmcreative.ru>
- * @since 2.0
- */
-class SmartyViewRenderer extends ViewRenderer
-{
-	/**
-	 * @var string the directory or path alias pointing to where Smarty cache will be stored.
-	 */
-	public $cachePath = '@app/runtime/Smarty/cache';
-
-	/**
-	 * @var string the directory or path alias pointing to where Smarty compiled templates will be stored.
-	 */
-	public $compilePath = '@app/runtime/Smarty/compile';
-
-	/**
-	 * @var Smarty
-	 */
-	public $smarty;
-
-	public function init()
-	{
-		$this->smarty = new Smarty();
-		$this->smarty->setCompileDir(Yii::getAlias($this->compilePath));
-		$this->smarty->setCacheDir(Yii::getAlias($this->cachePath));
-
-		$this->smarty->registerPlugin('function', 'path', array($this, 'smarty_function_path'));
-	}
-
-	/**
-	 * Smarty template function to get a path for using in links
-	 *
-	 * Usage is the following:
-	 *
-	 * {path route='blog/view' alias=$post.alias user=$user.id}
-	 *
-	 * where route is Yii route and the rest of parameters are passed as is.
-	 *
-	 * @param $params
-	 * @param \Smarty_Internal_Template $template
-	 *
-	 * @return string
-	 */
-	public function smarty_function_path($params, \Smarty_Internal_Template $template)
-	{
-		if(!isset($params['route'])) {
-			trigger_error("path: missing 'route' parameter");
-		}
-
-		array_unshift($params, $params['route']) ;
-		unset($params['route']);
-
-		return Html::url($params);
-	}
-
-	/**
-	 * Renders a view file.
-	 *
-	 * This method is invoked by [[View]] whenever it tries to render a view.
-	 * Child classes must implement this method to render the given view file.
-	 *
-	 * @param View $view the view object used for rendering the file.
-	 * @param string $file the view file.
-	 * @param array $params the parameters to be passed to the view file.
-	 *
-	 * @return string the rendering result
-	 */
-	public function render($view, $file, $params)
-	{
-		$ext = pathinfo($file, PATHINFO_EXTENSION);
-		/** @var \Smarty_Internal_Template $template */
-		$template = $this->smarty->createTemplate($file, null, null, $params, true);
-
-		$template->assign('app', \Yii::$app);
-		$template->assign('this', $view);
-
-		return $template->fetch();
-	}
-}
diff --git a/framework/renderers/TwigViewRenderer.php b/framework/renderers/TwigViewRenderer.php
deleted file mode 100644
index de561d3..0000000
--- a/framework/renderers/TwigViewRenderer.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * Twig view renderer class file.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\renderers;
-
-use Yii;
-use yii\base\View;
-use yii\base\ViewRenderer;
-use yii\helpers\Html;
-
-/**
- * TwigViewRenderer allows you to use Twig templates in views.
- *
- * @author Alexander Makarov <sam@rmcreative.ru>
- * @since 2.0
- */
-class TwigViewRenderer extends ViewRenderer
-{
-	/**
-	 * @var string the directory or path alias pointing to where Twig cache will be stored.
-	 */
-	public $cachePath = '@app/runtime/Twig/cache';
-
-	/**
-	 * @var array Twig options
-	 * @see http://twig.sensiolabs.org/doc/api.html#environment-options
-	 */
-	public $options = array();
-
-	/**
-	 * @var \Twig_Environment
-	 */
-	public $twig;
-
-	public function init()
-	{
-		$loader = new \Twig_Loader_String();
-
-		$this->twig = new \Twig_Environment($loader, array_merge(array(
-			'cache' => Yii::getAlias($this->cachePath),
-		), $this->options));
-
-		$this->twig->addFunction('path', new \Twig_Function_Function(function($path, $args = array()){
-			return Html::url(array_merge(array($path), $args));
-		}));
-
-		$this->twig->addGlobal('app', \Yii::$app);
-	}
-
-	/**
-	 * Renders a view file.
-	 *
-	 * This method is invoked by [[View]] whenever it tries to render a view.
-	 * Child classes must implement this method to render the given view file.
-	 *
-	 * @param View $view the view object used for rendering the file.
-	 * @param string $file the view file.
-	 * @param array $params the parameters to be passed to the view file.
-	 *
-	 * @return string the rendering result
-	 */
-	public function render($view, $file, $params)
-	{
-		$this->twig->addGlobal('this', $view);
-		return $this->twig->render(file_get_contents($file), $params);
-	}
-}
diff --git a/framework/test/TestCase.php b/framework/test/TestCase.php
deleted file mode 100644
index f190e5a..0000000
--- a/framework/test/TestCase.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * TestCase class.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\test;
-
-require_once('PHPUnit/Runner/Version.php');
-spl_autoload_unregister(array('Yii','autoload'));
-require_once('PHPUnit/Autoload.php');
-spl_autoload_register(array('Yii','autoload')); // put yii's autoloader at the end
-
-/**
- * TestCase is the base class for all test case classes.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-abstract class TestCase extends \PHPUnit_Framework_TestCase
-{
-}
diff --git a/framework/test/WebTestCase.php b/framework/test/WebTestCase.php
deleted file mode 100644
index 39162c9..0000000
--- a/framework/test/WebTestCase.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * WebTestCase class.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\test;
-
-require_once('PHPUnit/Runner/Version.php');
-spl_autoload_unregister(array('Yii','autoload'));
-require_once('PHPUnit/Autoload.php');
-spl_autoload_register(array('Yii','autoload')); // put yii's autoloader at the end
-
-/**
- * WebTestCase is the base class for all test case classes.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-abstract class WebTestCase extends \PHPUnit_Extensions_SeleniumTestCase
-{
-}
diff --git a/framework/validators/BooleanValidator.php b/framework/validators/BooleanValidator.php
deleted file mode 100644
index 1420739..0000000
--- a/framework/validators/BooleanValidator.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\validators;
-
-use Yii;
-use yii\helpers\Html;
-
-/**
- * BooleanValidator checks if the attribute value is a boolean value.
- *
- * Possible boolean values can be configured via the [[trueValue]] and [[falseValue]] properties.
- * And the comparison can be either [[strict]] or not.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class BooleanValidator extends Validator
-{
-	/**
-	 * @var mixed the value representing true status. Defaults to '1'.
-	 */
-	public $trueValue = '1';
-	/**
-	 * @var mixed the value representing false status. Defaults to '0'.
-	 */
-	public $falseValue = '0';
-	/**
-	 * @var boolean whether the comparison to [[trueValue]] and [[falseValue]] is strict.
-	 * When this is true, the attribute value and type must both match those of [[trueValue]] or [[falseValue]].
-	 * Defaults to false, meaning only the value needs to be matched.
-	 */
-	public $strict = false;
-
-	/**
-	 * Initializes the validator.
-	 */
-	public function init()
-	{
-		parent::init();
-		if ($this->message === null) {
-			$this->message = Yii::t('yii|{attribute} must be either "{true}" or "{false}".');
-		}
-	}
-
-	/**
-	 * Validates the attribute of the object.
-	 * If there is any error, the error message is added to the object.
-	 * @param \yii\base\Model $object the object being validated
-	 * @param string $attribute the attribute being validated
-	 */
-	public function validateAttribute($object, $attribute)
-	{
-		$value = $object->$attribute;
-		if (!$this->validateValue($value)) {
-			$this->addError($object, $attribute, $this->message, array(
-				'{true}' => $this->trueValue,
-				'{false}' => $this->falseValue,
-			));
-		}
-	}
-
-	/**
-	 * Validates the given value.
-	 * @param mixed $value the value to be validated.
-	 * @return boolean whether the value is valid.
-	 */
-	public function validateValue($value)
-	{
-		return !$this->strict && ($value == $this->trueValue || $value == $this->falseValue)
-			|| $this->strict && ($value === $this->trueValue || $value === $this->falseValue);
-	}
-
-	/**
-	 * Returns the JavaScript needed for performing client-side validation.
-	 * @param \yii\base\Model $object the data object being validated
-	 * @param string $attribute the name of the attribute to be validated.
-	 * @return string the client-side validation script.
-	 */
-	public function clientValidateAttribute($object, $attribute)
-	{
-		$options = array(
-			'trueValue' => $this->trueValue,
-			'falseValue' => $this->falseValue,
-			'message' => Html::encode(strtr($this->message, array(
-				'{attribute}' => $object->getAttributeLabel($attribute),
-				'{value}' => $object->$attribute,
-				'{true}' => $this->trueValue,
-				'{false}' => $this->falseValue,
-			))),
-		);
-		if ($this->skipOnEmpty) {
-			$options['skipOnEmpty'] = 1;
-		}
-		if ($this->strict) {
-			$options['strict'] = 1;
-		}
-
-		return 'yii.validation.boolean(value, messages, ' . json_encode($options) . ');';
-	}
-}
diff --git a/framework/validators/CaptchaValidator.php b/framework/validators/CaptchaValidator.php
deleted file mode 100644
index 2e58cf2..0000000
--- a/framework/validators/CaptchaValidator.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\validators;
-
-use Yii;
-use yii\base\InvalidConfigException;
-use yii\helpers\Html;
-
-/**
- * CaptchaValidator validates that the attribute value is the same as the verification code displayed in the CAPTCHA.
- *
- * CaptchaValidator should be used together with [[CaptchaAction]].
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class CaptchaValidator extends Validator
-{
-	public $skipOnEmpty = false;
-	/**
-	 * @var boolean whether the comparison is case sensitive. Defaults to false.
-	 */
-	public $caseSensitive = false;
-	/**
-	 * @var string the route of the controller action that renders the CAPTCHA image.
-	 */
-	public $captchaAction = 'site/captcha';
-
-
-	/**
-	 * Initializes the validator.
-	 */
-	public function init()
-	{
-		parent::init();
-		if ($this->message === null) {
-			$this->message = Yii::t('yii|The verification code is incorrect.');
-		}
-	}
-
-	/**
-	 * Validates the attribute of the object.
-	 * If there is any error, the error message is added to the object.
-	 * @param \yii\base\Model $object the object being validated
-	 * @param string $attribute the attribute being validated
-	 */
-	public function validateAttribute($object, $attribute)
-	{
-		$value = $object->$attribute;
-		if (!$this->validateValue($value)) {
-			$this->addError($object, $attribute, $this->message);
-		}
-	}
-
-	/**
-	 * Validates the given value.
-	 * @param mixed $value the value to be validated.
-	 * @return boolean whether the value is valid.
-	 */
-	public function validateValue($value)
-	{
-		$captcha = $this->getCaptchaAction();
-		return !is_array($value) && $captcha->validate($value, $this->caseSensitive);
-	}
-
-	/**
-	 * Returns the CAPTCHA action object.
-	 * @throws InvalidConfigException
-	 * @return \yii\web\CaptchaAction the action object
-	 */
-	public function getCaptchaAction()
-	{
-		$ca = Yii::$app->createController($this->captchaAction);
-		if ($ca !== false) {
-			/** @var \yii\base\Controller $controller */
-			list($controller, $actionID) = $ca;
-			$action = $controller->createAction($actionID);
-			if ($action !== null) {
-				return $action;
-			}
-		}
-		throw new InvalidConfigException('Invalid CAPTCHA action ID: ' . $this->captchaAction);
-	}
-
-	/**
-	 * Returns the JavaScript needed for performing client-side validation.
-	 * @param \yii\base\Model $object the data object being validated
-	 * @param string $attribute the name of the attribute to be validated.
-	 * @return string the client-side validation script.
-	 */
-	public function clientValidateAttribute($object, $attribute)
-	{
-		$captcha = $this->getCaptchaAction();
-		$code = $captcha->getVerifyCode(false);
-		$hash = $captcha->generateValidationHash($this->caseSensitive ? $code : strtolower($code));
-		$options = array(
-			'hash' => $hash,
-			'hashKey' => 'yiiCaptcha/' . $this->captchaAction,
-			'caseSensitive' => $this->caseSensitive,
-			'message' => Html::encode(strtr($this->message, array(
-				'{attribute}' => $object->getAttributeLabel($attribute),
-				'{value}' => $object->$attribute,
-			))),
-		);
-		if ($this->skipOnEmpty) {
-			$options['skipOnEmpty'] = 1;
-		}
-
-		return 'yii.validation.captcha(value, messages, ' . json_encode($options) . ');';
-	}
-}
-
diff --git a/framework/validators/CompareValidator.php b/framework/validators/CompareValidator.php
deleted file mode 100644
index 68504e5..0000000
--- a/framework/validators/CompareValidator.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\validators;
-
-use Yii;
-use yii\base\InvalidConfigException;
-use yii\helpers\Html;
-
-/**
- * CompareValidator compares the specified attribute value with another value and validates if they are equal.
- *
- * The value being compared with can be another attribute value
- * (specified via [[compareAttribute]]) or a constant (specified via
- * [[compareValue]]. When both are specified, the latter takes
- * precedence. If neither is specified, the attribute will be compared
- * with another attribute whose name is by appending "_repeat" to the source
- * attribute name.
- *
- * The comparison can be either [[strict]] or not.
- *
- * CompareValidator supports different comparison operators, specified
- * via the [[operator]] property.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class CompareValidator extends Validator
-{
-	/**
-	 * @var string the name of the attribute to be compared with. When both this property
-	 * and [[compareValue]] are set, the latter takes precedence. If neither is set,
-	 * it assumes the comparison is against another attribute whose name is formed by
-	 * appending '_repeat' to the attribute being validated. For example, if 'password' is
-	 * being validated, then the attribute to be compared would be 'password_repeat'.
-	 * @see compareValue
-	 */
-	public $compareAttribute;
-	/**
-	 * @var string the constant value to be compared with. When both this property
-	 * and [[compareAttribute]] are set, this property takes precedence.
-	 * @see compareAttribute
-	 */
-	public $compareValue;
-	/**
-	 * @var string the operator for comparison. The following operators are supported:
-	 *
-	 * - '==': validates to see if the two values are equal. The comparison is done is non-strict mode.
-	 * - '===': validates to see if the two values are equal. The comparison is done is strict mode.
-	 * - '!=': validates to see if the two values are NOT equal. The comparison is done is non-strict mode.
-	 * - '!==': validates to see if the two values are NOT equal. The comparison is done is strict mode.
-	 * - `>`: validates to see if the value being validated is greater than the value being compared with.
-	 * - `>=`: validates to see if the value being validated is greater than or equal to the value being compared with.
-	 * - `<`: validates to see if the value being validated is less than the value being compared with.
-	 * - `<=`: validates to see if the value being validated is less than or equal to the value being compared with.
-	 */
-	public $operator = '=';
-	/**
-	 * @var string the user-defined error message. It may contain the following placeholders which
-	 * will be replaced accordingly by the validator:
-	 *
-	 * - `{attribute}`: the label of the attribute being validated
-	 * - `{value}`: the value of the attribute being validated
-	 * - `{compareValue}`: the value or the attribute label to be compared with
-	 */
-	public $message;
-
-
-	/**
-	 * Initializes the validator.
-	 */
-	public function init()
-	{
-		parent::init();
-		if ($this->message === null) {
-			switch ($this->operator) {
-				case '==':
-					$this->message = Yii::t('yii|{attribute} must be repeated exactly.');
-					break;
-				case '===':
-					$this->message = Yii::t('yii|{attribute} must be repeated exactly.');
-					break;
-				case '!=':
-					$this->message = Yii::t('yii|{attribute} must not be equal to "{compareValue}".');
-					break;
-				case '!==':
-					$this->message = Yii::t('yii|{attribute} must not be equal to "{compareValue}".');
-					break;
-				case '>':
-					$this->message = Yii::t('yii|{attribute} must be greater than "{compareValue}".');
-					break;
-				case '>=':
-					$this->message = Yii::t('yii|{attribute} must be greater than or equal to "{compareValue}".');
-					break;
-				case '<':
-					$this->message = Yii::t('yii|{attribute} must be less than "{compareValue}".');
-					break;
-				case '<=':
-					$this->message = Yii::t('yii|{attribute} must be less than or equal to "{compareValue}".');
-					break;
-				default:
-					throw new InvalidConfigException("Unknown operator: {$this->operator}");
-			}
-		}
-	}
-
-	/**
-	 * Validates the attribute of the object.
-	 * If there is any error, the error message is added to the object.
-	 * @param \yii\base\Model $object the object being validated
-	 * @param string $attribute the attribute being validated
-	 * @throws InvalidConfigException if CompareValidator::operator is invalid
-	 */
-	public function validateAttribute($object, $attribute)
-	{
-		$value = $object->$attribute;
-		if (is_array($value)) {
-			$this->addError($object, $attribute, Yii::t('yii|{attribute} is invalid.'));
-			return;
-		}
-		if ($this->compareValue !== null) {
-			$compareLabel = $compareValue = $this->compareValue;
-		} else {
-			$compareAttribute = $this->compareAttribute === null ? $attribute . '_repeat' : $this->compareAttribute;
-			$compareValue = $object->$compareAttribute;
-			$compareLabel = $object->getAttributeLabel($compareAttribute);
-		}
-
-		switch ($this->operator) {
-			case '==': $valid = $value == $compareValue; break;
-			case '===': $valid = $value === $compareValue; break;
-			case '!=': $valid = $value != $compareValue; break;
-			case '!==': $valid = $value !== $compareValue; break;
-			case '>': $valid = $value > $compareValue; break;
-			case '>=': $valid = $value >= $compareValue; break;
-			case '<': $valid = $value < $compareValue; break;
-			case '<=': $valid = $value <= $compareValue; break;
-			default: $valid = false; break;
-		}
-		if (!$valid) {
-			$this->addError($object, $attribute, $this->message, array(
-				'{compareAttribute}' => $compareLabel,
-				'{compareValue}' => $compareValue,
-			));
-		}
-	}
-
-	/**
-	 * Validates the given value.
-	 * @param mixed $value the value to be validated.
-	 * @return boolean whether the value is valid.
-	 * @throws InvalidConfigException if [[compareValue]] is not set.
-	 */
-	public function validateValue($value)
-	{
-		if ($this->compareValue === null) {
-			throw new InvalidConfigException('CompareValidator::compareValue must be set.');
-		}
-
-		switch ($this->operator) {
-			case '==': return $value == $this->compareValue;
-			case '===': return $value === $this->compareValue;
-			case '!=': return $value != $this->compareValue;
-			case '!==': return $value !== $this->compareValue;
-			case '>': return $value > $this->compareValue;
-			case '>=': return $value >= $this->compareValue;
-			case '<': return $value < $this->compareValue;
-			case '<=': return $value <= $this->compareValue;
-		}
-	}
-
-	/**
-	 * Returns the JavaScript needed for performing client-side validation.
-	 * @param \yii\base\Model $object the data object being validated
-	 * @param string $attribute the name of the attribute to be validated
-	 * @return string the client-side validation script
-	 * @throws InvalidConfigException if CompareValidator::operator is invalid
-	 */
-	public function clientValidateAttribute($object, $attribute)
-	{
-		$options = array('operator' => $this->operator);
-
-		if ($this->compareValue !== null) {
-			$options['compareValue'] = $this->compareValue;
-			$compareValue = $this->compareValue;
-		} else {
-			$compareAttribute = $this->compareAttribute === null ? $attribute . '_repeat' : $this->compareAttribute;
-			$compareValue = $object->getAttributeLabel($compareAttribute);
-			$options['compareAttribute'] = Html::getInputId($object, $compareAttribute);
-		}
-
-		if ($this->skipOnEmpty) {
-			$options['skipOnEmpty'] = 1;
-		}
-
-		$options['message'] = Html::encode(strtr($this->message, array(
-			'{attribute}' => $object->getAttributeLabel($attribute),
-			'{value}' => $object->$attribute,
-			'{compareValue}' => $compareValue,
-		)));
-
-		return 'yii.validation.compare(value, messages, ' . json_encode($options) . ');';
-	}
-}
diff --git a/framework/validators/DateValidator.php b/framework/validators/DateValidator.php
deleted file mode 100644
index 7c3b181..0000000
--- a/framework/validators/DateValidator.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\validators;
-
-use Yii;
-use DateTime;
-
-/**
- * DateValidator verifies if the attribute represents a date, time or datetime in a proper format.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class DateValidator extends Validator
-{
-	/**
-	 * @var string the date format that the value being validated should follow.
-	 * Please refer to [[http://www.php.net/manual/en/datetime.createfromformat.php]] on
-	 * supported formats.
-	 */
-	public $format = 'Y-m-d';
-	/**
-	 * @var string the name of the attribute to receive the parsing result.
-	 * When this property is not null and the validation is successful, the named attribute will
-	 * receive the parsing result.
-	 */
-	public $timestampAttribute;
-
-	/**
-	 * Initializes the validator.
-	 */
-	public function init()
-	{
-		parent::init();
-		if ($this->message === null) {
-			$this->message = Yii::t('yii|The format of {attribute} is invalid.');
-		}
-	}
-
-	/**
-	 * Validates the attribute of the object.
-	 * If there is any error, the error message is added to the object.
-	 * @param \yii\base\Model $object the object being validated
-	 * @param string $attribute the attribute being validated
-	 */
-	public function validateAttribute($object, $attribute)
-	{
-		$value = $object->$attribute;
-		if (is_array($value)) {
-			$this->addError($object, $attribute, $this->message);
-			return;
-		}
-		$date = DateTime::createFromFormat($this->format, $value);
-		if ($date === false) {
-			$this->addError($object, $attribute, $this->message);
-		} elseif ($this->timestampAttribute !== false) {
-			$object->{$this->timestampAttribute} = $date->getTimestamp();
-		}
-	}
-
-	/**
-	 * Validates the given value.
-	 * @param mixed $value the value to be validated.
-	 * @return boolean whether the value is valid.
-	 */
-	public function validateValue($value)
-	{
-		return DateTime::createFromFormat($this->format, $value) !== false;
-	}
-}
-
diff --git a/framework/validators/DefaultValueValidator.php b/framework/validators/DefaultValueValidator.php
deleted file mode 100644
index 185dbd4..0000000
--- a/framework/validators/DefaultValueValidator.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\validators;
-
-/**
- * DefaultValueValidator sets the attribute to be the specified default value.
- *
- * DefaultValueValidator is not really a validator. It is provided mainly to allow
- * specifying attribute default values when they are empty.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class DefaultValueValidator extends Validator
-{
-	/**
-	 * @var mixed the default value to be set to the specified attributes.
-	 */
-	public $value;
-	/**
-	 * @var boolean this property is overwritten to be false so that this validator will
-	 * be applied when the value being validated is empty.
-	 */
-	public $skipOnEmpty = false;
-
-	/**
-	 * Validates the attribute of the object.
-	 * @param \yii\base\Model $object the object being validated
-	 * @param string $attribute the attribute being validated
-	 */
-	public function validateAttribute($object, $attribute)
-	{
-		if ($this->isEmpty($object->$attribute)) {
-			$object->$attribute = $this->value;
-		}
-	}
-}
-
diff --git a/framework/validators/EmailValidator.php b/framework/validators/EmailValidator.php
deleted file mode 100644
index 949b3f9..0000000
--- a/framework/validators/EmailValidator.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\validators;
-
-use Yii;
-use yii\helpers\Html;
-use yii\web\JsExpression;
-use yii\helpers\Json;
-
-/**
- * EmailValidator validates that the attribute value is a valid email address.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class EmailValidator extends Validator
-{
-	/**
-	 * @var string the regular expression used to validate the attribute value.
-	 * @see http://www.regular-expressions.info/email.html
-	 */
-	public $pattern = '/^[a-zA-Z0-9!#$%&\'*+\\/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&\'*+\\/=?^_`{|}~-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$/';
-	/**
-	 * @var string the regular expression used to validate email addresses with the name part.
-	 * This property is used only when [[allowName]] is true.
-	 * @see allowName
-	 */
-	public $fullPattern = '/^[^@]*<[a-zA-Z0-9!#$%&\'*+\\/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&\'*+\\/=?^_`{|}~-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?>$/';
-	/**
-	 * @var boolean whether to allow name in the email address (e.g. "John Smith <john.smith@example.com>"). Defaults to false.
-	 * @see fullPattern
-	 */
-	public $allowName = false;
-	/**
-	 * @var boolean whether to check the MX record for the email address.
-	 * Defaults to false. To enable it, you need to make sure the PHP function 'checkdnsrr'
-	 * exists in your PHP installation.
-	 */
-	public $checkMX = false;
-	/**
-	 * @var boolean whether to check port 25 for the email address.
-	 * Defaults to false.
-	 */
-	public $checkPort = false;
-
-	/**
-	 * Initializes the validator.
-	 */
-	public function init()
-	{
-		parent::init();
-		if ($this->message === null) {
-			$this->message = Yii::t('yii|{attribute} is not a valid email address.');
-		}
-	}
-
-	/**
-	 * Validates the attribute of the object.
-	 * If there is any error, the error message is added to the object.
-	 * @param \yii\base\Model $object the object being validated
-	 * @param string $attribute the attribute being validated
-	 */
-	public function validateAttribute($object, $attribute)
-	{
-		$value = $object->$attribute;
-		if (!$this->validateValue($value)) {
-			$this->addError($object, $attribute, $this->message);
-		}
-	}
-
-	/**
-	 * Validates the given value.
-	 * @param mixed $value the value to be validated.
-	 * @return boolean whether the value is valid.
-	 */
-	public function validateValue($value)
-	{
-		// make sure string length is limited to avoid DOS attacks
-		$valid = is_string($value) && strlen($value) <= 254
-			&& (preg_match($this->pattern, $value) || $this->allowName && preg_match($this->fullPattern, $value));
-		if ($valid) {
-			$domain = rtrim(substr($value, strpos($value, '@') + 1), '>');
-			if ($this->checkMX && function_exists('checkdnsrr')) {
-				$valid = checkdnsrr($domain, 'MX');
-			}
-			if ($valid && $this->checkPort && function_exists('fsockopen')) {
-				$valid = fsockopen($domain, 25) !== false;
-			}
-		}
-		return $valid;
-	}
-
-	/**
-	 * Returns the JavaScript needed for performing client-side validation.
-	 * @param \yii\base\Model $object the data object being validated
-	 * @param string $attribute the name of the attribute to be validated.
-	 * @return string the client-side validation script.
-	 */
-	public function clientValidateAttribute($object, $attribute)
-	{
-		$options = array(
-			'pattern' => new JsExpression($this->pattern),
-			'fullPattern' => new JsExpression($this->fullPattern),
-			'allowName' => $this->allowName,
-			'message' => Html::encode(strtr($this->message, array(
-				'{attribute}' => $object->getAttributeLabel($attribute),
-				'{value}' => $object->$attribute,
-			))),
-		);
-		if ($this->skipOnEmpty) {
-			$options['skipOnEmpty'] = 1;
-		}
-
-		return 'yii.validation.email(value, messages, ' . Json::encode($options) . ');';
-	}
-}
diff --git a/framework/validators/ExistValidator.php b/framework/validators/ExistValidator.php
deleted file mode 100644
index 7aa434c..0000000
--- a/framework/validators/ExistValidator.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\validators;
-
-use Yii;
-use yii\base\InvalidConfigException;
-
-/**
- * ExistValidator validates that the attribute value exists in a table.
- *
- * This validator is often used to verify that a foreign key contains a value
- * that can be found in the foreign table.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class ExistValidator extends Validator
-{
-	/**
-	 * @var string the ActiveRecord class name or alias of the class
-	 * that should be used to look for the attribute value being validated.
-	 * Defaults to null, meaning using the ActiveRecord class of
-	 * the attribute being validated.
-	 * @see attributeName
-	 */
-	public $className;
-	/**
-	 * @var string the yii\db\ActiveRecord class attribute name that should be
-	 * used to look for the attribute value being validated. Defaults to null,
-	 * meaning using the name of the attribute being validated.
-	 * @see className
-	 */
-	public $attributeName;
-
-
-	/**
-	 * Initializes the validator.
-	 */
-	public function init()
-	{
-		parent::init();
-		if ($this->message === null) {
-			$this->message = Yii::t('yii|{attribute} is invalid.');
-		}
-	}
-
-	/**
-	 * Validates the attribute of the object.
-	 * If there is any error, the error message is added to the object.
-	 *
-	 * @param \yii\db\ActiveRecord $object the object being validated
-	 * @param string $attribute the attribute being validated
-	 */
-	public function validateAttribute($object, $attribute)
-	{
-		$value = $object->$attribute;
-
-		if (is_array($value)) {
-			$this->addError($object, $attribute, $this->message);
-			return;
-		}
-
-		/** @var $className \yii\db\ActiveRecord */
-		$className = $this->className === null ? get_class($object) : Yii::import($this->className);
-		$attributeName = $this->attributeName === null ? $attribute : $this->attributeName;
-		$query = $className::find();
-		$query->where(array($attributeName => $value));
-		if (!$query->exists()) {
-			$this->addError($object, $attribute, $this->message);
-		}
-	}
-
-	/**
-	 * Validates the given value.
-	 * @param mixed $value the value to be validated.
-	 * @return boolean whether the value is valid.
-	 * @throws InvalidConfigException if either [[className]] or [[attributeName]] is not set.
-	 */
-	public function validateValue($value)
-	{
-		if (is_array($value)) {
-			return false;
-		}
-		if ($this->className === null) {
-			throw new InvalidConfigException('The "className" property must be set.');
-		}
-		if ($this->attributeName === null) {
-			throw new InvalidConfigException('The "attributeName" property must be set.');
-		}
-		/** @var $className \yii\db\ActiveRecord */
-		$className = $this->className;
-		$query = $className::find();
-		$query->where(array($this->attributeName => $value));
-		return $query->exists();
-	}
-}
-
diff --git a/framework/validators/FileValidator.php b/framework/validators/FileValidator.php
deleted file mode 100644
index cc36d07..0000000
--- a/framework/validators/FileValidator.php
+++ /dev/null
@@ -1,251 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\validators;
-
-use Yii;
-use yii\web\UploadedFile;
-
-/**
- * FileValidator verifies if an attribute is receiving a valid uploaded file.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class FileValidator extends Validator
-{
-	/**
-	 * @var mixed a list of file name extensions that are allowed to be uploaded.
-	 * This can be either an array or a string consisting of file extension names
-	 * separated by space or comma (e.g. "gif, jpg").
-	 * Extension names are case-insensitive. Defaults to null, meaning all file name
-	 * extensions are allowed.
-	 */
-	public $types;
-	/**
-	 * @var integer the minimum number of bytes required for the uploaded file.
-	 * Defaults to null, meaning no limit.
-	 * @see tooSmall
-	 */
-	public $minSize;
-	/**
-	 * @var integer the maximum number of bytes required for the uploaded file.
-	 * Defaults to null, meaning no limit.
-	 * Note, the size limit is also affected by 'upload_max_filesize' INI setting
-	 * and the 'MAX_FILE_SIZE' hidden field value.
-	 * @see tooBig
-	 */
-	public $maxSize;
-	/**
-	 * @var integer the maximum file count the given attribute can hold.
-	 * It defaults to 1, meaning single file upload. By defining a higher number,
-	 * multiple uploads become possible.
-	 */
-	public $maxFiles = 1;
-	/**
-	 * @var string the error message used when a file is not uploaded correctly.
-	 */
-	public $message;
-	/**
-	 * @var string the error message used when no file is uploaded.
-	 */
-	public $uploadRequired;
-	/**
-	 * @var string the error message used when the uploaded file is too large.
-	 * You may use the following tokens in the message:
-	 *
-	 * - {attribute}: the attribute name
-	 * - {file}: the uploaded file name
-	 * - {limit}: the maximum size allowed (see [[getSizeLimit()]])
-	 */
-	public $tooBig;
-	/**
-	 * @var string the error message used when the uploaded file is too small.
-	 * You may use the following tokens in the message:
-	 *
-	 * - {attribute}: the attribute name
-	 * - {file}: the uploaded file name
-	 * - {limit}: the value of [[minSize]]
-	 */
-	public $tooSmall;
-	/**
-	 * @var string the error message used when the uploaded file has an extension name
-	 * that is not listed in [[extensions]]. You may use the following tokens in the message:
-	 *
-	 * - {attribute}: the attribute name
-	 * - {extensions}: the list of the allowed extensions.
-	 */
-	public $wrongType;
-	/**
-	 * @var string the error message used if the count of multiple uploads exceeds limit.
-	 * You may use the following tokens in the message:
-	 *
-	 * - {attribute}: the attribute name
-	 * - {file}: the uploaded file name
-	 * - {limit}: the value of [[maxFiles]]
-	 */
-	public $tooMany;
-
-	/**
-	 * Initializes the validator.
-	 */
-	public function init()
-	{
-		parent::init();
-		if ($this->message === null) {
-			$this->message = Yii::t('yii|File upload failed.');
-		}
-		if ($this->uploadRequired === null) {
-			$this->uploadRequired = Yii::t('yii|Please upload a file.');
-		}
-		if ($this->tooMany === null) {
-			$this->tooMany = Yii::t('yii|You can upload at most {limit} files.');
-		}
-		if ($this->wrongType === null) {
-			$this->wrongType = Yii::t('yii|Only files with these extensions are allowed: {extensions}.');
-		}
-		if ($this->tooBig === null) {
-			$this->tooBig = Yii::t('yii|The file "{file}" is too big. Its size cannot exceed {limit} bytes.');
-		}
-		if ($this->tooSmall === null) {
-			$this->tooSmall = Yii::t('yii|The file "{file}" is too small. Its size cannot be smaller than {limit} bytes.');
-		}
-		if (!is_array($this->types)) {
-			$this->types = preg_split('/[\s,]+/', strtolower($this->types), -1, PREG_SPLIT_NO_EMPTY);
-		}
-	}
-
-	/**
-	 * Validates the attribute.
-	 * @param \yii\base\Model $object the object being validated
-	 * @param string $attribute the attribute being validated
-	 */
-	public function validateAttribute($object, $attribute)
-	{
-		if ($this->maxFiles > 1) {
-			$files = $object->$attribute;
-			if (!is_array($files)) {
-				$this->addError($object, $attribute, $this->uploadRequired);
-				return;
-			}
-			foreach ($files as $i => $file) {
-				if (!$file instanceof UploadedFile || $file->getError() == UPLOAD_ERR_NO_FILE) {
-					unset($files[$i]);
-				}
-			}
-			$object->$attribute = array_values($files);
-			if (empty($files)) {
-				$this->addError($object, $attribute, $this->uploadRequired);
-			}
-			if (count($files) > $this->maxFiles) {
-				$this->addError($object, $attribute, $this->tooMany, array('{attribute}' => $attribute, '{limit}' => $this->maxFiles));
-			} else {
-				foreach ($files as $file) {
-					$this->validateFile($object, $attribute, $file);
-				}
-			}
-		} else {
-			$file = $object->$attribute;
-			if ($file instanceof UploadedFile && $file->getError() != UPLOAD_ERR_NO_FILE) {
-				$this->validateFile($object, $attribute, $file);
-			} else {
-				$this->addError($object, $attribute, $this->uploadRequired);
-			}
-		}
-	}
-
-	/**
-	 * Internally validates a file object.
-	 * @param \yii\base\Model $object the object being validated
-	 * @param string $attribute the attribute being validated
-	 * @param UploadedFile $file uploaded file passed to check against a set of rules
-	 */
-	protected function validateFile($object, $attribute, $file)
-	{
-		switch ($file->getError()) {
-			case UPLOAD_ERR_OK:
-				if ($this->maxSize !== null && $file->getSize() > $this->maxSize) {
-					$this->addError($object, $attribute, $this->tooBig, array('{file}' => $file->getName(), '{limit}' => $this->getSizeLimit()));
-				}
-				if ($this->minSize !== null && $file->getSize() < $this->minSize) {
-					$this->addError($object, $attribute, $this->tooSmall, array('{file}' => $file->getName(), '{limit}' => $this->minSize));
-				}
-				if (!empty($this->types) && !in_array(strtolower(pathinfo($file->getName(), PATHINFO_EXTENSION)), $this->types, true)) {
-					$this->addError($object, $attribute, $this->wrongType, array('{file}' => $file->getName(), '{extensions}' => implode(', ', $this->types)));
-				}
-				break;
-			case UPLOAD_ERR_INI_SIZE:
-			case UPLOAD_ERR_FORM_SIZE:
-				$this->addError($object, $attribute, $this->tooBig, array('{file}' => $file->getName(), '{limit}' => $this->getSizeLimit()));
-				break;
-			case UPLOAD_ERR_PARTIAL:
-				$this->addError($object, $attribute, $this->message);
-				Yii::warning('File was only partially uploaded: ' . $file->getName(), __METHOD__);
-				break;
-			case UPLOAD_ERR_NO_TMP_DIR:
-				$this->addError($object, $attribute, $this->message);
-				Yii::warning('Missing the temporary folder to store the uploaded file: ' . $file->getName(), __METHOD__);
-				break;
-			case UPLOAD_ERR_CANT_WRITE:
-				$this->addError($object, $attribute, $this->message);
-				Yii::warning('Failed to write the uploaded file to disk: ' . $file->getName(), __METHOD__);
-				break;
-			case UPLOAD_ERR_EXTENSION:
-				$this->addError($object, $attribute, $this->message);
-				Yii::warning('File upload was stopped by some PHP extension: ' . $file->getName(), __METHOD__);
-				break;
-			default:
-				break;
-		}
-	}
-
-	/**
-	 * Returns the maximum size allowed for uploaded files.
-	 * This is determined based on three factors:
-	 *
-	 * - 'upload_max_filesize' in php.ini
-	 * - 'MAX_FILE_SIZE' hidden field
-	 * - [[maxSize]]
-	 *
-	 * @return integer the size limit for uploaded files.
-	 */
-	public function getSizeLimit()
-	{
-		$limit = ini_get('upload_max_filesize');
-		$limit = $this->sizeToBytes($limit);
-		if ($this->maxSize !== null && $limit > 0 && $this->maxSize < $limit) {
-			$limit = $this->maxSize;
-		}
-		if (isset($_POST['MAX_FILE_SIZE']) && $_POST['MAX_FILE_SIZE'] > 0 && $_POST['MAX_FILE_SIZE'] < $limit) {
-			$limit = (int)$_POST['MAX_FILE_SIZE'];
-		}
-		return $limit;
-	}
-
-	/**
-	 * Converts php.ini style size to bytes
-	 *
-	 * @param string $sizeStr $sizeStr
-	 * @return int
-	 */
-	private function sizeToBytes($sizeStr)
-	{
-		switch (substr($sizeStr, -1)) {
-			case 'M':
-			case 'm':
-				return (int)$sizeStr * 1048576;
-			case 'K':
-			case 'k':
-				return (int)$sizeStr * 1024;
-			case 'G':
-			case 'g':
-				return (int)$sizeStr * 1073741824;
-			default:
-				return (int)$sizeStr;
-		}
-	}
-}
diff --git a/framework/validators/FilterValidator.php b/framework/validators/FilterValidator.php
deleted file mode 100644
index 72a9a9d..0000000
--- a/framework/validators/FilterValidator.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\validators;
-use yii\base\InvalidConfigException;
-
-/**
- * FilterValidator converts the attribute value according to a filter.
- *
- * FilterValidator is actually not a validator but a data processor.
- * It invokes the specified filter callback to process the attribute value
- * and save the processed value back to the attribute. The filter must be
- * a valid PHP callback with the following signature:
- *
- * ~~~
- * function foo($value) {...return $newValue; }
- * ~~~
- *
- * Many PHP functions qualify this signature (e.g. `trim()`).
- *
- * To specify the filter, set [[filter]] property to be the callback.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class FilterValidator extends Validator
-{
-	/**
-	 * @var callback the filter. This can be a global function name, anonymous function, etc.
-	 * The function signature must be as follows,
-	 *
-	 * ~~~
-	 * function foo($value) {...return $newValue; }
-	 * ~~~
-	 */
-	public $filter;
-	/**
-	 * @var boolean this property is overwritten to be false so that this validator will
-	 * be applied when the value being validated is empty.
-	 */
-	public $skipOnEmpty = false;
-
-	/**
-	 * Initializes the validator.
-	 * @throws InvalidConfigException if [[filter]] is not set.
-	 */
-	public function init()
-	{
-		parent::init();
-		if ($this->filter === null) {
-			throw new InvalidConfigException('The "filter" property must be set.');
-		}
-	}
-
-	/**
-	 * Validates the attribute of the object.
-	 * If there is any error, the error message is added to the object.
-	 * @param \yii\base\Model $object the object being validated
-	 * @param string $attribute the attribute being validated
-	 * @throws InvalidConfigException if filter property is not a valid callback
-	 */
-	public function validateAttribute($object, $attribute)
-	{
-		$object->$attribute = call_user_func($this->filter, $object->$attribute);
-	}
-}
diff --git a/framework/validators/InlineValidator.php b/framework/validators/InlineValidator.php
deleted file mode 100644
index 8af5bbc..0000000
--- a/framework/validators/InlineValidator.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\validators;
-
-/**
- * InlineValidator represents a validator which is defined as a method in the object being validated.
- *
- * The validation method must have the following signature:
- *
- * ~~~
- * function foo($attribute, $params)
- * ~~~
- *
- * where `$attribute` refers to the name of the attribute being validated, while `$params`
- * is an array representing the additional parameters supplied in the validation rule.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class InlineValidator extends Validator
-{
-	/**
-	 * @var string|\Closure an anonymous function or the name of a model class method that will be
-	 * called to perform the actual validation. Note that if you use anonymous function, you cannot
-	 * use `$this` in it unless you are using PHP 5.4 or above.
-	 */
-	public $method;
-	/**
-	 * @var array additional parameters that are passed to the validation method
-	 */
-	public $params;
-	/**
-	 * @var string|\Closure an anonymous function or the name of a model class method that returns the client validation code.
-	 * The signature of the method should be like the following:
-	 *
-	 * ~~~
-	 * function foo($attribute)
-	 * {
-	 *     return "javascript";
-	 * }
-	 * ~~~
-	 *
-	 * where `$attribute` refers to the attribute name to be validated.
-	 *
-	 * Please refer to [[clientValidateAttribute()]] for details on how to return client validation code.
-	 */
-	public $clientValidate;
-
-	/**
-	 * Validates the attribute of the object.
-	 * @param \yii\base\Model $object the object being validated
-	 * @param string $attribute the attribute being validated
-	 */
-	public function validateAttribute($object, $attribute)
-	{
-		$method = $this->method;
-		if (is_string($method)) {
-			$method = array($object, $method);
-		}
-		call_user_func($method, $attribute, $this->params);
-	}
-
-	/**
-	 * Returns the JavaScript needed for performing client-side validation.
-	 *
-	 * You may override this method to return the JavaScript validation code if
-	 * the validator can support client-side validation.
-	 *
-	 * The following JavaScript variables are predefined and can be used in the validation code:
-	 *
-	 * - `attribute`: the name of the attribute being validated.
-	 * - `value`: the value being validated.
-	 * - `messages`: an array used to hold the validation error messages for the attribute.
-	 *
-	 * @param \yii\base\Model $object the data object being validated
-	 * @param string $attribute the name of the attribute to be validated.
-	 * @return string the client-side validation script. Null if the validator does not support
-	 * client-side validation.
-	 * @see enableClientValidation
-	 * @see \yii\web\ActiveForm::enableClientValidation
-	 */
-	public function clientValidateAttribute($object, $attribute)
-	{
-		if ($this->clientValidate !== null) {
-			$method = $this->clientValidate;
-			if (is_string($method)) {
-				$method = array($object, $method);
-			}
-			return call_user_func($method, $attribute);
-		} else {
-			return null;
-		}
-	}
-}
diff --git a/framework/validators/NumberValidator.php b/framework/validators/NumberValidator.php
deleted file mode 100644
index 10f0e52..0000000
--- a/framework/validators/NumberValidator.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\validators;
-
-use Yii;
-use yii\helpers\Html;
-use yii\web\JsExpression;
-use yii\helpers\Json;
-
-/**
- * NumberValidator validates that the attribute value is a number.
- *
- * The format of the number must match the regular expression specified in [[pattern]].
- * Optionally, you may configure the [[max]] and [[min]] properties to ensure the number
- * is within certain range.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class NumberValidator extends Validator
-{
-	/**
-	 * @var boolean whether the attribute value can only be an integer. Defaults to false.
-	 */
-	public $integerOnly = false;
-	/**
-	 * @var integer|float upper limit of the number. Defaults to null, meaning no upper limit.
-	 */
-	public $max;
-	/**
-	 * @var integer|float lower limit of the number. Defaults to null, meaning no lower limit.
-	 */
-	public $min;
-	/**
-	 * @var string user-defined error message used when the value is bigger than [[max]].
-	 */
-	public $tooBig;
-	/**
-	 * @var string user-defined error message used when the value is smaller than [[min]].
-	 */
-	public $tooSmall;
-	/**
-	 * @var string the regular expression for matching integers.
-	 */
-	public $integerPattern = '/^\s*[+-]?\d+\s*$/';
-	/**
-	 * @var string the regular expression for matching numbers. It defaults to a pattern
-	 * that matches floating numbers with optional exponential part (e.g. -1.23e-10).
-	 */
-	public $numberPattern = '/^\s*[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?\s*$/';
-
-
-	/**
-	 * Initializes the validator.
-	 */
-	public function init()
-	{
-		parent::init();
-		if ($this->message === null) {
-			$this->message = $this->integerOnly ? Yii::t('yii|{attribute} must be an integer.')
-				: Yii::t('yii|{attribute} must be a number.');
-		}
-		if ($this->min !== null && $this->tooSmall === null) {
-			$this->tooSmall = Yii::t('yii|{attribute} must be no less than {min}.');
-		}
-		if ($this->max !== null && $this->tooBig === null) {
-			$this->tooBig = Yii::t('yii|{attribute} must be no greater than {max}.');
-		}
-	}
-
-	/**
-	 * Validates the attribute of the object.
-	 * If there is any error, the error message is added to the object.
-	 * @param \yii\base\Model $object the object being validated
-	 * @param string $attribute the attribute being validated
-	 */
-	public function validateAttribute($object, $attribute)
-	{
-		$value = $object->$attribute;
-		if (is_array($value)) {
-			$this->addError($object, $attribute, Yii::t('yii|{attribute} is invalid.'));
-			return;
-		}
-		$pattern = $this->integerOnly ? $this->integerPattern : $this->numberPattern;
-		if (!preg_match($pattern, "$value")) {
-			$this->addError($object, $attribute, $this->message);
-		}
-		if ($this->min !== null && $value < $this->min) {
-			$this->addError($object, $attribute, $this->tooSmall, array('{min}' => $this->min));
-		}
-		if ($this->max !== null && $value > $this->max) {
-			$this->addError($object, $attribute, $this->tooBig, array('{max}' => $this->max));
-		}
-	}
-
-	/**
-	 * Validates the given value.
-	 * @param mixed $value the value to be validated.
-	 * @return boolean whether the value is valid.
-	 */
-	public function validateValue($value)
-	{
-		return preg_match($this->integerOnly ? $this->integerPattern : $this->numberPattern, "$value")
-			&& ($this->min === null || $value >= $this->min)
-			&& ($this->max === null || $value <= $this->max);
-	}
-
-	/**
-	 * Returns the JavaScript needed for performing client-side validation.
-	 * @param \yii\base\Model $object the data object being validated
-	 * @param string $attribute the name of the attribute to be validated.
-	 * @return string the client-side validation script.
-	 */
-	public function clientValidateAttribute($object, $attribute)
-	{
-		$label = $object->getAttributeLabel($attribute);
-		$value = $object->$attribute;
-
-		$options = array(
-			'pattern' => new JsExpression($this->integerOnly ? $this->integerPattern : $this->numberPattern),
-			'message' => Html::encode(strtr($this->message, array(
-				'{attribute}' => $label,
-				'{value}' => $value,
-			))),
-		);
-
-		if ($this->min !== null) {
-			$options['min'] = $this->min;
-			$options['tooSmall'] = Html::encode(strtr($this->tooSmall, array(
-				'{attribute}' => $label,
-				'{value}' => $value,
-				'{min}' => $this->min,
-			)));
-		}
-		if ($this->max !== null) {
-			$options['max'] = $this->max;
-			$options['tooBig'] = Html::encode(strtr($this->tooBig, array(
-				'{attribute}' => $label,
-				'{value}' => $value,
-				'{max}' => $this->max,
-			)));
-		}
-		if ($this->skipOnEmpty) {
-			$options['skipOnEmpty'] = 1;
-		}
-
-		return 'yii.validation.number(value, messages, ' . Json::encode($options) . ');';
-	}
-}
diff --git a/framework/validators/RangeValidator.php b/framework/validators/RangeValidator.php
deleted file mode 100644
index 2a9e15f..0000000
--- a/framework/validators/RangeValidator.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\validators;
-
-use Yii;
-use yii\base\InvalidConfigException;
-use yii\helpers\Html;
-
-/**
- * RangeValidator validates that the attribute value is among a list of values.
- *
- * The range can be specified via the [[range]] property.
- * If the [[not]] property is set true, the validator will ensure the attribute value
- * is NOT among the specified range.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class RangeValidator extends Validator
-{
-	/**
-	 * @var array list of valid values that the attribute value should be among
-	 */
-	public $range;
-	/**
-	 * @var boolean whether the comparison is strict (both type and value must be the same)
-	 */
-	public $strict = false;
-	/**
-	 * @var boolean whether to invert the validation logic. Defaults to false. If set to true,
-	 * the attribute value should NOT be among the list of values defined via [[range]].
-	 **/
- 	public $not = false;
-
-	/**
-	 * Initializes the validator.
-	 * @throws InvalidConfigException if [[range]] is not set.
-	 */
-	public function init()
-	{
-		parent::init();
-		if (!is_array($this->range)) {
-			throw new InvalidConfigException('The "range" property must be set.');
-		}
-		if ($this->message === null) {
-			$this->message = Yii::t('yii|{attribute} is invalid.');
-		}
-	}
-
-	/**
-	 * Validates the attribute of the object.
-	 * If there is any error, the error message is added to the object.
-	 * @param \yii\base\Model $object the object being validated
-	 * @param string $attribute the attribute being validated
-	 */
-	public function validateAttribute($object, $attribute)
-	{
-		$value = $object->$attribute;
-		if (!$this->validateValue($value)) {
-			$this->addError($object, $attribute, $this->message);
-		}
-	}
-
-	/**
-	 * Validates the given value.
-	 * @param mixed $value the value to be validated.
-	 * @return boolean whether the value is valid.
-	 */
-	public function validateValue($value)
-	{
-		return !$this->not && in_array($value, $this->range, $this->strict)
-			|| $this->not && !in_array($value, $this->range, $this->strict);
-	}
-
-	/**
-	 * Returns the JavaScript needed for performing client-side validation.
-	 * @param \yii\base\Model $object the data object being validated
-	 * @param string $attribute the name of the attribute to be validated.
-	 * @return string the client-side validation script.
-	 */
-	public function clientValidateAttribute($object, $attribute)
-	{
-		$range = array();
-		foreach ($this->range as $value) {
-			$range[] = (string)$value;
-		}
-		$options = array(
-			'range' => $range,
-			'not' => $this->not,
-			'message' => Html::encode(strtr($this->message, array(
-				'{attribute}' => $object->getAttributeLabel($attribute),
-				'{value}' => $object->$attribute,
-			))),
-		);
-		if ($this->skipOnEmpty) {
-			$options['skipOnEmpty'] = 1;
-		}
-
-		return 'yii.validation.range(value, messages, ' . json_encode($options) . ');';
-	}
-}
diff --git a/framework/validators/RegularExpressionValidator.php b/framework/validators/RegularExpressionValidator.php
deleted file mode 100644
index 23419b9..0000000
--- a/framework/validators/RegularExpressionValidator.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\validators;
-
-use Yii;
-use yii\base\InvalidConfigException;
-use yii\helpers\Html;
-use yii\web\JsExpression;
-use yii\helpers\Json;
-
-/**
- * RegularExpressionValidator validates that the attribute value matches the specified [[pattern]].
- *
- * If the [[not]] property is set true, the validator will ensure the attribute value do NOT match the [[pattern]].
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class RegularExpressionValidator extends Validator
-{
-	/**
-	 * @var string the regular expression to be matched with
-	 */
-	public $pattern;
-	/**
-	 * @var boolean whether to invert the validation logic. Defaults to false. If set to true,
-	 * the regular expression defined via [[pattern]] should NOT match the attribute value.
-	 * @throws InvalidConfigException if the "pattern" is not a valid regular expression
-	 **/
- 	public $not = false;
-
-	/**
-	 * Initializes the validator.
-	 * @throws InvalidConfigException if [[pattern]] is not set.
-	 */
-	public function init()
-	{
-		parent::init();
-		if ($this->pattern === null) {
-			throw new InvalidConfigException('The "pattern" property must be set.');
-		}
-		if ($this->message === null) {
-			$this->message = Yii::t('yii|{attribute} is invalid.');
-		}
-	}
-
-	/**
-	 * Validates the attribute of the object.
-	 * If there is any error, the error message is added to the object.
-	 * @param \yii\base\Model $object the object being validated
-	 * @param string $attribute the attribute being validated
-	 */
-	public function validateAttribute($object, $attribute)
-	{
-		$value = $object->$attribute;
-		if (!$this->validateValue($value)) {
-			$this->addError($object, $attribute, $this->message);
-		}
-	}
-
-	/**
-	 * Validates the given value.
-	 * @param mixed $value the value to be validated.
-	 * @return boolean whether the value is valid.
-	 */
-	public function validateValue($value)
-	{
-		return !is_array($value) &&
-			(!$this->not && preg_match($this->pattern, $value)
-			|| $this->not && !preg_match($this->pattern, $value));
-	}
-
-	/**
-	 * Returns the JavaScript needed for performing client-side validation.
-	 * @param \yii\base\Model $object the data object being validated
-	 * @param string $attribute the name of the attribute to be validated.
-	 * @return string the client-side validation script.
-	 * @throws InvalidConfigException if the "pattern" is not a valid regular expression
-	 */
-	public function clientValidateAttribute($object, $attribute)
-	{
-		$pattern = $this->pattern;
-		$pattern = preg_replace('/\\\\x\{?([0-9a-fA-F]+)\}?/', '\u$1', $pattern);
-		$deliminator = substr($pattern, 0, 1);
-		$pos = strrpos($pattern, $deliminator, 1);
-		$flag = substr($pattern, $pos + 1);
-		if ($deliminator !== '/') {
-			$pattern = '/' . str_replace('/', '\\/', substr($pattern, 1, $pos - 1)) . '/';
-		} else {
-			$pattern = substr($pattern, 0, $pos + 1);
-		}
-		if (!empty($flag)) {
-			$pattern .= preg_replace('/[^igm]/', '', $flag);
-		}
-
-		$options = array(
-			'pattern' => new JsExpression($pattern),
-			'not' => $this->not,
-			'message' => Html::encode(strtr($this->message, array(
-				'{attribute}' => $object->getAttributeLabel($attribute),
-				'{value}' => $object->$attribute,
-			))),
-		);
-		if ($this->skipOnEmpty) {
-			$options['skipOnEmpty'] = 1;
-		}
-
-		return 'yii.validation.regularExpression(value, messages, ' . Json::encode($options) . ');';
-	}
-}
diff --git a/framework/validators/RequiredValidator.php b/framework/validators/RequiredValidator.php
deleted file mode 100644
index 4c14a8d..0000000
--- a/framework/validators/RequiredValidator.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\validators;
-
-use Yii;
-use yii\helpers\Html;
-
-/**
- * RequiredValidator validates that the specified attribute does not have null or empty value.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class RequiredValidator extends Validator
-{
-	/**
-	 * @var boolean whether to skip this validator if the value being validated is empty.
-	 */
-	public $skipOnEmpty = false;
-	/**
-	 * @var mixed the desired value that the attribute must have.
-	 * If this is null, the validator will validate that the specified attribute is not empty.
-	 * If this is set as a value that is not null, the validator will validate that
-	 * the attribute has a value that is the same as this property value.
-	 * Defaults to null.
-	 * @see strict
-	 */
-	public $requiredValue;
-	/**
-	 * @var boolean whether the comparison between the attribute value and [[requiredValue]] is strict.
-	 * When this is true, both the values and types must match.
-	 * Defaults to false, meaning only the values need to match.
-	 * Note that when [[requiredValue]] is null, if this property is true, the validator will check
-	 * if the attribute value is null; If this property is false, the validator will call [[isEmpty]]
-	 * to check if the attribute value is empty.
-	 */
-	public $strict = false;
-	/**
-	 * @var string the user-defined error message. It may contain the following placeholders which
-	 * will be replaced accordingly by the validator:
-	 *
-	 * - `{attribute}`: the label of the attribute being validated
-	 * - `{value}`: the value of the attribute being validated
-	 * - `{requiredValue}`: the value of [[requiredValue]]
-	 */
-	public $message;
-
-	/**
-	 * Initializes the validator.
-	 */
-	public function init()
-	{
-		parent::init();
-		if ($this->message === null) {
-			$this->message = $this->requiredValue === null ? Yii::t('yii|{attribute} cannot be blank.')
-				: Yii::t('yii|{attribute} must be "{requiredValue}".');
-		}
-	}
-
-	/**
-	 * Validates the attribute of the object.
-	 * If there is any error, the error message is added to the object.
-	 * @param \yii\base\Model $object the object being validated
-	 * @param string $attribute the attribute being validated
-	 */
-	public function validateAttribute($object, $attribute)
-	{
-		if (!$this->validateValue($object->$attribute)) {
-			if ($this->requiredValue === null) {
-				$this->addError($object, $attribute, $this->message);
-			} else {
-				$this->addError($object, $attribute, $this->message, array(
-					'{requiredValue}' => $this->requiredValue,
-				));
-			}
-		}
-	}
-
-	/**
-	 * Validates the given value.
-	 * @param mixed $value the value to be validated.
-	 * @return boolean whether the value is valid.
-	 */
-	public function validateValue($value)
-	{
-		if ($this->requiredValue === null) {
-			if ($this->strict && $value !== null || !$this->strict && !$this->isEmpty($value, true)) {
-				return true;
-			}
-		} elseif (!$this->strict && $value == $this->requiredValue || $this->strict && $value === $this->requiredValue) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Returns the JavaScript needed for performing client-side validation.
-	 * @param \yii\base\Model $object the data object being validated
-	 * @param string $attribute the name of the attribute to be validated.
-	 * @return string the client-side validation script.
-	 */
-	public function clientValidateAttribute($object, $attribute)
-	{
-		$options = array();
-		if ($this->requiredValue !== null) {
-			$options['message'] = strtr($this->message, array(
-				'{requiredValue}' => $this->requiredValue,
-			));
-			$options['requiredValue'] = $this->requiredValue;
-		} else {
-			$options['message'] = $this->message;
-		}
-		if ($this->strict) {
-			$options['strict'] = 1;
-		}
-
-		$options['message'] = Html::encode(strtr($options['message'], array(
-			'{attribute}' => $object->getAttributeLabel($attribute),
-			'{value}' => $object->$attribute,
-		)));
-
-		return 'yii.validation.required(value, messages, ' . json_encode($options) . ');';
-	}
-}
diff --git a/framework/validators/StringValidator.php b/framework/validators/StringValidator.php
deleted file mode 100644
index 5d0fa1a..0000000
--- a/framework/validators/StringValidator.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\validators;
-
-use Yii;
-use yii\helpers\Html;
-
-/**
- * StringValidator validates that the attribute value is of certain length.
- *
- * Note, this validator should only be used with string-typed attributes.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class StringValidator extends Validator
-{
-	/**
-	 * @var integer maximum length. Defaults to null, meaning no maximum limit.
-	 */
-	public $max;
-	/**
-	 * @var integer minimum length. Defaults to null, meaning no minimum limit.
-	 */
-	public $min;
-	/**
-	 * @var integer exact length. Defaults to null, meaning no exact length limit.
-	 */
-	public $is;
-	/**
-	 * @var string user-defined error message used when the value is not a string
-	 */
-	public $message;
-	/**
-	 * @var string user-defined error message used when the length of the value is smaller than [[min]].
-	 */
-	public $tooShort;
-	/**
-	 * @var string user-defined error message used when the length of the value is greater than [[max]].
-	 */
-	public $tooLong;
-	/**
-	 * @var string user-defined error message used when the length of the value is not equal to [[is]].
-	 */
-	public $notEqual;
-	/**
-	 * @var string the encoding of the string value to be validated (e.g. 'UTF-8').
-	 * If this property is not set, [[\yii\base\Application::charset]] will be used.
-	 */
-	public $encoding;
-
-
-	/**
-	 * Initializes the validator.
-	 */
-	public function init()
-	{
-		parent::init();
-		if ($this->encoding === null) {
-			$this->encoding = Yii::$app->charset;
-		}
-		if ($this->message === null) {
-			$this->message = Yii::t('yii|{attribute} must be a string.');
-		}
-		if ($this->min !== null && $this->tooShort === null) {
-			$this->tooShort = Yii::t('yii|{attribute} should contain at least {min} characters.');
-		}
-		if ($this->max !== null && $this->tooLong === null) {
-			$this->tooLong = Yii::t('yii|{attribute} should contain at most {max} characters.');
-		}
-		if ($this->is !== null && $this->notEqual === null) {
-			$this->notEqual = Yii::t('yii|{attribute} should contain {length} characters.');
-		}
-	}
-
-	/**
-	 * Validates the attribute of the object.
-	 * If there is any error, the error message is added to the object.
-	 * @param \yii\base\Model $object the object being validated
-	 * @param string $attribute the attribute being validated
-	 */
-	public function validateAttribute($object, $attribute)
-	{
-		$value = $object->$attribute;
-
-		if (!is_string($value)) {
-			$this->addError($object, $attribute, $this->message);
-			return;
-		}
-
-		$length = mb_strlen($value, $this->encoding);
-
-		if ($this->min !== null && $length < $this->min) {
-			$this->addError($object, $attribute, $this->tooShort, array('{min}' => $this->min));
-		}
-		if ($this->max !== null && $length > $this->max) {
-			$this->addError($object, $attribute, $this->tooLong, array('{max}' => $this->max));
-		}
-		if ($this->is !== null && $length !== $this->is) {
-			$this->addError($object, $attribute, $this->notEqual, array('{length}' => $this->is));
-		}
-	}
-
-	/**
-	 * Validates the given value.
-	 * @param mixed $value the value to be validated.
-	 * @return boolean whether the value is valid.
-	 */
-	public function validateValue($value)
-	{
-		if (!is_string($value)) {
-			return false;
-		}
-		$length = mb_strlen($value, $this->encoding);
-		return ($this->min === null || $length >= $this->min)
-			&& ($this->max === null || $length <= $this->max)
-			&& ($this->is === null || $length === $this->is);
-	}
-
-	/**
-	 * Returns the JavaScript needed for performing client-side validation.
-	 * @param \yii\base\Model $object the data object being validated
-	 * @param string $attribute the name of the attribute to be validated.
-	 * @return string the client-side validation script.
-	 */
-	public function clientValidateAttribute($object, $attribute)
-	{
-		$label = $object->getAttributeLabel($attribute);
-		$value = $object->$attribute;
-
-		$options = array(
-			'message' => Html::encode(strtr($this->message, array(
-				'{attribute}' => $label,
-				'{value}' => $value,
-			))),
-		);
-
-		if ($this->min !== null) {
-			$options['min'] = $this->min;
-			$options['tooShort'] = Html::encode(strtr($this->tooShort, array(
-				'{attribute}' => $label,
-				'{value}' => $value,
-				'{min}' => $this->min,
-			)));
-		}
-		if ($this->max !== null) {
-			$options['max'] = $this->max;
-			$options['tooLong'] = Html::encode(strtr($this->tooLong, array(
-				'{attribute}' => $label,
-				'{value}' => $value,
-				'{max}' => $this->max,
-			)));
-		}
-		if ($this->is !== null) {
-			$options['is'] = $this->is;
-			$options['notEqual'] = Html::encode(strtr($this->notEqual, array(
-				'{attribute}' => $label,
-				'{value}' => $value,
-				'{length}' => $this->is,
-			)));
-		}
-		if ($this->skipOnEmpty) {
-			$options['skipOnEmpty'] = 1;
-		}
-
-		return 'yii.validation.string(value, messages, ' . json_encode($options) . ');';
-	}
-}
-
diff --git a/framework/validators/UniqueValidator.php b/framework/validators/UniqueValidator.php
deleted file mode 100644
index 7072ff4..0000000
--- a/framework/validators/UniqueValidator.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\validators;
-
-use Yii;
-use yii\base\InvalidConfigException;
-
-/**
- * CUniqueValidator validates that the attribute value is unique in the corresponding database table.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class UniqueValidator extends Validator
-{
-	/**
-	 * @var string the ActiveRecord class name or alias of the class
-	 * that should be used to look for the attribute value being validated.
-	 * Defaults to null, meaning using the ActiveRecord class of the attribute being validated.
-	 * @see attributeName
-	 */
-	public $className;
-	/**
-	 * @var string the ActiveRecord class attribute name that should be
-	 * used to look for the attribute value being validated. Defaults to null,
-	 * meaning using the name of the attribute being validated.
-	 */
-	public $attributeName;
-
-	/**
-	 * Initializes the validator.
-	 */
-	public function init()
-	{
-		parent::init();
-		if ($this->message === null) {
-			$this->message = Yii::t('yii|{attribute} "{value}" has already been taken.');
-		}
-	}
-
-	/**
-	 * Validates the attribute of the object.
-	 * If there is any error, the error message is added to the object.
-	 * @param \yii\db\ActiveRecord $object the object being validated
-	 * @param string $attribute the attribute being validated
-	 * @throws InvalidConfigException if table doesn't have column specified
-	 */
-	public function validateAttribute($object, $attribute)
-	{
-		$value = $object->$attribute;
-
-		if (is_array($value)) {
-			$this->addError($object, $attribute, Yii::t('yii|{attribute} is invalid.'));
-			return;
-		}
-
-		/** @var $className \yii\db\ActiveRecord */
-		$className = $this->className === null ? get_class($object) : Yii::import($this->className);
-		$attributeName = $this->attributeName === null ? $attribute : $this->attributeName;
-
-		$table = $className::getTableSchema();
-		if (($column = $table->getColumn($attributeName)) === null) {
-			throw new InvalidConfigException("Table '{$table->name}' does not have a column named '$attributeName'.");
-		}
-
-		$query = $className::find();
-		$query->where(array($column->name => $value));
-
-		if ($object->getIsNewRecord()) {
-			// if current $object isn't in the database yet then it's OK just to call exists()
-			$exists = $query->exists();
-		} else {
-			// if current $object is in the database already we can't use exists()
-			$query->limit(2);
-			$objects = $query->all();
-
-			$n = count($objects);
-			if ($n === 1) {
-				if ($column->isPrimaryKey) {
-					// primary key is modified and not unique
-					$exists = $object->getOldPrimaryKey() != $object->getPrimaryKey();
-				} else {
-					// non-primary key, need to exclude the current record based on PK
-					$exists = array_shift($objects)->getPrimaryKey() != $object->getOldPrimaryKey();
-				}
-			} else {
-				$exists = $n > 1;
-			}
-		}
-
-		if ($exists) {
-			$this->addError($object, $attribute, $this->message);
-		}
-	}
-}
diff --git a/framework/validators/UrlValidator.php b/framework/validators/UrlValidator.php
deleted file mode 100644
index c418353..0000000
--- a/framework/validators/UrlValidator.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\validators;
-
-use Yii;
-use yii\helpers\Html;
-use yii\web\JsExpression;
-use yii\helpers\Json;
-
-/**
- * UrlValidator validates that the attribute value is a valid http or https URL.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class UrlValidator extends Validator
-{
-	/**
-	 * @var string the regular expression used to validate the attribute value.
-	 * The pattern may contain a `{schemes}` token that will be replaced
-	 * by a regular expression which represents the [[validSchemes]].
-	 */
-	public $pattern = '/^{schemes}:\/\/(([A-Z0-9][A-Z0-9_-]*)(\.[A-Z0-9][A-Z0-9_-]*)+)/i';
-	/**
-	 * @var array list of URI schemes which should be considered valid. By default, http and https
-	 * are considered to be valid schemes.
-	 **/
-	public $validSchemes = array('http', 'https');
-	/**
-	 * @var string the default URI scheme. If the input doesn't contain the scheme part, the default
-	 * scheme will be prepended to it (thus changing the input). Defaults to null, meaning a URL must
-	 * contain the scheme part.
-	 **/
-	public $defaultScheme;
-
-
-	/**
-	 * Initializes the validator.
-	 */
-	public function init()
-	{
-		parent::init();
-		if ($this->message === null) {
-			$this->message = Yii::t('yii|{attribute} is not a valid URL.');
-		}
-	}
-
-	/**
-	 * Validates the attribute of the object.
-	 * If there is any error, the error message is added to the object.
-	 * @param \yii\base\Model $object the object being validated
-	 * @param string $attribute the attribute being validated
-	 */
-	public function validateAttribute($object, $attribute)
-	{
-		$value = $object->$attribute;
-		if ($this->validateValue($value)) {
-			if ($this->defaultScheme !== null && strpos($value, '://') === false) {
-				$object->$attribute = $this->defaultScheme . '://' . $value;
-			}
-		} else {
-			$this->addError($object, $attribute, $this->message);
-		}
-	}
-
-	/**
-	 * Validates the given value.
-	 * @param mixed $value the value to be validated.
-	 * @return boolean whether the value is valid.
-	 */
-	public function validateValue($value)
-	{
-		// make sure the length is limited to avoid DOS attacks
-		if (is_string($value) && strlen($value) < 2000) {
-			if ($this->defaultScheme !== null && strpos($value, '://') === false) {
-				$value = $this->defaultScheme . '://' . $value;
-			}
-
-			if (strpos($this->pattern, '{schemes}') !== false) {
-				$pattern = str_replace('{schemes}', '(' . implode('|', $this->validSchemes) . ')', $this->pattern);
-			} else {
-				$pattern = $this->pattern;
-			}
-
-			if (preg_match($pattern, $value)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Returns the JavaScript needed for performing client-side validation.
-	 * @param \yii\base\Model $object the data object being validated
-	 * @param string $attribute the name of the attribute to be validated.
-	 * @return string the client-side validation script.
-	 * @see \yii\Web\ActiveForm::enableClientValidation
-	 */
-	public function clientValidateAttribute($object, $attribute)
-	{
-		if (strpos($this->pattern, '{schemes}') !== false) {
-			$pattern = str_replace('{schemes}', '(' . implode('|', $this->validSchemes) . ')', $this->pattern);
-		} else {
-			$pattern = $this->pattern;
-		}
-
-		$options = array(
-			'pattern' => new JsExpression($pattern),
-			'message' => Html::encode(strtr($this->message, array(
-				'{attribute}' => $object->getAttributeLabel($attribute),
-				'{value}' => $object->$attribute,
-			))),
-		);
-		if ($this->skipOnEmpty) {
-			$options['skipOnEmpty'] = 1;
-		}
-		if ($this->defaultScheme !== null) {
-			$options['defaultScheme'] = $this->defaultScheme;
-		}
-
-		return 'yii.validation.url(value, messages, ' . Json::encode($options) . ');';
-	}
-}
-
diff --git a/framework/validators/Validator.php b/framework/validators/Validator.php
deleted file mode 100644
index 677191b..0000000
--- a/framework/validators/Validator.php
+++ /dev/null
@@ -1,268 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\validators;
-
-use Yii;
-use yii\base\Component;
-use yii\base\NotSupportedException;
-
-/**
- * Validator is the base class for all validators.
- *
- * Child classes should override the [[validateAttribute()]] method to provide the actual
- * logic of performing data validation. Child classes may also override [[clientValidateAttribute()]]
- * to provide client-side validation support.
- *
- * Validator declares a set of [[builtInValidators|built-in validators] which can
- * be referenced using short names. They are listed as follows:
- *
- * - `boolean`: [[BooleanValidator]]
- * - `captcha`: [[CaptchaValidator]]
- * - `compare`: [[CompareValidator]]
- * - `date`: [[DateValidator]]
- * - `default`: [[DefaultValueValidator]]
- * - `double`: [[NumberValidator]]
- * - `email`: [[EmailValidator]]
- * - `exist`: [[ExistValidator]]
- * - `file`: [[FileValidator]]
- * - `filter`: [[FilterValidator]]
- * - `in`: [[RangeValidator]]
- * - `integer`: [[NumberValidator]]
- * - `match`: [[RegularExpressionValidator]]
- * - `required`: [[RequiredValidator]]
- * - `string`: [[StringValidator]]
- * - `unique`: [[UniqueValidator]]
- * - `url`: [[UrlValidator]]
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-abstract class Validator extends Component
-{
-	/**
-	 * @var array list of built-in validators (name => class or configuration)
-	 */
-	public static $builtInValidators = array(
-		'boolean' => 'yii\validators\BooleanValidator',
-		'captcha' => 'yii\validators\CaptchaValidator',
-		'compare' => 'yii\validators\CompareValidator',
-		'date' => 'yii\validators\DateValidator',
-		'default' => 'yii\validators\DefaultValueValidator',
-		'double' => 'yii\validators\NumberValidator',
-		'email' => 'yii\validators\EmailValidator',
-		'exist' => 'yii\validators\ExistValidator',
-		'file' => 'yii\validators\FileValidator',
-		'filter' => 'yii\validators\FilterValidator',
-		'in' => 'yii\validators\RangeValidator',
-		'integer' => array(
-			'class' => 'yii\validators\NumberValidator',
-			'integerOnly' => true,
-		),
-		'match' => 'yii\validators\RegularExpressionValidator',
-		'number' => 'yii\validators\NumberValidator',
-		'required' => 'yii\validators\RequiredValidator',
-		'string' => 'yii\validators\StringValidator',
-		'unique' => 'yii\validators\UniqueValidator',
-		'url' => 'yii\validators\UrlValidator',
-	);
-
-	/**
-	 * @var array list of attributes to be validated.
-	 */
-	public $attributes;
-	/**
-	 * @var string the user-defined error message. It may contain the following placeholders which
-	 * will be replaced accordingly by the validator:
-	 *
-	 * - `{attribute}`: the label of the attribute being validated
-	 * - `{value}`: the value of the attribute being validated
-	 */
-	public $message;
-	/**
-	 * @var array list of scenarios that the validator can be applied to.
-	 */
-	public $on = array();
-	/**
-	 * @var array list of scenarios that the validator should not be applied to.
-	 */
-	public $except = array();
-	/**
-	 * @var boolean whether this validation rule should be skipped if the attribute being validated
-	 * already has some validation error according to some previous rules. Defaults to true.
-	 */
-	public $skipOnError = true;
-	/**
-	 * @var boolean whether this validation rule should be skipped if the attribute value
-	 * is null or an empty string.
-	 */
-	public $skipOnEmpty = true;
-	/**
-	 * @var boolean whether to enable client-side validation for this validator.
-	 * The actual client-side validation is done via the JavaScript code returned
-	 * by [[clientValidateAttribute()]]. If that method returns null, even if this property
-	 * is true, no client-side validation will be done by this validator.
-	 */
-	public $enableClientValidation = true;
-
-	/**
-	 * Validates a single attribute.
-	 * Child classes must implement this method to provide the actual validation logic.
-	 * @param \yii\base\Model $object the data object to be validated
-	 * @param string $attribute the name of the attribute to be validated.
-	 */
-	abstract public function validateAttribute($object, $attribute);
-
-	/**
-	 * Creates a validator object.
-	 * @param string $type the validator type. This can be a method name,
-	 * a built-in validator name, a class name, or a path alias of the validator class.
-	 * @param \yii\base\Model $object the data object to be validated.
-	 * @param array|string $attributes list of attributes to be validated. This can be either an array of
-	 * the attribute names or a string of comma-separated attribute names.
-	 * @param array $params initial values to be applied to the validator properties
-	 * @return Validator the validator
-	 */
-	public static function createValidator($type, $object, $attributes, $params = array())
-	{
-		if (!is_array($attributes)) {
-			$attributes = preg_split('/[\s,]+/', $attributes, -1, PREG_SPLIT_NO_EMPTY);
-		}
-		$params['attributes'] = $attributes;
-
-		if (isset($params['on']) && !is_array($params['on'])) {
-			$params['on'] = preg_split('/[\s,]+/', $params['on'], -1, PREG_SPLIT_NO_EMPTY);
-		}
-
-		if (isset($params['except']) && !is_array($params['except'])) {
-			$params['except'] = preg_split('/[\s,]+/', $params['except'], -1, PREG_SPLIT_NO_EMPTY);
-		}
-
-		if (method_exists($object, $type)) {
-			// method-based validator
-			$params['class'] = __NAMESPACE__ . '\InlineValidator';
-			$params['method'] = $type;
-		} else {
-			if (isset(self::$builtInValidators[$type])) {
-				$type = self::$builtInValidators[$type];
-			}
-			if (is_array($type)) {
-				foreach ($type as $name => $value) {
-					$params[$name] = $value;
-				}
-			} else {
-				$params['class'] = $type;
-			}
-		}
-
-		return Yii::createObject($params);
-	}
-
-	/**
-	 * Validates the specified object.
-	 * @param \yii\base\Model $object the data object being validated
-	 * @param array|null $attributes the list of attributes to be validated.
-	 * Note that if an attribute is not associated with the validator,
-	 * it will be ignored.
-	 * If this parameter is null, every attribute listed in [[attributes]] will be validated.
-	 */
-	public function validate($object, $attributes = null)
-	{
-		if (is_array($attributes)) {
-			$attributes = array_intersect($this->attributes, $attributes);
-		} else {
-			$attributes = $this->attributes;
-		}
-		foreach ($attributes as $attribute) {
-			$skip = $this->skipOnError && $object->hasErrors($attribute)
-				 || $this->skipOnEmpty && $this->isEmpty($object->$attribute);
-			if (!$skip) {
-				$this->validateAttribute($object, $attribute);
-			}
-		}
-	}
-
-	/**
-	 * Validates a value.
-	 * A validator class can implement this method to support data validation out of the context of a data model.
-	 * @param mixed $value the data value to be validated.
-	 * @throws NotSupportedException if data validation without a model is not supported
-	 */
-	public function validateValue($value)
-	{
-		throw new NotSupportedException(get_class($this) . ' does not support validateValue().');
-	}
-
-	/**
-	 * Returns the JavaScript needed for performing client-side validation.
-	 *
-	 * You may override this method to return the JavaScript validation code if
-	 * the validator can support client-side validation.
-	 *
-	 * The following JavaScript variables are predefined and can be used in the validation code:
-	 *
-	 * - `attribute`: the name of the attribute being validated.
-	 * - `value`: the value being validated.
-	 * - `messages`: an array used to hold the validation error messages for the attribute.
-	 *
-	 * @param \yii\base\Model $object the data object being validated
-	 * @param string $attribute the name of the attribute to be validated.
-	 * @return string the client-side validation script. Null if the validator does not support
-	 * client-side validation.
-	 * @see \yii\web\ActiveForm::enableClientValidation
-	 */
-	public function clientValidateAttribute($object, $attribute)
-	{
-		return null;
-	}
-
-	/**
-	 * Returns a value indicating whether the validator is active for the given scenario and attribute.
-	 *
-	 * A validator is active if
-	 *
-	 * - the validator's `on` property is empty, or
-	 * - the validator's `on` property contains the specified scenario
-	 *
-	 * @param string $scenario scenario name
-	 * @return boolean whether the validator applies to the specified scenario.
-	 */
-	public function isActive($scenario)
-	{
-		return !in_array($scenario, $this->except, true) && (empty($this->on) || in_array($scenario, $this->on, true));
-	}
-
-	/**
-	 * Adds an error about the specified attribute to the model object.
-	 * This is a helper method that performs message selection and internationalization.
-	 * @param \yii\base\Model $object the data object being validated
-	 * @param string $attribute the attribute being validated
-	 * @param string $message the error message
-	 * @param array $params values for the placeholders in the error message
-	 */
-	public function addError($object, $attribute, $message, $params = array())
-	{
-		$value = $object->$attribute;
-		$params['{attribute}'] = $object->getAttributeLabel($attribute);
-		$params['{value}'] = is_array($value) ? 'array()' : $value;
-		$object->addError($attribute, strtr($message, $params));
-	}
-
-	/**
-	 * Checks if the given value is empty.
-	 * A value is considered empty if it is null, an empty array, or the trimmed result is an empty string.
-	 * Note that this method is different from PHP empty(). It will return false when the value is 0.
-	 * @param mixed $value the value to be checked
-	 * @param boolean $trim whether to perform trimming before checking if the string is empty. Defaults to false.
-	 * @return boolean whether the value is empty
-	 */
-	public function isEmpty($value, $trim = false)
-	{
-		return $value === null || $value === array() || $value === ''
-			|| $trim && is_scalar($value) && trim($value) === '';
-	}
-}
diff --git a/framework/views/error.php b/framework/views/error.php
deleted file mode 100644
index 009050a..0000000
--- a/framework/views/error.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * @var \Exception $exception
- * @var \yii\base\ErrorHandler $context
- */
-$context = $this->context;
-$title = $context->htmlEncode($exception instanceof \yii\base\Exception ? $exception->getName() : get_class($exception));
-?>
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8" />
-	<title><?php echo $title?></title>
-
-	<style>
-	body {
-		font: normal 9pt "Verdana";
-		color: #000;
-		background: #fff;
-	}
-
-	h1 {
-		font: normal 18pt "Verdana";
-		color: #f00;
-		margin-bottom: .5em;
-	}
-
-	h2 {
-		font: normal 14pt "Verdana";
-		color: #800000;
-		margin-bottom: .5em;
-	}
-
-	h3 {
-		font: bold 11pt "Verdana";
-	}
-
-	p {
-		font: normal 9pt "Verdana";
-		color: #000;
-	}
-
-	.version {
-		color: gray;
-		font-size: 8pt;
-		border-top: 1px solid #aaa;
-		padding-top: 1em;
-		margin-bottom: 1em;
-	}
-	</style>
-</head>
-
-<body>
-	<h1><?php echo $title?></h1>
-	<h2><?php echo nl2br($context->htmlEncode($exception->getMessage()))?></h2>
-	<p>
-		The above error occurred while the Web server was processing your request.
-	</p>
-	<p>
-		Please contact us if you think this is a server error. Thank you.
-	</p>
-	<div class="version">
-		<?php echo date('Y-m-d H:i:s', time())?>
-		<?php echo YII_DEBUG ? $context->versionInfo : ''?>
-	</div>
-</body>
-</html>
diff --git a/framework/views/exception.php b/framework/views/exception.php
deleted file mode 100644
index f2aced0..0000000
--- a/framework/views/exception.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-/**
- * @var \Exception $exception
- * @var \yii\base\ErrorHandler $context
- */
-$context = $this->context;
-$title = $context->htmlEncode($exception instanceof \yii\base\Exception ? $exception->getName().' ('.get_class($exception).')' : get_class($exception));
-?>
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8" />
-	<title><?php echo $title?></title>
-	<style>
-	html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{border:0;outline:0;font-size:100%;vertical-align:baseline;background:transparent;margin:0;padding:0;}
-	body{line-height:1;}
-	ol,ul{list-style:none;}
-	blockquote,q{quotes:none;}
-	blockquote:before,blockquote:after,q:before,q:after{content:none;}
-	:focus{outline:0;}
-	ins{text-decoration:none;}
-	del{text-decoration:line-through;}
-	table{border-collapse:collapse;border-spacing:0;}
-
-	body {
-		font: normal 9pt "Verdana";
-		color: #000;
-		background: #fff;
-	}
-
-	h1 {
-		font: normal 18pt "Verdana";
-		color: #f00;
-		margin-bottom: .5em;
-	}
-
-	h2 {
-		font: normal 14pt "Verdana";
-		color: #800000;
-		margin-bottom: .5em;
-	}
-
-	h3 {
-		font: bold 11pt "Verdana";
-	}
-
-	pre {
-		font: normal 11pt Menlo, Consolas, "Lucida Console", Monospace;
-	}
-
-	pre span.error {
-		display: block;
-		background: #fce3e3;
-	}
-
-	pre span.ln {
-		color: #999;
-		padding-right: 0.5em;
-		border-right: 1px solid #ccc;
-	}
-
-	pre span.error-ln {
-		font-weight: bold;
-	}
-
-	.container {
-		margin: 1em 4em;
-	}
-
-	.version {
-		color: gray;
-		font-size: 8pt;
-		border-top: 1px solid #aaa;
-		padding-top: 1em;
-		margin-bottom: 1em;
-	}
-
-	.message {
-		color: #000;
-		padding: 1em;
-		font-size: 11pt;
-		background: #f3f3f3;
-		-webkit-border-radius: 10px;
-		-moz-border-radius: 10px;
-		border-radius: 10px;
-		margin-bottom: 1em;
-		line-height: 160%;
-	}
-
-	.source {
-		margin-bottom: 1em;
-	}
-
-	.code pre {
-		background-color: #ffe;
-		margin: 0.5em 0;
-		padding: 0.5em;
-		line-height: 125%;
-		border: 1px solid #eee;
-	}
-
-	.source .file {
-		margin-bottom: 1em;
-		font-weight: bold;
-	}
-
-	.traces {
-		margin: 2em 0;
-	}
-
-	.trace {
-		margin: 0.5em 0;
-		padding: 0.5em;
-	}
-
-	.trace.app {
-		border: 1px dashed #c00;
-	}
-
-	.trace .number {
-		text-align: right;
-		width: 2em;
-		padding: 0.5em;
-	}
-
-	.trace .content {
-		padding: 0.5em;
-	}
-
-	.trace .plus,
-	.trace .minus {
-		display: inline;
-		vertical-align: middle;
-		text-align: center;
-		border: 1px solid #000;
-		color: #000;
-		font-size: 10px;
-		line-height: 10px;
-		margin: 0;
-		padding: 0 1px;
-		width: 10px;
-		height: 10px;
-	}
-
-	.trace.collapsed .minus,
-	.trace.expanded .plus,
-	.trace.collapsed pre {
-		display: none;
-	}
-
-	.trace-file {
-		cursor: pointer;
-		padding: 0.2em;
-	}
-
-	.trace-file:hover {
-		background: #f0ffff;
-	}
-	</style>
-</head>
-
-<body>
-<div class="container">
-	<h1><?php echo $title?></h1>
-
-	<p class="message">
-		<?php echo nl2br($context->htmlEncode($exception->getMessage()))?>
-	</p>
-
-	<div class="source">
-		<p class="file">
-			<?php echo $context->htmlEncode($exception->getFile()) . '(' . $exception->getLine() . ')'?>
-		</p>
-		<?php if (YII_DEBUG) $context->renderSourceCode($exception->getFile(), $exception->getLine(), $context->maxSourceLines)?>
-	</div>
-
-	<?php if (YII_DEBUG):?>
-	<div class="traces">
-		<h2>Stack Trace</h2>
-		<?php $context->renderTrace($exception->getTrace())?>
-	</div>
-	<?php endif?>
-
-	<div class="version">
-		<?php echo date('Y-m-d H:i:s', time())?>
-		<?php echo YII_DEBUG ? $context->getVersionInfo() : ''?>
-	</div>
-</div>
-
-<script>
-var traceReg = new RegExp("(^|\\s)trace-file(\\s|$)");
-var collapsedReg = new RegExp("(^|\\s)collapsed(\\s|$)");
-
-var e = document.getElementsByTagName("div");
-for(var j=0,len=e.length;j<len;j++){
-	if(traceReg.test(e[j].className)){
-		e[j].onclick = function(){
-			var trace = this.parentNode.parentNode;
-			if(collapsedReg.test(trace.className)){
-				trace.className = trace.className.replace("collapsed", "expanded");
-			}
-			else{
-				trace.className = trace.className.replace("expanded", "collapsed");
-			}
-		}
-	}
-}
-</script>
-
-</body>
-</html>
diff --git a/framework/views/migration.php b/framework/views/migration.php
deleted file mode 100644
index a75e22f..0000000
--- a/framework/views/migration.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * This view is used by console/controllers/MigrateController.php
- * The following variables are available in this view:
- *
- * @var string $className the new migration class name
- */
-echo "<?php\n";
-?>
-
-class <?php echo $className; ?> extends \yii\db\Migration
-{
-	public function up()
-	{
-
-	}
-
-	public function down()
-	{
-		echo "<?php echo $className; ?> cannot be reverted.\n";
-		return false;
-	}
-}
diff --git a/framework/web/AccessControl.php b/framework/web/AccessControl.php
deleted file mode 100644
index e890510..0000000
--- a/framework/web/AccessControl.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-use Yii;
-use yii\base\Action;
-use yii\base\ActionFilter;
-use yii\base\HttpException;
-
-/**
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class AccessControl extends ActionFilter
-{
-	/**
-	 * @var callback a callback that will be called if the access should be denied
-	 * to the current user. If not set, [[denyAccess()]] will be called.
-	 *
-	 * The signature of the callback should be as follows:
-	 *
-	 * ~~~
-	 * function ($rule, $action)
-	 * ~~~
-	 *
-	 * where `$rule` is this rule, and `$action` is the current [[Action|action]] object.
-	 */
-	public $denyCallback;
-	/**
-	 * @var array the default configuration of access rules. Individual rule configurations
-	 * specified via [[rules]] will take precedence when the same property of the rule is configured.
-	 */
-	public $ruleConfig = array(
-		'class' => 'yii\web\AccessRule',
-	);
-	/**
-	 * @var array a list of access rule objects or configuration arrays for creating the rule objects.
-	 * If a rule is specified via a configuration array, it will be merged with [[ruleConfig]] first
-	 * before it is used for creating the rule object.
-	 * @see ruleConfig
-	 */
-	public $rules = array();
-
-	/**
-	 * Initializes the [[rules]] array by instantiating rule objects from configurations.
-	 */
-	public function init()
-	{
-		parent::init();
-		foreach ($this->rules as $i => $rule) {
-			if (is_array($rule)) {
-				$this->rules[$i] = Yii::createObject(array_merge($this->ruleConfig, $rule));
-			}
-		}
-	}
-
-	/**
-	 * This method is invoked right before an action is to be executed (after all possible filters.)
-	 * You may override this method to do last-minute preparation for the action.
-	 * @param Action $action the action to be executed.
-	 * @return boolean whether the action should continue to be executed.
-	 */
-	public function beforeAction($action)
-	{
-		$user = Yii::$app->getUser();
-		$request = Yii::$app->getRequest();
-		/** @var $rule AccessRule */
-		foreach ($this->rules as $rule) {
-			if ($allow = $rule->allows($action, $user, $request)) {
-				break;
-			} elseif ($allow === false) {
-				if (isset($rule->denyCallback)) {
-					call_user_func($rule->denyCallback, $rule);
-				} elseif (isset($this->denyCallback)) {
-					call_user_func($this->denyCallback, $rule);
-				} else {
-					$this->denyAccess($user);
-				}
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Denies the access of the user.
-	 * The default implementation will redirect the user to the login page if he is a guest;
-	 * if the user is already logged, a 403 HTTP exception will be thrown.
-	 * @param User $user the current user
-	 * @throws HttpException if the user is already logged in.
-	 */
-	protected function denyAccess($user)
-	{
-		if ($user->getIsGuest()) {
-			$user->loginRequired();
-		} else {
-			throw new HttpException(403, Yii::t('yii|You are not allowed to perform this action.'));
-		}
-	}
-}
diff --git a/framework/web/AccessRule.php b/framework/web/AccessRule.php
deleted file mode 100644
index e565e18..0000000
--- a/framework/web/AccessRule.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-use yii\base\Component;
-use yii\base\Action;
-
-/**
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class AccessRule extends Component
-{
-	/**
-	 * @var boolean whether this is an 'allow' rule or 'deny' rule.
-	 */
-	public $allow;
-	/**
-	 * @var array list of action IDs that this rule applies to. The comparison is case-sensitive.
-	 * If not set or empty, it means this rule applies to all actions.
-	 */
-	public $actions;
-	/**
-	 * @var array list of controller IDs that this rule applies to. The comparison is case-sensitive.
-	 * If not set or empty, it means this rule applies to all controllers.
-	 */
-	public $controllers;
-	/**
-	 * @var array list of roles that this rule applies to. Two special roles are recognized, and
-	 * they are checked via [[User::isGuest]]:
-	 *
-	 * - `?`: matches a guest user (not authenticated yet)
-	 * - `@`: matches an authenticated user
-	 *
-	 * Using additional role names requires RBAC (Role-Based Access Control), and
-	 * [[User::hasAccess()]] will be called.
-	 *
-	 * If this property is not set or empty, it means this rule applies to all roles.
-	 */
-	public $roles;
-	/**
-	 * @var array list of user IP addresses that this rule applies to. An IP address
-	 * can contain the wildcard `*` at the end so that it matches IP addresses with the same prefix.
-	 * For example, '192.168.*' matches all IP addresses in the segment '192.168.'.
-	 * If not set or empty, it means this rule applies to all IP addresses.
-	 * @see Request::userIP
-	 */
-	public $ips;
-	/**
-	 * @var array list of request methods (e.g. `GET`, `POST`) that this rule applies to.
-	 * The request methods must be specified in uppercase.
-	 * If not set or empty, it means this rule applies to all request methods.
-	 * @see Request::requestMethod
-	 */
-	public $verbs;
-	/**
-	 * @var callback a callback that will be called to determine if the rule should be applied.
-	 * The signature of the callback should be as follows:
-	 *
-	 * ~~~
-	 * function ($rule, $action)
-	 * ~~~
-	 *
-	 * where `$rule` is this rule, and `$action` is the current [[Action|action]] object.
-	 * The callback should return a boolean value indicating whether this rule should be applied.
-	 */
-	public $matchCallback;
-	/**
-	 * @var callback a callback that will be called if this rule determines the access to
-	 * the current action should be denied. If not set, the behavior will be determined by
-	 * [[AccessControl]].
-	 *
-	 * The signature of the callback should be as follows:
-	 *
-	 * ~~~
-	 * function ($rule, $action)
-	 * ~~~
-	 *
-	 * where `$rule` is this rule, and `$action` is the current [[Action|action]] object.
-	 */
-	public $denyCallback;
-
-
-	/**
-	 * Checks whether the Web user is allowed to perform the specified action.
-	 * @param Action $action the action to be performed
-	 * @param User $user the user object
-	 * @param Request $request
-	 * @return boolean|null true if the user is allowed, false if the user is denied, null if the rule does not apply to the user
-	 */
-	public function allows($action, $user, $request)
-	{
-		if ($this->matchAction($action)
-			&& $this->matchRole($user)
-			&& $this->matchIP($request->getUserIP())
-			&& $this->matchVerb($request->getRequestMethod())
-			&& $this->matchController($action->controller)
-			&& $this->matchCustom($action)
-		) {
-			return $this->allow ? true : false;
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * @param Action $action the action
-	 * @return boolean whether the rule applies to the action
-	 */
-	protected function matchAction($action)
-	{
-		return empty($this->actions) || in_array($action->id, $this->actions, true);
-	}
-
-	/**
-	 * @param Controller $controller the controller
-	 * @return boolean whether the rule applies to the controller
-	 */
-	protected function matchController($controller)
-	{
-		return empty($this->controllers) || in_array($controller->id, $this->controllers, true);
-	}
-
-	/**
-	 * @param User $user the user object
-	 * @return boolean whether the rule applies to the role
-	 */
-	protected function matchRole($user)
-	{
-		if (empty($this->roles)) {
-			return true;
-		}
-		foreach ($this->roles as $role) {
-			if ($role === '?' && $user->getIsGuest()) {
-				return true;
-			} elseif ($role === '@' && !$user->getIsGuest()) {
-				return true;
-			} elseif ($user->checkAccess($role)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @param string $ip the IP address
-	 * @return boolean whether the rule applies to the IP address
-	 */
-	protected function matchIP($ip)
-	{
-		if (empty($this->ips)) {
-			return true;
-		}
-		foreach ($this->ips as $rule) {
-			if ($rule === '*' || $rule === $ip || (($pos = strpos($rule, '*')) !== false && !strncmp($ip, $rule, $pos))) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @param string $verb the request method
-	 * @return boolean whether the rule applies to the request
-	 */
-	protected function matchVerb($verb)
-	{
-		return empty($this->verbs) || in_array($verb, $this->verbs, true);
-	}
-
-	/**
-	 * @param Action $action the action to be performed
-	 * @return boolean whether the rule should be applied
-	 */
-	protected function matchCustom($action)
-	{
-		return empty($this->matchCallback) || call_user_func($this->matchCallback, $this, $action);
-	}
-}
diff --git a/framework/web/Application.php b/framework/web/Application.php
deleted file mode 100644
index 3387044..0000000
--- a/framework/web/Application.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-use Yii;
-
-/**
- * Application is the base class for all application classes.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Application extends \yii\base\Application
-{
-	/**
-	 * @var string the default route of this application. Defaults to 'site'.
-	 */
-	public $defaultRoute = 'site';
-
-	/**
-	 * Processes the request.
-	 * @return integer the exit status of the controller action (0 means normal, non-zero values mean abnormal)
-	 */
-	public function processRequest()
-	{
-		$request = $this->getRequest();
-		Yii::setAlias('@wwwroot', dirname($request->getScriptFile()));
-		Yii::setAlias('@www', $request->getBaseUrl());
-		list ($route, $params) = $request->resolve();
-		return $this->runAction($route, $params);
-	}
-
-	private $_homeUrl;
-
-	/**
-	 * @return string the homepage URL
-	 */
-	public function getHomeUrl()
-	{
-		if ($this->_homeUrl === null) {
-			if ($this->getUrlManager()->showScriptName) {
-				return $this->getRequest()->getScriptUrl();
-			} else {
-				return $this->getRequest()->getBaseUrl() . '/';
-			}
-		} else {
-			return $this->_homeUrl;
-		}
-	}
-
-	/**
-	 * @param string $value the homepage URL
-	 */
-	public function setHomeUrl($value)
-	{
-		$this->_homeUrl = $value;
-	}
-
-	/**
-	 * Returns the request component.
-	 * @return Request the request component
-	 */
-	public function getRequest()
-	{
-		return $this->getComponent('request');
-	}
-
-	/**
-	 * Returns the response component.
-	 * @return Response the response component
-	 */
-	public function getResponse()
-	{
-		return $this->getComponent('response');
-	}
-
-	/**
-	 * Returns the session component.
-	 * @return Session the session component
-	 */
-	public function getSession()
-	{
-		return $this->getComponent('session');
-	}
-
-	/**
-	 * Returns the user component.
-	 * @return User the user component
-	 */
-	public function getUser()
-	{
-		return $this->getComponent('user');
-	}
-
-	/**
-	 * Returns the asset manager.
-	 * @return AssetManager the asset manager component
-	 */
-	public function getAssetManager()
-	{
-		return $this->getComponent('assetManager');
-	}
-
-	/**
-	 * Registers the core application components.
-	 * @see setComponents
-	 */
-	public function registerCoreComponents()
-	{
-		parent::registerCoreComponents();
-		$this->setComponents(array(
-			'request' => array(
-				'class' => 'yii\web\Request',
-			),
-			'response' => array(
-				'class' => 'yii\web\Response',
-			),
-			'session' => array(
-				'class' => 'yii\web\Session',
-			),
-			'user' => array(
-				'class' => 'yii\web\User',
-			),
-			'assetManager' => array(
-				'class' => 'yii\web\AssetManager',
-			),
-		));
-	}
-}
diff --git a/framework/web/AssetBundle.php b/framework/web/AssetBundle.php
deleted file mode 100644
index 37577dd..0000000
--- a/framework/web/AssetBundle.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-use Yii;
-use yii\base\InvalidConfigException;
-use yii\base\Object;
-
-/**
- * AssetBundle represents a collection of asset files, such as CSS, JS, images.
- *
- * Each asset bundle has a unique name that globally identifies it among all asset bundles
- * used in an application.
- *
- * An asset bundle can depend on other asset bundles. When registering an asset bundle
- * with a view, all its dependent asset bundles will be automatically registered.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class AssetBundle extends Object
-{
-	/**
-	 * @var string the root directory of the source asset files. A source asset file
-	 * is a file that is part of your source code repository of your Web application.
-	 *
-	 * You must set this property if the directory containing the source asset files
-	 * is not Web accessible (this is usually the case for extensions).
-	 *
-	 * By setting this property, the asset manager will publish the source asset files
-	 * to a Web-accessible directory [[basePath]].
-	 *
-	 * You can use either a directory or an alias of the directory.
-	 */
-	public $sourcePath;
-	/**
-	 * @var string the Web-accessible directory that contains the asset files in this bundle.
-	 *
-	 * If [[sourcePath]] is set, this property will be *overwritten* by [[AssetManager]]
-	 * when it publishes the asset files from [[sourcePath]].
-	 *
-	 * If the bundle contains any assets that are specified in terms of relative file path,
-	 * then this property must be set either manually or automatically (by asset manager via
-	 * asset publishing).
-	 *
-	 * You can use either a directory or an alias of the directory.
-	 */
-	public $basePath;
-	/**
-	 * @var string the base URL that will be prefixed to the asset files for them to
-	 * be accessed via Web server.
-	 *
-	 * If [[sourcePath]] is set, this property will be *overwritten* by [[AssetManager]]
-	 * when it publishes the asset files from [[sourcePath]].
-	 *
-	 * If the bundle contains any assets that are specified in terms of relative file path,
-	 * then this property must be set either manually or automatically (by asset manager via
-	 * asset publishing).
-	 *
-	 * You can use either a URL or an alias of the URL.
-	 */
-	public $baseUrl;
-	/**
-	 * @var array list of the bundle names that this bundle depends on
-	 */
-	public $depends = array();
-	/**
-	 * @var array list of JavaScript files that this bundle contains. Each JavaScript file can
-	 * be either a file path (without leading slash) relative to [[basePath]] or a URL representing
-	 * an external JavaScript file.
-	 *
-	 * Note that only forward slash "/" can be used as directory separator.
-	 */
-	public $js = array();
-	/**
-	 * @var array list of CSS files that this bundle contains. Each CSS file can
-	 * be either a file path (without leading slash) relative to [[basePath]] or a URL representing
-	 * an external CSS file.
-	 *
-	 * Note that only forward slash "/" can be used as directory separator.
-	 */
-	public $css = array();
-	/**
-	 * @var array the options that will be passed to [[\yii\base\View::registerJsFile()]]
-	 * when registering the JS files in this bundle.
-	 */
-	public $jsOptions = array();
-	/**
-	 * @var array the options that will be passed to [[\yii\base\View::registerCssFile()]]
-	 * when registering the CSS files in this bundle.
-	 */
-	public $cssOptions = array();
-	/**
-	 * @var array the options to be passed to [[AssetManager::publish()]] when the asset bundle
-	 * is being published.
-	 */
-	public $publishOptions = array();
-
-	/**
-	 * Initializes the bundle.
-	 */
-	public function init()
-	{
-		if ($this->sourcePath !== null) {
-			$this->sourcePath = rtrim(Yii::getAlias($this->sourcePath), '/\\');
-		}
-		if ($this->basePath !== null) {
-			$this->basePath = rtrim(Yii::getAlias($this->basePath), '/\\');
-		}
-		if ($this->baseUrl !== null) {
-			$this->baseUrl = rtrim(Yii::getAlias($this->baseUrl), '/');
-		}
-	}
-
-	/**
-	 * Registers the CSS and JS files with the given view.
-	 * This method will first register all dependent asset bundles.
-	 * It will then try to convert non-CSS or JS files (e.g. LESS, Sass) into the corresponding
-	 * CSS or JS files using [[AssetManager::converter|asset converter]].
-	 * @param \yii\base\View $view the view that the asset files to be registered with.
-	 * @throws InvalidConfigException if [[baseUrl]] or [[basePath]] is not set when the bundle
-	 * contains internal CSS or JS files.
-	 */
-	public function registerAssets($view)
-	{
-		foreach ($this->depends as $name) {
-			$view->registerAssetBundle($name);
-		}
-
-		$this->publish($view->getAssetManager());
-
-		foreach ($this->js as $js) {
-			$view->registerJsFile($js, $this->jsOptions);
-		}
-		foreach ($this->css as $css) {
-			$view->registerCssFile($css, $this->cssOptions);
-		}
-	}
-
-	/**
-	 * Publishes the asset bundle if its source code is not under Web-accessible directory.
-	 * @param AssetManager $am the asset manager to perform the asset publishing
-	 * @throws InvalidConfigException if [[baseUrl]] or [[basePath]] is not set when the bundle
-	 * contains internal CSS or JS files.
-	 */
-	public function publish($am)
-	{
-		if ($this->sourcePath !== null) {
-			list ($this->basePath, $this->baseUrl) = $am->publish($this->sourcePath, $this->publishOptions);
-		}
-		$converter = $am->getConverter();
-		foreach ($this->js as $i => $js) {
-			if (strpos($js, '/') !== 0 && strpos($js, '://') === false) {
-				if (isset($this->basePath, $this->baseUrl)) {
-					$this->js[$i] = $converter->convert($js, $this->basePath, $this->baseUrl);
-				} else {
-					throw new InvalidConfigException('Both of the "baseUrl" and "basePath" properties must be set.');
-				}
-			}
-		}
-		foreach ($this->css as $i => $css) {
-			if (strpos($css, '/') !== 0 && strpos($css, '://') === false) {
-				if (isset($this->basePath, $this->baseUrl)) {
-					$this->css[$i] = $converter->convert($css, $this->basePath, $this->baseUrl);
-				} else {
-					throw new InvalidConfigException('Both of the "baseUrl" and "basePath" properties must be set.');
-				}
-			}
-		}
-	}
-}
diff --git a/framework/web/AssetConverter.php b/framework/web/AssetConverter.php
deleted file mode 100644
index 4fde1fc..0000000
--- a/framework/web/AssetConverter.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-use Yii;
-use yii\base\Component;
-
-/**
- * AssetConverter supports conversion of several popular script formats into JS or CSS scripts.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class AssetConverter extends Component implements IAssetConverter
-{
-	/**
-	 * @var array the commands that are used to perform the asset conversion.
-	 * The keys are the asset file extension names, and the values are the corresponding
-	 * target script types (either "css" or "js") and the commands used for the conversion.
-	 */
-	public $commands = array(
-		'less' => array('css', 'lessc {from} {to}'),
-		'scss' => array('css', 'sass {from} {to}'),
-		'sass' => array('css', 'sass {from} {to}'),
-		'styl' => array('js', 'stylus < {from} > {to}'),
-	);
-
-	/**
-	 * Converts a given asset file into a CSS or JS file.
-	 * @param string $asset the asset file path, relative to $basePath
-	 * @param string $basePath the directory the $asset is relative to.
-	 * @param string $baseUrl the URL corresponding to $basePath
-	 * @return string the URL to the converted asset file.
-	 */
-	public function convert($asset, $basePath, $baseUrl)
-	{
-		$pos = strrpos($asset, '.');
-		if ($pos !== false) {
-			$ext = substr($asset, $pos + 1);
-			if (isset($this->commands[$ext])) {
-				list ($ext, $command) = $this->commands[$ext];
-				$result = substr($asset, 0, $pos + 1) . $ext;
-				if (@filemtime("$basePath/$result") < filemtime("$basePath/$asset")) {
-					$output = array();
-					$command = strtr($command, array(
-						'{from}' => "$basePath/$asset",
-						'{to}' => "$basePath/$result",
-					));
-					exec($command, $output);
-					Yii::info("Converted $asset into $result: " . implode("\n", $output), __METHOD__);
-				}
-				return "$baseUrl/$result";
-			}
-		}
-		return "$baseUrl/$asset";
-	}
-}
diff --git a/framework/web/AssetManager.php b/framework/web/AssetManager.php
deleted file mode 100644
index 95dcbd2..0000000
--- a/framework/web/AssetManager.php
+++ /dev/null
@@ -1,330 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-use Yii;
-use yii\base\Component;
-use yii\base\InvalidConfigException;
-use yii\base\InvalidParamException;
-use yii\helpers\FileHelper;
-
-/**
- * AssetManager manages asset bundles and asset publishing.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class AssetManager extends Component
-{
-	/**
-	 * @var array list of available asset bundles. The keys are the bundle names, and the values are the configuration
-	 * arrays for creating the [[AssetBundle]] objects.
-	 */
-	public $bundles;
-	/**
-	 * @return string the root directory storing the published asset files.
-	 */
-	public $basePath = '@wwwroot/assets';
-	/**
-	 * @return string the base URL through which the published asset files can be accessed.
-	 */
-	public $baseUrl = '@www/assets';
-	/**
-	 * @var boolean whether to use symbolic link to publish asset files. Defaults to false, meaning
-	 * asset files are copied to [[basePath]]. Using symbolic links has the benefit that the published
-	 * assets will always be consistent with the source assets and there is no copy operation required.
-	 * This is especially useful during development.
-	 *
-	 * However, there are special requirements for hosting environments in order to use symbolic links.
-	 * In particular, symbolic links are supported only on Linux/Unix, and Windows Vista/2008 or greater.
-	 *
-	 * Moreover, some Web servers need to be properly configured so that the linked assets are accessible
-	 * to Web users. For example, for Apache Web server, the following configuration directive should be added
-	 * for the Web folder:
-	 *
-	 * ~~~
-	 * Options FollowSymLinks
-	 * ~~~
-	 */
-	public $linkAssets = false;
-	/**
-	 * @var integer the permission to be set for newly published asset files.
-	 * This value will be used by PHP chmod() function.
-	 * If not set, the permission will be determined by the current environment.
-	 */
-	public $fileMode;
-	/**
-	 * @var integer the permission to be set for newly generated asset directories.
-	 * This value will be used by PHP chmod() function.
-	 * Defaults to 0777, meaning the directory can be read, written and executed by all users.
-	 */
-	public $dirMode = 0777;
-
-	/**
-	 * Initializes the component.
-	 * @throws InvalidConfigException if [[basePath]] is invalid
-	 */
-	public function init()
-	{
-		parent::init();
-		$this->basePath = Yii::getAlias($this->basePath);
-		if (!is_dir($this->basePath)) {
-			throw new InvalidConfigException("The directory does not exist: {$this->basePath}");
-		} elseif (!is_writable($this->basePath)) {
-			throw new InvalidConfigException("The directory is not writable by the Web process: {$this->basePath}");
-		} else {
-			$this->basePath = realpath($this->basePath);
-		}
-		$this->baseUrl = rtrim(Yii::getAlias($this->baseUrl), '/');
-
-		foreach (require(YII_PATH . '/assets.php') as $name => $bundle) {
-			if (!isset($this->bundles[$name])) {
-				$this->bundles[$name] = $bundle;
-			}
-		}
-	}
-
-	/**
-	 * Returns the named bundle.
-	 * This method will first look for the bundle in [[bundles]]. If not found,
-	 * it will attempt to find the bundle from an installed extension using the following procedure:
-	 *
-	 * 1. Convert the bundle into a path alias;
-	 * 2. Determine the root alias and use it to locate the bundle manifest file "assets.php";
-	 * 3. Look for the bundle in the manifest file.
-	 *
-	 * For example, given the bundle name "foo/button", the method will first convert it
-	 * into the path alias "@foo/button"; since "@foo" is the root alias, it will look
-	 * for the bundle manifest file "@foo/assets.php". The manifest file should return an array
-	 * that lists the bundles used by the "foo/button" extension. The array format is the same as [[bundles]].
-	 *
-	 * @param string $name the bundle name
-	 * @return AssetBundle the loaded bundle object. Null is returned if the bundle does not exist.
-	 */
-	public function getBundle($name)
-	{
-		if (!isset($this->bundles[$name])) {
-			$rootAlias = Yii::getRootAlias("@$name");
-			if ($rootAlias !== false) {
-				$manifest = Yii::getAlias("$rootAlias/assets.php", false);
-				if ($manifest !== false && is_file($manifest)) {
-					foreach (require($manifest) as $bn => $config) {
-						$this->bundles[$bn] = $config;
-					}
-				}
-			}
-			if (!isset($this->bundles[$name])) {
-				return null;
-			}
-		}
-		if (is_array($this->bundles[$name])) {
-			$config = $this->bundles[$name];
-			if (!isset($config['class'])) {
-				$config['class'] = 'yii\\web\\AssetBundle';
-				$this->bundles[$name] = Yii::createObject($config);
-			}
-		}
-
-		return $this->bundles[$name];
-	}
-
-	private $_converter;
-
-	/**
-	 * Returns the asset converter.
-	 * @return IAssetConverter the asset converter.
-	 */
-	public function getConverter()
-	{
-		if ($this->_converter === null) {
-			$this->_converter = Yii::createObject(array(
-				'class' => 'yii\\web\\AssetConverter',
-			));
-		} elseif (is_array($this->_converter) || is_string($this->_converter)) {
-			$this->_converter = Yii::createObject($this->_converter);
-		}
-		return $this->_converter;
-	}
-
-	/**
-	 * Sets the asset converter.
-	 * @param array|IAssetConverter $value the asset converter. This can be either
-	 * an object implementing the [[IAssetConverter]] interface, or a configuration
-	 * array that can be used to create the asset converter object.
-	 */
-	public function setConverter($value)
-	{
-		$this->_converter = $value;
-	}
-
-	/**
-	 * @var array published assets
-	 */
-	private $_published = array();
-
-	/**
-	 * Publishes a file or a directory.
-	 *
-	 * This method will copy the specified file or directory to [[basePath]] so that
-	 * it can be accessed via the Web server.
-	 *
-	 * If the asset is a file, its file modification time will be checked to avoid
-	 * unnecessary file copying.
-	 *
-	 * If the asset is a directory, all files and subdirectories under it will be published recursively.
-	 * Note, in case $forceCopy is false the method only checks the existence of the target
-	 * directory to avoid repetitive copying (which is very expensive).
-	 *
-	 * By default, when publishing a directory, subdirectories and files whose name starts with a dot "."
-	 * will NOT be published. If you want to change this behavior, you may specify the "beforeCopy" option
-	 * as explained in the `$options` parameter.
-	 *
-	 * Note: On rare scenario, a race condition can develop that will lead to a
-	 * one-time-manifestation of a non-critical problem in the creation of the directory
-	 * that holds the published assets. This problem can be avoided altogether by 'requesting'
-	 * in advance all the resources that are supposed to trigger a 'publish()' call, and doing
-	 * that in the application deployment phase, before system goes live. See more in the following
-	 * discussion: http://code.google.com/p/yii/issues/detail?id=2579
-	 *
-	 * @param string $path the asset (file or directory) to be published
-	 * @param array $options the options to	be applied when publishing a directory.
-	 * The following options are supported:
-	 *
-	 * - beforeCopy: callback, a PHP callback that is called before copying each sub-directory or file.
-	 *   This option is used only when publishing a directory. If the callback returns false, the copy
-	 *   operation for the sub-directory or file will be cancelled.
-	 *   The signature of the callback should be: `function ($from, $to)`, where `$from` is the sub-directory or
- 	 *   file to be copied from, while `$to` is the copy target.
-	 * - afterCopy: callback, a PHP callback that is called after a sub-directory or file is successfully copied.
-	 *   This option is used only when publishing a directory. The signature of the callback is similar to that
-	 *   of `beforeCopy`.
-	 * - forceCopy: boolean, whether the directory being published should be copied even if
-	 *   it is found in the target directory. This option is used only when publishing a directory.
-	 *   You may want to set this to be true during the development stage to make sure the published
-	 *   directory is always up-to-date. Do not set this to true on production servers as it will
-	 *   significantly degrade the performance.
-	 * @return array the path (directory or file path) and the URL that the asset is published as.
-	 * @throws InvalidParamException if the asset to be published does not exist.
-	 */
-	public function publish($path, $options = array())
-	{
-		if (isset($this->_published[$path])) {
-			return $this->_published[$path];
-		}
-
-		$src = realpath($path);
-		if ($src === false) {
-			throw new InvalidParamException("The file or directory to be published does not exist: $path");
-		}
-
-		if (is_file($src)) {
-			$dir = $this->hash(dirname($src) . filemtime($src));
-			$fileName = basename($src);
-			$dstDir = $this->basePath . DIRECTORY_SEPARATOR . $dir;
-			$dstFile = $dstDir . DIRECTORY_SEPARATOR . $fileName;
-
-			if (!is_dir($dstDir)) {
-				mkdir($dstDir, $this->dirMode, true);
-			}
-
-			if ($this->linkAssets) {
-				if (!is_file($dstFile)) {
-					symlink($src, $dstFile);
-				}
-			} elseif (@filemtime($dstFile) < @filemtime($src)) {
-				copy($src, $dstFile);
-				if ($this->fileMode !== null) {
-					@chmod($dstFile, $this->fileMode);
-				}
-			}
-
-			return $this->_published[$path] = array($dstFile, $this->baseUrl . "/$dir/$fileName");
-		} else {
-			$dir = $this->hash($src . filemtime($src));
-			$dstDir = $this->basePath . DIRECTORY_SEPARATOR . $dir;
-			if ($this->linkAssets) {
-				if (!is_dir($dstDir)) {
-					symlink($src, $dstDir);
-				}
-			} elseif (!is_dir($dstDir) || !empty($options['forceCopy'])) {
-				$opts = array(
-					'dirMode' => $this->dirMode,
-					'fileMode' => $this->fileMode,
-				);
-				if (isset($options['beforeCopy'])) {
-					$opts['beforeCopy'] = $options['beforeCopy'];
-				} else {
-					$opts['beforeCopy'] = function ($from, $to) {
-						return strncmp(basename($from), '.', 1) !== 0;
-					};
-				}
-				if (isset($options['afterCopy'])) {
-					$opts['afterCopy'] = $options['afterCopy'];
-				}
-				FileHelper::copyDirectory($src, $dstDir, $opts);
-			}
-
-			return $this->_published[$path] = array($dstDir, $this->baseUrl . '/' . $dir);
-		}
-	}
-
-	/**
-	 * Returns the published path of a file path.
-	 * This method does not perform any publishing. It merely tells you
-	 * if the file or directory is published, where it will go.
-	 * @param string $path directory or file path being published
-	 * @return string the published file path. False if the file or directory does not exist
-	 */
-	public function getPublishedPath($path)
-	{
-		if (($path = realpath($path)) !== false) {
-			$base = $this->basePath . DIRECTORY_SEPARATOR;
-			if (is_file($path)) {
-				return $base . $this->hash(dirname($path) . filemtime($path)) . DIRECTORY_SEPARATOR . basename($path);
-			} else {
-				return $base . $this->hash($path . filemtime($path));
-			}
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Returns the URL of a published file path.
-	 * This method does not perform any publishing. It merely tells you
-	 * if the file path is published, what the URL will be to access it.
-	 * @param string $path directory or file path being published
-	 * @return string the published URL for the file or directory. False if the file or directory does not exist.
-	 */
-	public function getPublishedUrl($path)
-	{
-		if (isset($this->_published[$path])) {
-			return $this->_published[$path];
-		}
-		if (($path = realpath($path)) !== false) {
-			if (is_file($path)) {
-				return $this->baseUrl . '/' . $this->hash(dirname($path) . filemtime($path)) . '/' . basename($path);
-			} else {
-				return $this->baseUrl . '/' . $this->hash($path . filemtime($path));
-			}
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Generate a CRC32 hash for the directory path. Collisions are higher
-	 * than MD5 but generates a much smaller hash string.
-	 * @param string $path string to be hashed.
-	 * @return string hashed string.
-	 */
-	protected function hash($path)
-	{
-		return sprintf('%x', crc32($path . Yii::getVersion()));
-	}
-}
diff --git a/framework/web/CacheSession.php b/framework/web/CacheSession.php
deleted file mode 100644
index c125f01..0000000
--- a/framework/web/CacheSession.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-use Yii;
-use yii\caching\Cache;
-use yii\base\InvalidConfigException;
-
-/**
- * CacheSession implements a session component using cache as storage medium.
- *
- * The cache being used can be any cache application component.
- * The ID of the cache application component is specified via [[cache]], which defaults to 'cache'.
- *
- * Beware, by definition cache storage are volatile, which means the data stored on them
- * may be swapped out and get lost. Therefore, you must make sure the cache used by this component
- * is NOT volatile. If you want to use database as storage medium, use [[DbSession]] is a better choice.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class CacheSession extends Session
-{
-	/**
-	 * @var Cache|string the cache object or the application component ID of the cache object.
-	 * The session data will be stored using this cache object.
-	 *
-	 * After the CacheSession object is created, if you want to change this property,
-	 * you should only assign it with a cache object.
-	 */
-	public $cache = 'cache';
-
-	/**
-	 * Initializes the application component.
-	 */
-	public function init()
-	{
-		parent::init();
-		if (is_string($this->cache)) {
-			$this->cache = Yii::$app->getComponent($this->cache);
-		}
-		if (!$this->cache instanceof Cache) {
-			throw new InvalidConfigException('CacheSession::cache must refer to the application component ID of a cache object.');
-		}
-	}
-
-	/**
-	 * Returns a value indicating whether to use custom session storage.
-	 * This method overrides the parent implementation and always returns true.
-	 * @return boolean whether to use custom storage.
-	 */
-	public function getUseCustomStorage()
-	{
-		return true;
-	}
-
-	/**
-	 * Session read handler.
-	 * Do not call this method directly.
-	 * @param string $id session ID
-	 * @return string the session data
-	 */
-	public function readSession($id)
-	{
-		$data = $this->cache->get($this->calculateKey($id));
-		return $data === false ? '' : $data;
-	}
-
-	/**
-	 * Session write handler.
-	 * Do not call this method directly.
-	 * @param string $id session ID
-	 * @param string $data session data
-	 * @return boolean whether session write is successful
-	 */
-	public function writeSession($id, $data)
-	{
-		return $this->cache->set($this->calculateKey($id), $data, $this->getTimeout());
-	}
-
-	/**
-	 * Session destroy handler.
-	 * Do not call this method directly.
-	 * @param string $id session ID
-	 * @return boolean whether session is destroyed successfully
-	 */
-	public function destroySession($id)
-	{
-		return $this->cache->delete($this->calculateKey($id));
-	}
-
-	/**
-	 * Generates a unique key used for storing session data in cache.
-	 * @param string $id session variable name
-	 * @return string a safe cache key associated with the session variable name
-	 */
-	protected function calculateKey($id)
-	{
-		return $this->cache->buildKey(array(__CLASS__, $id));
-	}
-}
diff --git a/framework/web/CaptchaAction.php b/framework/web/CaptchaAction.php
deleted file mode 100644
index e3d6eaa..0000000
--- a/framework/web/CaptchaAction.php
+++ /dev/null
@@ -1,338 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-use Yii;
-use yii\base\Action;
-use yii\base\InvalidConfigException;
-use yii\widgets\Captcha;
-
-/**
- * CaptchaAction renders a CAPTCHA image.
- *
- * CaptchaAction is used together with [[Captcha]] and [[\yii\validators\CaptchaValidator]]
- * to provide the [CAPTCHA](http://en.wikipedia.org/wiki/Captcha) feature.
- *
- * By configuring the properties of CaptchaAction, you may customize the appearance of
- * the generated CAPTCHA images, such as the font color, the background color, etc.
- *
- * Note that CaptchaAction requires either GD2 extension or ImageMagick PHP extension.
- *
- * Using CAPTCHA involves the following steps:
- *
- * 1. Override [[\yii\web\Controller::actions()]] and register an action of class CaptchaAction with ID 'captcha'
- * 2. In the form model, declare an attribute to store user-entered verification code, and declare the attribute
- *    to be validated by the 'captcha' validator.
- * 3. In the controller view, insert a [[Captcha]] widget in the form.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class CaptchaAction extends Action
-{
-	/**
-	 * The name of the GET parameter indicating whether the CAPTCHA image should be regenerated.
-	 */
-	const REFRESH_GET_VAR = 'refresh';
-	/**
-	 * @var integer how many times should the same CAPTCHA be displayed. Defaults to 3.
-	 * A value less than or equal to 0 means the test is unlimited (available since version 1.1.2).
-	 */
-	public $testLimit = 3;
-	/**
-	 * @var integer the width of the generated CAPTCHA image. Defaults to 120.
-	 */
-	public $width = 120;
-	/**
-	 * @var integer the height of the generated CAPTCHA image. Defaults to 50.
-	 */
-	public $height = 50;
-	/**
-	 * @var integer padding around the text. Defaults to 2.
-	 */
-	public $padding = 2;
-	/**
-	 * @var integer the background color. For example, 0x55FF00.
-	 * Defaults to 0xFFFFFF, meaning white color.
-	 */
-	public $backColor = 0xFFFFFF;
-	/**
-	 * @var integer the font color. For example, 0x55FF00. Defaults to 0x2040A0 (blue color).
-	 */
-	public $foreColor = 0x2040A0;
-	/**
-	 * @var boolean whether to use transparent background. Defaults to false.
-	 */
-	public $transparent = false;
-	/**
-	 * @var integer the minimum length for randomly generated word. Defaults to 6.
-	 */
-	public $minLength = 6;
-	/**
-	 * @var integer the maximum length for randomly generated word. Defaults to 7.
-	 */
-	public $maxLength = 7;
-	/**
-	 * @var integer the offset between characters. Defaults to -2. You can adjust this property
-	 * in order to decrease or increase the readability of the captcha.
-	 **/
-	public $offset = -2;
-	/**
-	 * @var string the TrueType font file. This can be either a file path or path alias.
-	 */
-	public $fontFile = '@yii/web/SpicyRice.ttf';
-	/**
-	 * @var string the fixed verification code. When this is property is set,
-	 * [[getVerifyCode()]] will always return the value of this property.
-	 * This is mainly used in automated tests where we want to be able to reproduce
-	 * the same verification code each time we run the tests.
-	 * If not set, it means the verification code will be randomly generated.
-	 */
-	public $fixedVerifyCode;
-
-
-	/**
-	 * Initializes the action.
-	 * @throws InvalidConfigException if the font file does not exist.
-	 */
-	public function init()
-	{
-		$this->fontFile = Yii::getAlias($this->fontFile);
-		if (!is_file($this->fontFile)) {
-			throw new InvalidConfigException("The font file does not exist: {$this->fontFile}");
-		}
-	}
-
-	/**
-	 * Runs the action.
-	 */
-	public function run()
-	{
-		if (isset($_GET[self::REFRESH_GET_VAR])) {
-			// AJAX request for regenerating code
-			$code = $this->getVerifyCode(true);
-			echo json_encode(array(
-				'hash1' => $this->generateValidationHash($code),
-				'hash2' => $this->generateValidationHash(strtolower($code)),
-				// we add a random 'v' parameter so that FireFox can refresh the image
-				// when src attribute of image tag is changed
-				'url' => $this->controller->createUrl($this->id, array('v' => uniqid())),
-			));
-		} else {
-			$this->renderImage($this->getVerifyCode());
-		}
-		Yii::$app->end();
-	}
-
-	/**
-	 * Generates a hash code that can be used for client side validation.
-	 * @param string $code the CAPTCHA code
-	 * @return string a hash code generated from the CAPTCHA code
-	 */
-	public function generateValidationHash($code)
-	{
-		for ($h = 0, $i = strlen($code) - 1; $i >= 0; --$i) {
-			$h += ord($code[$i]);
-		}
-		return $h;
-	}
-
-	/**
-	 * Gets the verification code.
-	 * @param boolean $regenerate whether the verification code should be regenerated.
-	 * @return string the verification code.
-	 */
-	public function getVerifyCode($regenerate = false)
-	{
-		if ($this->fixedVerifyCode !== null) {
-			return $this->fixedVerifyCode;
-		}
-
-		$session = Yii::$app->session;
-		$session->open();
-		$name = $this->getSessionKey();
-		if ($session[$name] === null || $regenerate) {
-			$session[$name] = $this->generateVerifyCode();
-			$session[$name . 'count'] = 1;
-		}
-		return $session[$name];
-	}
-
-	/**
-	 * Validates the input to see if it matches the generated code.
-	 * @param string $input user input
-	 * @param boolean $caseSensitive whether the comparison should be case-sensitive
-	 * @return boolean whether the input is valid
-	 */
-	public function validate($input, $caseSensitive)
-	{
-		$code = $this->getVerifyCode();
-		$valid = $caseSensitive ? ($input === $code) : strcasecmp($input, $code) === 0;
-		$session = Yii::$app->session;
-		$session->open();
-		$name = $this->getSessionKey() . 'count';
-		$session[$name] = $session[$name] + 1;
-		if ($session[$name] > $this->testLimit && $this->testLimit > 0) {
-			$this->getVerifyCode(true);
-		}
-		return $valid;
-	}
-
-	/**
-	 * Generates a new verification code.
-	 * @return string the generated verification code
-	 */
-	protected function generateVerifyCode()
-	{
-		if ($this->minLength < 3) {
-			$this->minLength = 3;
-		}
-		if ($this->maxLength > 20) {
-			$this->maxLength = 20;
-		}
-		if ($this->minLength > $this->maxLength) {
-			$this->maxLength = $this->minLength;
-		}
-		$length = mt_rand($this->minLength, $this->maxLength);
-
-		$letters = 'bcdfghjklmnpqrstvwxyz';
-		$vowels = 'aeiou';
-		$code = '';
-		for ($i = 0; $i < $length; ++$i) {
-			if ($i % 2 && mt_rand(0, 10) > 2 || !($i % 2) && mt_rand(0, 10) > 9) {
-				$code .= $vowels[mt_rand(0, 4)];
-			} else {
-				$code .= $letters[mt_rand(0, 20)];
-			}
-		}
-
-		return $code;
-	}
-
-	/**
-	 * Returns the session variable name used to store verification code.
-	 * @return string the session variable name
-	 */
-	protected function getSessionKey()
-	{
-		return '__captcha/' . $this->getUniqueId();
-	}
-
-	/**
-	 * Renders the CAPTCHA image.
-	 * @param string $code the verification code
-	 */
-	protected function renderImage($code)
-	{
-		if (Captcha::checkRequirements() === 'gd') {
-			$this->renderImageByGD($code);
-		} else {
-			$this->renderImageByImagick($code);
-		}
-	}
-
-	/**
-	 * Renders the CAPTCHA image based on the code using GD library.
-	 * @param string $code the verification code
-	 */
-	protected function renderImageByGD($code)
-	{
-		$image = imagecreatetruecolor($this->width, $this->height);
-
-		$backColor = imagecolorallocate($image,
-			(int)($this->backColor % 0x1000000 / 0x10000),
-			(int)($this->backColor % 0x10000 / 0x100),
-			$this->backColor % 0x100);
-		imagefilledrectangle($image, 0, 0, $this->width, $this->height, $backColor);
-		imagecolordeallocate($image, $backColor);
-
-		if ($this->transparent) {
-			imagecolortransparent($image, $backColor);
-		}
-
-		$foreColor = imagecolorallocate($image,
-			(int)($this->foreColor % 0x1000000 / 0x10000),
-			(int)($this->foreColor % 0x10000 / 0x100),
-			$this->foreColor % 0x100);
-
-		if ($this->fontFile === null) {
-			$this->fontFile = dirname(__FILE__) . '/SpicyRice.ttf';
-		}
-
-		$length = strlen($code);
-		$box = imagettfbbox(30, 0, $this->fontFile, $code);
-		$w = $box[4] - $box[0] + $this->offset * ($length - 1);
-		$h = $box[1] - $box[5];
-		$scale = min(($this->width - $this->padding * 2) / $w, ($this->height - $this->padding * 2) / $h);
-		$x = 10;
-		$y = round($this->height * 27 / 40);
-		for ($i = 0; $i < $length; ++$i) {
-			$fontSize = (int)(rand(26, 32) * $scale * 0.8);
-			$angle = rand(-10, 10);
-			$letter = $code[$i];
-			$box = imagettftext($image, $fontSize, $angle, $x, $y, $foreColor, $this->fontFile, $letter);
-			$x = $box[2] + $this->offset;
-		}
-
-		imagecolordeallocate($image, $foreColor);
-
-		header('Pragma: public');
-		header('Expires: 0');
-		header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
-		header('Content-Transfer-Encoding: binary');
-		header("Content-type: image/png");
-		imagepng($image);
-		imagedestroy($image);
-	}
-
-	/**
-	 * Renders the CAPTCHA image based on the code using ImageMagick library.
-	 * @param string $code the verification code
-	 */
-	protected function renderImageByImagick($code)
-	{
-		$backColor = $this->transparent ? new \ImagickPixel('transparent') : new \ImagickPixel('#' . dechex($this->backColor));
-		$foreColor = new \ImagickPixel('#' . dechex($this->foreColor));
-
-		$image = new \Imagick();
-		$image->newImage($this->width, $this->height, $backColor);
-
-		if ($this->fontFile === null) {
-			$this->fontFile = dirname(__FILE__) . '/SpicyRice.ttf';
-		}
-
-		$draw = new \ImagickDraw();
-		$draw->setFont($this->fontFile);
-		$draw->setFontSize(30);
-		$fontMetrics = $image->queryFontMetrics($draw, $code);
-
-		$length = strlen($code);
-		$w = (int)($fontMetrics['textWidth']) - 8 + $this->offset * ($length - 1);
-		$h = (int)($fontMetrics['textHeight']) - 8;
-		$scale = min(($this->width - $this->padding * 2) / $w, ($this->height - $this->padding * 2) / $h);
-		$x = 10;
-		$y = round($this->height * 27 / 40);
-		for ($i = 0; $i < $length; ++$i) {
-			$draw = new \ImagickDraw();
-			$draw->setFont($this->fontFile);
-			$draw->setFontSize((int)(rand(26, 32) * $scale * 0.8));
-			$draw->setFillColor($foreColor);
-			$image->annotateImage($draw, $x, $y, rand(-10, 10), $code[$i]);
-			$fontMetrics = $image->queryFontMetrics($draw, $code[$i]);
-			$x += (int)($fontMetrics['textWidth']) + $this->offset;
-		}
-
-		header('Pragma: public');
-		header('Expires: 0');
-		header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
-		header('Content-Transfer-Encoding: binary');
-		header("Content-type: image/png");
-		$image->setImageFormat('png');
-		echo $image;
-	}
-}
diff --git a/framework/web/Controller.php b/framework/web/Controller.php
deleted file mode 100644
index 517f4b4..0000000
--- a/framework/web/Controller.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-use Yii;
-
-/**
- * Controller is the base class of Web controllers.
- *
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Controller extends \yii\base\Controller
-{
-	/**
-	 * Creates a URL using the given route and parameters.
-	 *
-	 * This method enhances [[UrlManager::createUrl()]] by supporting relative routes.
-	 * A relative route is a route without a slash, such as "view". If the route is an empty
-	 * string, [[route]] will be used; Otherwise, [[uniqueId]] will be prepended to a relative route.
-	 *
-	 * After this route conversion, the method This method calls [[UrlManager::createUrl()]]
-	 * to create a URL.
-	 *
-	 * @param string $route the route. This can be either an absolute route or a relative route.
-	 * @param array $params the parameters (name-value pairs) to be included in the generated URL
-	 * @return string the created URL
-	 */
-	public function createUrl($route, $params = array())
-	{
-		if (strpos($route, '/') === false) {
-			// a relative route
-			$route = $route === '' ? $this->getRoute() : $this->getUniqueId() . '/' . $route;
-		}
-		return Yii::$app->getUrlManager()->createUrl($route, $params);
-	}
-}
diff --git a/framework/web/Cookie.php b/framework/web/Cookie.php
deleted file mode 100644
index 610e5aa..0000000
--- a/framework/web/Cookie.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-/**
- * Cookie represents information related with a cookie, such as [[name]], [[value]], [[domain]], etc.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Cookie extends \yii\base\Object
-{
-	/**
-	 * @var string name of the cookie
-	 */
-	public $name;
-	/**
-	 * @var string value of the cookie
-	 */
-	public $value = '';
-	/**
-	 * @var string domain of the cookie
-	 */
-	public $domain = '';
-	/**
-	 * @var integer the timestamp at which the cookie expires. This is the server timestamp.
-	 * Defaults to 0, meaning "until the browser is closed".
-	 */
-	public $expire = 0;
-	/**
-	 * @var string the path on the server in which the cookie will be available on. The default is '/'.
-	 */
-	public $path = '/';
-	/**
-	 * @var boolean whether cookie should be sent via secure connection
-	 */
-	public $secure = false;
-	/**
-	 * @var boolean whether the cookie should be accessible only through the HTTP protocol.
-	 * By setting this property to true, the cookie will not be accessible by scripting languages,
-	 * such as JavaScript, which can effectively help to reduce identity theft through XSS attacks.
-	 */
-	public $httponly = false;
-
-	/**
-	 * Magic method to turn a cookie object into a string without having to explicitly access [[value]].
-	 *
-	 * ~~~
-	 * if (isset($request->cookies['name'])) {
-	 *     $value = (string)$request->cookies['name'];
-	 * }
-	 * ~~~
-	 *
-	 * @return string The value of the cookie. If the value property is null, an empty string will be returned.
-	 */
-	public function __toString()
-	{
-		return (string)$this->value;
-	}
-}
diff --git a/framework/web/CookieCollection.php b/framework/web/CookieCollection.php
deleted file mode 100644
index c76926b..0000000
--- a/framework/web/CookieCollection.php
+++ /dev/null
@@ -1,247 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-use Yii;
-use yii\base\DictionaryIterator;
-use yii\helpers\SecurityHelper;
-
-/**
- * CookieCollection maintains the cookies available in the current request.
- *
- * @property integer $count the number of cookies in the collection
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class CookieCollection extends \yii\base\Object implements \IteratorAggregate, \ArrayAccess, \Countable
-{
-	/**
-	 * @var boolean whether to enable cookie validation. By setting this property to true,
-	 * if a cookie is tampered on the client side, it will be ignored when received on the server side.
-	 */
-	public $enableValidation = true;
-	/**
-	 * @var string the secret key used for cookie validation. If not set, a random key will be generated and used.
-	 */
-	public $validationKey;
-
-	/**
-	 * @var Cookie[] the cookies in this collection (indexed by the cookie names)
-	 */
-	private $_cookies = array();
-
-	/**
-	 * Constructor.
-	 * @param array $config name-value pairs that will be used to initialize the object properties
-	 */
-	public function __construct($config = array())
-	{
-		parent::__construct($config);
-		$this->_cookies = $this->loadCookies();
-	}
-
-	/**
-	 * Returns an iterator for traversing the cookies in the collection.
-	 * This method is required by the SPL interface `IteratorAggregate`.
-	 * It will be implicitly called when you use `foreach` to traverse the collection.
-	 * @return DictionaryIterator an iterator for traversing the cookies in the collection.
-	 */
-	public function getIterator()
-	{
-		return new DictionaryIterator($this->_cookies);
-	}
-
-	/**
-	 * Returns the number of cookies in the collection.
-	 * This method is required by the SPL `Countable` interface.
-	 * It will be implicitly called when you use `count($collection)`.
-	 * @return integer the number of cookies in the collection.
-	 */
-	public function count()
-	{
-		return $this->getCount();
-	}
-
-	/**
-	 * Returns the number of cookies in the collection.
-	 * @return integer the number of cookies in the collection.
-	 */
-	public function getCount()
-	{
-		return count($this->_cookies);
-	}
-
-	/**
-	 * Returns the cookie with the specified name.
-	 * @param string $name the cookie name
-	 * @return Cookie the cookie with the specified name. Null if the named cookie does not exist.
-	 * @see getValue()
-	 */
-	public function get($name)
-	{
-		return isset($this->_cookies[$name]) ? $this->_cookies[$name] : null;
-	}
-
-	/**
-	 * Returns the value of the named cookie.
-	 * @param string $name the cookie name
-	 * @param mixed $defaultValue the value that should be returned when the named cookie does not exist.
-	 * @return mixed the value of the named cookie.
-	 * @see get()
-	 */
-	public function getValue($name, $defaultValue = null)
-	{
-		return isset($this->_cookies[$name]) ? $this->_cookies[$name]->value : $defaultValue;
-	}
-
-	/**
-	 * Adds a cookie to the collection.
-	 * If there is already a cookie with the same name in the collection, it will be removed first.
-	 * @param Cookie $cookie the cookie to be added
-	 */
-	public function add($cookie)
-	{
-		if (isset($this->_cookies[$cookie->name])) {
-			$c = $this->_cookies[$cookie->name];
-			setcookie($c->name, '', 0, $c->path, $c->domain, $c->secure, $c->httponly);
-		}
-
-		$value = $cookie->value;
-		if ($this->enableValidation) {
-			if ($this->validationKey === null) {
-				$key = SecurityHelper::getSecretKey(__CLASS__ . '/' . Yii::$app->id);
-			} else {
-				$key = $this->validationKey;
-			}
-			$value = SecurityHelper::hashData(serialize($value), $key);
-		}
-
-		setcookie($cookie->name, $value, $cookie->expire, $cookie->path, $cookie->domain, $cookie->secure, $cookie->httponly);
-		$this->_cookies[$cookie->name] = $cookie;
-	}
-
-	/**
-	 * Removes a cookie from the collection.
-	 * @param Cookie|string $cookie the cookie object or the name of the cookie to be removed.
-	 */
-	public function remove($cookie)
-	{
-		if (is_string($cookie) && isset($this->_cookies[$cookie])) {
-			$cookie = $this->_cookies[$cookie];
-		}
-		if ($cookie instanceof Cookie) {
-			setcookie($cookie->name, '', 0, $cookie->path, $cookie->domain, $cookie->secure, $cookie->httponly);
-			unset($this->_cookies[$cookie->name]);
-		}
-	}
-
-	/**
-	 * Removes all cookies.
-	 */
-	public function removeAll()
-	{
-		foreach ($this->_cookies as $cookie) {
-			setcookie($cookie->name, '', 0, $cookie->path, $cookie->domain, $cookie->secure, $cookie->httponly);
-		}
-		$this->_cookies = array();
-	}
-
-	/**
-	 * Returns the collection as a PHP array.
-	 * @return array the array representation of the collection.
-	 * The array keys are cookie names, and the array values are the corresponding
-	 * cookie objects.
-	 */
-	public function toArray()
-	{
-		return $this->_cookies;
-	}
-
-	/**
-	 * Returns whether there is a cookie with the specified name.
-	 * This method is required by the SPL interface `ArrayAccess`.
-	 * It is implicitly called when you use something like `isset($collection[$name])`.
-	 * @param string $name the cookie name
-	 * @return boolean whether the named cookie exists
-	 */
-	public function offsetExists($name)
-	{
-		return isset($this->_cookies[$name]);
-	}
-
-	/**
-	 * Returns the cookie with the specified name.
-	 * This method is required by the SPL interface `ArrayAccess`.
-	 * It is implicitly called when you use something like `$cookie = $collection[$name];`.
-	 * This is equivalent to [[get()]].
-	 * @param string $name the cookie name
-	 * @return Cookie the cookie with the specified name, null if the named cookie does not exist.
-	 */
-	public function offsetGet($name)
-	{
-		return $this->get($name);
-	}
-
-	/**
-	 * Adds the cookie to the collection.
-	 * This method is required by the SPL interface `ArrayAccess`.
-	 * It is implicitly called when you use something like `$collection[$name] = $cookie;`.
-	 * This is equivalent to [[add()]].
-	 * @param string $name the cookie name
-	 * @param Cookie $cookie the cookie to be added
-	 */
-	public function offsetSet($name, $cookie)
-	{
-		$this->add($cookie);
-	}
-
-	/**
-	 * Removes the named cookie.
-	 * This method is required by the SPL interface `ArrayAccess`.
-	 * It is implicitly called when you use something like `unset($collection[$name])`.
-	 * This is equivalent to [[remove()]].
-	 * @param string $name the cookie name
-	 */
-	public function offsetUnset($name)
-	{
-		$this->remove($name);
-	}
-
-	/**
-	 * Returns the current cookies in terms of [[Cookie]] objects.
-	 * @return Cookie[] list of current cookies
-	 */
-	protected function loadCookies()
-	{
-		$cookies = array();
-		if ($this->enableValidation) {
-			if ($this->validationKey === null) {
-				$key = SecurityHelper::getSecretKey(__CLASS__ . '/' . Yii::$app->id);
-			} else {
-				$key = $this->validationKey;
-			}
-			foreach ($_COOKIE as $name => $value) {
-				if (is_string($value) && ($value = SecurityHelper::validateData($value, $key)) !== false) {
-					$cookies[$name] = new Cookie(array(
-						'name' => $name,
-						'value' => @unserialize($value),
-					));
-				}
-			}
-		} else {
-			foreach ($_COOKIE as $name => $value) {
-				$cookies[$name] = new Cookie(array(
-					'name' => $name,
-					'value' => $value,
-				));
-			}
-		}
-		return $cookies;
-	}
-}
diff --git a/framework/web/DbSession.php b/framework/web/DbSession.php
deleted file mode 100644
index e81aa7f..0000000
--- a/framework/web/DbSession.php
+++ /dev/null
@@ -1,221 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-use Yii;
-use yii\db\Connection;
-use yii\db\Query;
-use yii\base\InvalidConfigException;
-
-/**
- * DbSession extends [[Session]] by using database as session data storage.
- *
- * By default, DbSession stores session data in a DB table named 'tbl_session'. This table
- * must be pre-created. The table name can be changed by setting [[sessionTable]].
- * 
- * The following example shows how you can configure the application to use DbSession:
- * 
- * ~~~
- * 'session' => array(
- *     'class' => 'yii\web\DbSession',
- *     // 'db' => 'mydb',
- *     // 'sessionTable' => 'my_session',
- * )
- * ~~~
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class DbSession extends Session
-{
-	/**
-	 * @var Connection|string the DB connection object or the application component ID of the DB connection.
-	 * After the DbSession object is created, if you want to change this property, you should only assign it
-	 * with a DB connection object.
-	 */
-	public $db = 'db';
-	/**
-	 * @var string the name of the DB table that stores the session data.
-	 * The table should be pre-created as follows:
-	 *
-	 * ~~~
-	 * CREATE TABLE tbl_session
-	 * (
-	 *     id CHAR(40) NOT NULL PRIMARY KEY,
-	 *     expire INTEGER,
-	 *     data BLOB
-	 * )
-	 * ~~~
-	 *
-	 * where 'BLOB' refers to the BLOB-type of your preferred DBMS. Below are the BLOB type
-	 * that can be used for some popular DBMS:
-	 *
-	 * - MySQL: LONGBLOB
-	 * - PostgreSQL: BYTEA
-	 * - MSSQL: BLOB
-	 *
-	 * When using DbSession in a production server, we recommend you create a DB index for the 'expire'
-	 * column in the session table to improve the performance.
-	 */
-	public $sessionTable = 'tbl_session';
-
-	/**
-	 * Initializes the DbSession component.
-	 * This method will initialize the [[db]] property to make sure it refers to a valid DB connection.
-	 * @throws InvalidConfigException if [[db]] is invalid.
-	 */
-	public function init()
-	{
-		if (is_string($this->db)) {
-			$this->db = Yii::$app->getComponent($this->db);
-		}
-		if (!$this->db instanceof Connection) {
-			throw new InvalidConfigException("DbSession::db must be either a DB connection instance or the application component ID of a DB connection.");
-		}
-		parent::init();
-	}
-
-	/**
-	 * Returns a value indicating whether to use custom session storage.
-	 * This method overrides the parent implementation and always returns true.
-	 * @return boolean whether to use custom storage.
-	 */
-	public function getUseCustomStorage()
-	{
-		return true;
-	}
-
-	/**
-	 * Updates the current session ID with a newly generated one .
-	 * Please refer to [[http://php.net/session_regenerate_id]] for more details.
-	 * @param boolean $deleteOldSession Whether to delete the old associated session file or not.
-	 */
-	public function regenerateID($deleteOldSession = false)
-	{
-		$oldID = session_id();
-
-		// if no session is started, there is nothing to regenerate
-		if (empty($oldID)) {
-			return;
-		}
-
-		parent::regenerateID(false);
-		$newID = session_id();
-
-		$query = new Query;
-		$row = $query->from($this->sessionTable)
-			->where(array('id' => $oldID))
-			->createCommand($this->db)
-			->queryRow();
-		if ($row !== false) {
-			if ($deleteOldSession) {
-				$this->db->createCommand()
-					->update($this->sessionTable, array('id' => $newID), array('id' => $oldID))
-					->execute();
-			} else {
-				$row['id'] = $newID;
-				$this->db->createCommand()
-					->insert($this->sessionTable, $row)
-					->execute();
-			}
-		} else {
-			// shouldn't reach here normally
-			$this->db->createCommand()
-				->insert($this->sessionTable, array(
-					'id' => $newID,
-					'expire' => time() + $this->getTimeout(),
-				))->execute();
-		}
-	}
-
-	/**
-	 * Session read handler.
-	 * Do not call this method directly.
-	 * @param string $id session ID
-	 * @return string the session data
-	 */
-	public function readSession($id)
-	{
-		$query = new Query;
-		$data = $query->select(array('data'))
-			->from($this->sessionTable)
-			->where('[[expire]]>:expire AND [[id]]=:id', array(':expire' => time(), ':id' => $id))
-			->createCommand($this->db)
-			->queryScalar();
-		return $data === false ? '' : $data;
-	}
-
-	/**
-	 * Session write handler.
-	 * Do not call this method directly.
-	 * @param string $id session ID
-	 * @param string $data session data
-	 * @return boolean whether session write is successful
-	 */
-	public function writeSession($id, $data)
-	{
-		// exception must be caught in session write handler
-		// http://us.php.net/manual/en/function.session-set-save-handler.php
-		try {
-			$expire = time() + $this->getTimeout();
-			$query = new Query;
-			$exists = $query->select(array('id'))
-				->from($this->sessionTable)
-				->where(array('id' => $id))
-				->createCommand($this->db)
-				->queryScalar();
-			if ($exists === false) {
-				$this->db->createCommand()
-					->insert($this->sessionTable, array(
-						'id' => $id,
-						'data' => $data,
-						'expire' => $expire,
-					))->execute();
-			} else {
-				$this->db->createCommand()
-					->update($this->sessionTable, array('data' => $data, 'expire' => $expire), array('id' => $id))
-					->execute();
-			}
-		} catch (\Exception $e) {
-			if (YII_DEBUG) {
-				echo $e->getMessage();
-			}
-			// it is too late to log an error message here
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Session destroy handler.
-	 * Do not call this method directly.
-	 * @param string $id session ID
-	 * @return boolean whether session is destroyed successfully
-	 */
-	public function destroySession($id)
-	{
-		$this->db->createCommand()
-			->delete($this->sessionTable, array('id' => $id))
-			->execute();
-		return true;
-	}
-
-	/**
-	 * Session GC (garbage collection) handler.
-	 * Do not call this method directly.
-	 * @param integer $maxLifetime the number of seconds after which data will be seen as 'garbage' and cleaned up.
-	 * @return boolean whether session is GCed successfully
-	 */
-	public function gcSession($maxLifetime)
-	{
-		$this->db->createCommand()
-			->delete($this->sessionTable, '[[expire]]<:expire', array(':expire' => time()))
-			->execute();
-		return true;
-	}
-}
diff --git a/framework/web/HttpCache.php b/framework/web/HttpCache.php
deleted file mode 100644
index 0a3bb86..0000000
--- a/framework/web/HttpCache.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-use Yii;
-use yii\base\ActionFilter;
-use yii\base\Action;
-
-/**
- * @author Da:Sourcerer <webmaster@dasourcerer.net>
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class HttpCache extends ActionFilter
-{
-	/**
-	 * @var callback a PHP callback that returns the UNIX timestamp of the last modification time.
-	 * The callback's signature should be:
-	 *
-	 * ~~~
-	 * function ($action, $params)
-	 * ~~~
-	 *
-	 * where `$action` is the [[Action]] object that this filter is currently handling;
-	 * `$params` takes the value of [[params]]. The callback should return a UNIX timestamp.
-	 */
-	public $lastModified;
-	/**
-	 * @var callback a PHP callback that generates the Etag seed string.
-	 * The callback's signature should be:
-	 *
-	 * ~~~
-	 * function ($action, $params)
-	 * ~~~
-	 *
-	 * where `$action` is the [[Action]] object that this filter is currently handling;
-	 * `$params` takes the value of [[params]]. The callback should return a string serving
-	 * as the seed for generating an Etag.
-	 */
-	public $etagSeed;
-	/**
-	 * @var mixed additional parameters that should be passed to the [[lastModified]] and [[etagSeed]] callbacks.
-	 */
-	public $params;
-	/**
-	 * @var string HTTP cache control header. If null, the header will not be sent.
-	 */
-	public $cacheControlHeader = 'Cache-Control: max-age=3600, public';
-
-	/**
-	 * This method is invoked right before an action is to be executed (after all possible filters.)
-	 * You may override this method to do last-minute preparation for the action.
-	 * @param Action $action the action to be executed.
-	 * @return boolean whether the action should continue to be executed.
-	 */
-	public function beforeAction($action)
-	{
-		$verb = Yii::$app->request->getRequestMethod();
-		if ($verb !== 'GET' && $verb !== 'HEAD' || $this->lastModified === null && $this->etagSeed === null) {
-			return true;
-		}
-
-		$lastModified = $etag = null;
-		if ($this->lastModified !== null) {
-			$lastModified = call_user_func($this->lastModified, $action, $this->params);
-		}
-		if ($this->etagSeed !== null) {
-			$seed = call_user_func($this->etagSeed, $action, $this->params);
-			$etag = $this->generateEtag($seed);
-		}
-
-		$this->sendCacheControlHeader();
-		if ($etag !== null) {
-			header("ETag: $etag");
-		}
-
-		if ($this->validateCache($lastModified, $etag)) {
-			header('HTTP/1.1 304 Not Modified');
-			return false;
-		}
-
-		if ($lastModified !== null) {
-			header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $lastModified) . ' GMT');
-		}
-		return true;
-	}
-
-	/**
-	 * Validates if the HTTP cache contains valid content.
-	 * @param integer $lastModified the calculated Last-Modified value in terms of a UNIX timestamp.
-	 * If null, the Last-Modified header will not be validated.
-	 * @param string $etag the calculated ETag value. If null, the ETag header will not be validated.
-	 * @return boolean whether the HTTP cache is still valid.
-	 */
-	protected function validateCache($lastModified, $etag)
-	{
-		if ($lastModified !== null && (!isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) || @strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) < $lastModified)) {
-			return false;
-		} else {
-			return $etag === null || isset($_SERVER['HTTP_IF_NONE_MATCH']) && $_SERVER['HTTP_IF_NONE_MATCH'] === $etag;
-		}
-	}
-
-	/**
-	 * Sends the cache control header to the client
-	 * @see cacheControl
-	 */
-	protected function sendCacheControlHeader()
-	{
-		session_cache_limiter('public');
-		header('Pragma:', true);
-		if ($this->cacheControlHeader !== null) {
-			header($this->cacheControlHeader, true);
-		}
-	}
-
-	/**
-	 * Generates an Etag from the given seed string.
-	 * @param string $seed Seed for the ETag
-	 * @return string the generated Etag
-	 */
-	protected function generateEtag($seed)
-	{
-		return '"' . base64_encode(sha1($seed, true)) . '"';
-	}
-}
diff --git a/framework/web/IAssetConverter.php b/framework/web/IAssetConverter.php
deleted file mode 100644
index d1d1da0..0000000
--- a/framework/web/IAssetConverter.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-/**
- * The IAssetConverter interface must be implemented by asset converter classes.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-interface IAssetConverter
-{
-	/**
-	 * Converts a given asset file into a CSS or JS file.
-	 * @param string $asset the asset file path, relative to $basePath
-	 * @param string $basePath the directory the $asset is relative to.
-	 * @param string $baseUrl the URL corresponding to $basePath
-	 * @return string the URL to the converted asset file. If the given asset does not
-	 * need conversion, "$baseUrl/$asset" should be returned.
-	 */
-	public function convert($asset, $basePath, $baseUrl);
-}
diff --git a/framework/web/Identity.php b/framework/web/Identity.php
deleted file mode 100644
index 101ecdb..0000000
--- a/framework/web/Identity.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-/**
- * Identity is the interface that should be implemented by a class providing identity information.
- *
- * This interface can typically be implemented by a user model class. For example, the following
- * code shows how to implement this interface by a User ActiveRecord class:
- *
- * ~~~
- * class User extends ActiveRecord implements Identity
- * {
- *     public static function findIdentity($id)
- *     {
- *         return static::find($id);
- *     }
- *
- *     public function getId()
- *     {
- *         return $this->id;
- *     }
- *
- *     public function getAuthKey()
- *     {
- *         return $this->authKey;
- *     }
- *
- *     public function validateAuthKey($authKey)
- *     {
- *         return $this->authKey === $authKey;
- *     }
- * }
- * ~~~
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-interface Identity
-{
-	/**
-	 * Finds an identity by the given ID.
-	 * @param string|integer $id the ID to be looked for
-	 * @return Identity the identity object that matches the given ID.
-	 * Null should be returned if such an identity cannot be found
-	 * or the identity is not in an active state (disabled, deleted, etc.)
-	 */
-	public static function findIdentity($id);
-	/**
-	 * Returns an ID that can uniquely identify a user identity.
-	 * @return string|integer an ID that uniquely identifies a user identity.
-	 */
-	public function getId();
-	/**
-	 * Returns a key that can be used to check the validity of a given identity ID.
-	 *
-	 * The key should be unique for each individual user, and should be persistent
-	 * so that it can be used to check the validity of the user identity.
-	 *
-	 * The space of such keys should be big enough to defeat potential identity attacks.
-	 *
-	 * This is required if [[User::enableAutoLogin]] is enabled.
-	 * @return string a key that is used to check the validity of a given identity ID.
-	 * @see validateAuthKey()
-	 */
-	public function getAuthKey();
-	/**
-	 * Validates the given auth key.
-	 *
-	 * This is required if [[User::enableAutoLogin]] is enabled.
-	 * @param string $authKey the given auth key
-	 * @return boolean whether the given auth key is valid.
-	 * @see getAuthKey()
-	 */
-	public function validateAuthKey($authKey);
-}
diff --git a/framework/web/JsExpression.php b/framework/web/JsExpression.php
deleted file mode 100644
index 027c065..0000000
--- a/framework/web/JsExpression.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-use yii\base\Object;
-
-/**
- * JsExpression marks a string as a JavaScript expression.
- * When using [[Json::encode()]] to encode a value, JsonExpression objects
- * will be specially handled and encoded as a JavaScript expression instead of a string.
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class JsExpression extends Object
-{
-	/**
-	 * @var string the JavaScript expression represented by this object
-	 */
-	public $expression;
-
-	/**
-	 * Constructor.
-	 * @param string $expression the JavaScript expression represented by this object
-	 * @param array $config additional configurations for this object
-	 */
-	public function __construct($expression, $config = array())
-	{
-		$this->expression = $expression;
-		parent::__construct($config);
-	}
-
-	/**
-	 * The PHP magic function converting an object into a string.
-	 * @return string the JavaScript expression.
-	 */
-	public function __toString()
-	{
-		return $this->expression;
-	}
-}
diff --git a/framework/web/PageCache.php b/framework/web/PageCache.php
deleted file mode 100644
index 2fe36b3..0000000
--- a/framework/web/PageCache.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-use Yii;
-use yii\base\ActionFilter;
-use yii\base\Action;
-use yii\base\View;
-use yii\caching\Dependency;
-
-/**
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class PageCache extends ActionFilter
-{
-	/**
-	 * @var boolean whether the content being cached should be differentiated according to the route.
-	 * A route consists of the requested controller ID and action ID. Defaults to true.
-	 */
-	public $varyByRoute = true;
-	/**
-	 * @var string the application component ID of the [[\yii\caching\Cache|cache]] object.
-	 */
-	public $cache = 'cache';
-	/**
-	 * @var integer number of seconds that the data can remain valid in cache.
-	 * Use 0 to indicate that the cached data will never expire.
-	 */
-	public $duration = 60;
-	/**
-	 * @var array|Dependency the dependency that the cached content depends on.
-	 * This can be either a [[Dependency]] object or a configuration array for creating the dependency object.
-	 * For example,
-	 *
-	 * ~~~
-	 * array(
-	 *     'class' => 'yii\caching\DbDependency',
-	 *     'sql' => 'SELECT MAX(lastModified) FROM Post',
-	 * )
-	 * ~~~
-	 *
-	 * would make the output cache depends on the last modified time of all posts.
-	 * If any post has its modification time changed, the cached content would be invalidated.
-	 */
-	public $dependency;
-	/**
-	 * @var array list of factors that would cause the variation of the content being cached.
-	 * Each factor is a string representing a variation (e.g. the language, a GET parameter).
-	 * The following variation setting will cause the content to be cached in different versions
-	 * according to the current application language:
-	 *
-	 * ~~~
-	 * array(
-	 *     Yii::$app->language,
-	 * )
-	 */
-	public $variations;
-	/**
-	 * @var boolean whether to enable the fragment cache. You may use this property to turn on and off
-	 * the fragment cache according to specific setting (e.g. enable fragment cache only for GET requests).
-	 */
-	public $enabled = true;
-
-
-	public function init()
-	{
-		parent::init();
-		if ($this->view === null) {
-			$this->view = Yii::$app->getView();
-		}
-	}
-
-	/**
-	 * This method is invoked right before an action is to be executed (after all possible filters.)
-	 * You may override this method to do last-minute preparation for the action.
-	 * @param Action $action the action to be executed.
-	 * @return boolean whether the action should continue to be executed.
-	 */
-	public function beforeAction($action)
-	{
-		$properties = array();
-		foreach (array('cache', 'duration', 'dependency', 'variations', 'enabled') as $name) {
-			$properties[$name] = $this->$name;
-		}
-		$id = $this->varyByRoute ? $action->getUniqueId() : __CLASS__;
-		return $this->view->beginCache($id, $properties);
-	}
-
-	/**
-	 * This method is invoked right after an action is executed.
-	 * You may override this method to do some postprocessing for the action.
-	 * @param Action $action the action just executed.
-	 */
-	public function afterAction($action)
-	{
-		$this->view->endCache();
-	}
-}
diff --git a/framework/web/Pagination.php b/framework/web/Pagination.php
deleted file mode 100644
index 764dbb4..0000000
--- a/framework/web/Pagination.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-use Yii;
-
-/**
- * Pagination represents information relevant to pagination of data items.
- *
- * When data needs to be rendered in multiple pages, Pagination can be used to
- * represent information such as [[itemCount|total item count]], [[pageSize|page size]],
- * [[page|current page]], etc. These information can be passed to [[yii\widgets\Pager|pagers]]
- * to render pagination buttons or links.
- *
- * The following example shows how to create a pagination object and feed it
- * to a pager.
- *
- * Controller action:
- *
- * ~~~
- * function actionIndex()
- * {
- *     $query = Article::find()->where(array('status' => 1));
- *     $countQuery = clone $query;
- *     $pages = new Pagination($countQuery->count());
- *     $models = $query->offset($pages->offset)
- *         ->limit($pages->limit)
- *         ->all();
- *
- *     $this->render('index', array(
- *          'models' => $models,
- *          'pages' => $pages,
- *     ));
- * }
- * ~~~
- *
- * View:
- *
- * ~~~
- * foreach($models as $model) {
- *     // display $model here
- * }
- *
- * // display pagination
- * $this->widget('yii\widgets\LinkPager', array(
- *     'pages' => $pages,
- * ));
- * ~~~
- *
- * @property integer $pageCount Number of pages.
- * @property integer $page The zero-based index of the current page.
- * @property integer $offset The offset of the data. This may be used to set the
- * OFFSET value for a SQL statement for fetching the current page of data.
- * @property integer $limit The limit of the data. This may be used to set the
- * LIMIT value for a SQL statement for fetching the current page of data.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Pagination extends \yii\base\Object
-{
-	/**
-	 * @var string name of the parameter storing the current page index. Defaults to 'page'.
-	 * @see params
-	 */
-	public $pageVar = 'page';
-	/**
-	 * @var boolean whether to always have the page parameter in the URL created by [[createUrl()]].
-	 * If false and [[page]] is 0, the page parameter will not be put in the URL.
-	 */
-	public $forcePageVar = false;
-	/**
-	 * @var string the route of the controller action for displaying the paged contents.
-	 * If not set, it means using the currently requested route.
-	 */
-	public $route;
-	/**
-	 * @var array parameters (name=>value) that should be used to obtain the current page number
-	 * and to create new pagination URLs. If not set, $_GET will be used instead.
-	 *
-	 * The array element indexed by [[pageVar]] is considered to be the current page number.
-	 * If the element does not exist, the current page number is considered 0.
-	 */
-	public $params;
-	/**
-	 * @var boolean whether to check if [[page]] is within valid range.
-	 * When this property is true, the value of [[page]] will always be between 0 and ([[pageCount]]-1).
-	 * Because [[pageCount]] relies on the correct value of [[itemCount]] which may not be available
-	 * in some cases (e.g. MongoDB), you may want to set this property to be false to disable the page
-	 * number validation. By doing so, [[page]] will return the value indexed by [[pageVar]] in [[params]].
-	 */
-	public $validatePage = true;
-	/**
-	 * @var integer number of items on each page. Defaults to 10.
-	 * If it is less than 1, it means the page size is infinite, and thus a single page contains all items.
-	 */
-	public $pageSize = 10;
-	/**
-	 * @var integer total number of items.
-	 */
-	public $itemCount;
-
-	/**
-	 * Constructor.
-	 * @param integer $itemCount total number of items.
-	 * @param array $config name-value pairs that will be used to initialize the object properties
-	 */
-	public function __construct($itemCount, $config = array())
-	{
-		$this->itemCount = $itemCount;
-		parent::__construct($config);
-	}
-
-	/**
-	 * @return integer number of pages
-	 */
-	public function getPageCount()
-	{
-		if ($this->pageSize < 1) {
-			return $this->itemCount > 0 ? 1 : 0;
-		} else {
-			$itemCount = $this->itemCount < 0 ? 0 : (int)$this->itemCount;
-			return (int)(($itemCount + $this->pageSize - 1) / $this->pageSize);
-		}
-	}
-
-	private $_page;
-
-	/**
-	 * Returns the zero-based current page number.
-	 * @param boolean $recalculate whether to recalculate the current page based on the page size and item count.
-	 * @return integer the zero-based current page number.
-	 */
-	public function getPage($recalculate = false)
-	{
-		if ($this->_page === null || $recalculate) {
-			$params = $this->params === null ? $_GET : $this->params;
-			if (isset($params[$this->pageVar]) && is_scalar($params[$this->pageVar])) {
-				$this->_page = (int)$params[$this->pageVar] - 1;
-				if ($this->validatePage) {
-					$pageCount = $this->getPageCount();
-					if ($this->_page >= $pageCount) {
-						$this->_page = $pageCount - 1;
-					}
-				}
-				if ($this->_page < 0) {
-					$this->_page = 0;
-				}
-			} else {
-				$this->_page = 0;
-			}
-		}
-		return $this->_page;
-	}
-
-	/**
-	 * Sets the current page number.
-	 * @param integer $value the zero-based index of the current page.
-	 */
-	public function setPage($value)
-	{
-		$this->_page = $value;
-	}
-
-	/**
-	 * Creates the URL suitable for pagination with the specified page number.
-	 * This method is mainly called by pagers when creating URLs used to perform pagination.
-	 * @param integer $page the zero-based page number that the URL should point to.
-	 * @return string the created URL
-	 * @see params
-	 * @see forcePageVar
-	 */
-	public function createUrl($page)
-	{
-		$params = $this->params === null ? $_GET : $this->params;
-		if ($page > 0 || $page >= 0 && $this->forcePageVar) {
-			$params[$this->pageVar] = $page + 1;
-		} else {
-			unset($params[$this->pageVar]);
-		}
-		$route = $this->route === null ? Yii::$app->controller->route : $this->route;
-		return Yii::$app->getUrlManager()->createUrl($route, $params);
-	}
-
-	/**
-	 * @return integer the offset of the data. This may be used to set the
-	 * OFFSET value for a SQL statement for fetching the current page of data.
-	 */
-	public function getOffset()
-	{
-		return $this->pageSize < 1 ? 0 : $this->getPage() * $this->pageSize;
-	}
-
-	/**
-	 * @return integer the limit of the data. This may be used to set the
-	 * LIMIT value for a SQL statement for fetching the current page of data.
-	 * Note that if the page size is infinite, a value -1 will be returned.
-	 */
-	public function getLimit()
-	{
-		return $this->pageSize < 1 ? -1 : $this->pageSize;
-	}
-}
diff --git a/framework/web/Request.php b/framework/web/Request.php
deleted file mode 100644
index d3f419b..0000000
--- a/framework/web/Request.php
+++ /dev/null
@@ -1,794 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-use Yii;
-use yii\base\HttpException;
-use yii\base\InvalidConfigException;
-
-/**
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Request extends \yii\base\Request
-{
-	/**
-	 * @var boolean whether to enable CSRF (Cross-Site Request Forgery) validation. Defaults to false.
-	 * By setting this property to true, forms submitted to an Yii Web application must be originated
-	 * from the same application. If not, a 400 HTTP exception will be raised.
-	 *
-	 * Note, this feature requires that the user client accepts cookie. Also, to use this feature,
-	 * forms submitted via POST method must contain a hidden input whose name is specified by [[csrfTokenName]].
-	 * You may use [[\yii\web\Html::beginForm()]] to generate his hidden input.
-	 * @see http://en.wikipedia.org/wiki/Cross-site_request_forgery
-	 */
-	public $enableCsrfValidation = false;
-	/**
-	 * @var string the name of the token used to prevent CSRF. Defaults to 'YII_CSRF_TOKEN'.
-	 * This property is effectively only when {@link enableCsrfValidation} is true.
-	 */
-	public $csrfTokenName = '_csrf';
-	/**
-	 * @var array the configuration of the CSRF cookie. This property is used only when [[enableCsrfValidation]] is true.
-	 * @see Cookie
-	 */
-	public $csrfCookie = array('httponly' => true);
-	/**
-	 * @var boolean whether cookies should be validated to ensure they are not tampered. Defaults to true.
-	 */
-	public $enableCookieValidation = true;
-	/**
-	 * @var string the secret key used for cookie validation. If not set, a random key will be generated and used.
-	 */
-	public $cookieValidationKey;
-	/**
-	 * @var string|boolean the name of the POST parameter that is used to indicate if a request is a PUT or DELETE
-	 * request tunneled through POST. Default to '_method'.
-	 * @see getRequestMethod
-	 * @see getRestParams
-	 */
-	public $restVar = '_method';
-
-	private $_cookies;
-
-
-	/**
-	 * Resolves the current request into a route and the associated parameters.
-	 * @return array the first element is the route, and the second is the associated parameters.
-	 * @throws HttpException if the request cannot be resolved.
-	 */
-	public function resolve()
-	{
-		$this->validateCsrfToken();
-
-		$result = Yii::$app->getUrlManager()->parseRequest($this);
-		if ($result !== false) {
-			list ($route, $params) = $result;
-			$_GET = array_merge($_GET, $params);
-			return array($route, $_GET);
-		} else {
-			throw new HttpException(404, Yii::t('yii|Page not found.'));
-		}
-	}
-
-	/**
-	 * Returns the method of the current request (e.g. GET, POST, HEAD, PUT, DELETE).
-	 * @return string request method, such as GET, POST, HEAD, PUT, DELETE.
-	 * The value returned is turned into upper case.
-	 */
-	public function getRequestMethod()
-	{
-		if (isset($_POST[$this->restVar])) {
-			return strtoupper($_POST[$this->restVar]);
-		} else {
-			return isset($_SERVER['REQUEST_METHOD']) ? strtoupper($_SERVER['REQUEST_METHOD']) : 'GET';
-		}
-	}
-
-	/**
-	 * Returns whether this is a POST request.
-	 * @return boolean whether this is a POST request.
-	 */
-	public function getIsPostRequest()
-	{
-		return $this->getRequestMethod() === 'POST';
-	}
-
-	/**
-	 * Returns whether this is a DELETE request.
-	 * @return boolean whether this is a DELETE request.
-	 */
-	public function getIsDeleteRequest()
-	{
-		return $this->getRequestMethod() === 'DELETE';
-	}
-
-	/**
-	 * Returns whether this is a PUT request.
-	 * @return boolean whether this is a PUT request.
-	 */
-	public function getIsPutRequest()
-	{
-		return $this->getRequestMethod() === 'PUT';
-	}
-
-	/**
-	 * Returns whether this is an AJAX (XMLHttpRequest) request.
-	 * @return boolean whether this is an AJAX (XMLHttpRequest) request.
-	 */
-	public function getIsAjaxRequest()
-	{
-		return isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest';
-	}
-
-	/**
-	 * Returns whether this is an Adobe Flash or Flex request.
-	 * @return boolean whether this is an Adobe Flash or Adobe Flex request.
-	 */
-	public function getIsFlashRequest()
-	{
-		return isset($_SERVER['HTTP_USER_AGENT']) &&
-			(stripos($_SERVER['HTTP_USER_AGENT'], 'Shockwave') !== false || stripos($_SERVER['HTTP_USER_AGENT'], 'Flash') !== false);
-	}
-
-	private $_restParams;
-
-	/**
-	 * Returns the request parameters for the RESTful request.
-	 * @return array the RESTful request parameters
-	 * @see getRequestMethod
-	 */
-	public function getRestParams()
-	{
-		if ($this->_restParams === null) {
-			if (isset($_POST[$this->restVar])) {
-				$this->_restParams = $_POST;
-			} else {
-				$this->_restParams = array();
-				if (function_exists('mb_parse_str')) {
-					mb_parse_str($this->getRawBody(), $this->_restParams);
-				} else {
-					parse_str($this->getRawBody(), $this->_restParams);
-				}
-			}
-		}
-		return $this->_restParams;
-	}
-
-	private $_rawBody;
-
-	/**
-	 * Returns the raw HTTP request body.
-	 * @return string the request body
-	 */
-	public function getRawBody()
-	{
-		if ($this->_rawBody === null) {
-			$this->_rawBody = file_get_contents('php://input');
-		}
-		return $this->_rawBody;
-	}
-
-	/**
-	 * Sets the RESTful parameters.
-	 * @param array $values the RESTful parameters (name-value pairs)
-	 */
-	public function setRestParams($values)
-	{
-		$this->_restParams = $values;
-	}
-
-	/**
-	 * Returns the named RESTful parameter value.
-	 * @param string $name the parameter name
-	 * @param mixed $defaultValue the default parameter value if the parameter does not exist.
-	 * @return mixed the parameter value
-	 */
-	public function getRestParam($name, $defaultValue = null)
-	{
-		$params = $this->getRestParams();
-		return isset($params[$name]) ? $params[$name] : $defaultValue;
-	}
-
-	/**
-	 * Returns the named GET parameter value.
-	 * If the GET parameter does not exist, the second parameter to this method will be returned.
-	 * @param string $name the GET parameter name
-	 * @param mixed $defaultValue the default parameter value if the GET parameter does not exist.
-	 * @return mixed the GET parameter value
-	 * @see getPost
-	 */
-	public function getParam($name, $defaultValue = null)
-	{
-		return isset($_GET[$name]) ? $_GET[$name] : $defaultValue;
-	}
-
-	/**
-	 * Returns the named POST parameter value.
-	 * If the POST parameter does not exist, the second parameter to this method will be returned.
-	 * @param string $name the POST parameter name
-	 * @param mixed $defaultValue the default parameter value if the POST parameter does not exist.
-	 * @return mixed the POST parameter value
-	 * @see getParam
-	 */
-	public function getPost($name, $defaultValue = null)
-	{
-		return isset($_POST[$name]) ? $_POST[$name] : $defaultValue;
-	}
-
-	/**
-	 * Returns the named DELETE parameter value.
-	 * @param string $name the DELETE parameter name
-	 * @param mixed $defaultValue the default parameter value if the DELETE parameter does not exist.
-	 * @return mixed the DELETE parameter value
-	 */
-	public function getDelete($name, $defaultValue = null)
-	{
-		return $this->getIsDeleteRequest() ? $this->getRestParam($name, $defaultValue) : null;
-	}
-
-	/**
-	 * Returns the named PUT parameter value.
-	 * @param string $name the PUT parameter name
-	 * @param mixed $defaultValue the default parameter value if the PUT parameter does not exist.
-	 * @return mixed the PUT parameter value
-	 */
-	public function getPut($name, $defaultValue = null)
-	{
-		return $this->getIsPutRequest() ? $this->getRestParam($name, $defaultValue) : null;
-	}
-
-	private $_hostInfo;
-
-	/**
-	 * Returns the schema and host part of the current request URL.
-	 * The returned URL does not have an ending slash.
-	 * By default this is determined based on the user request information.
-	 * You may explicitly specify it by setting the [[setHostInfo()|hostInfo]] property.
-	 * @return string schema and hostname part (with port number if needed) of the request URL (e.g. `http://www.yiiframework.com`)
-	 * @see setHostInfo
-	 */
-	public function getHostInfo()
-	{
-		if ($this->_hostInfo === null) {
-			$secure = $this->getIsSecureConnection();
-			$http = $secure ? 'https' : 'http';
-			if (isset($_SERVER['HTTP_HOST'])) {
-				$this->_hostInfo = $http . '://' . $_SERVER['HTTP_HOST'];
-			} else {
-				$this->_hostInfo = $http . '://' . $_SERVER['SERVER_NAME'];
-				$port = $secure ? $this->getSecurePort() : $this->getPort();
-				if (($port !== 80 && !$secure) || ($port !== 443 && $secure)) {
-					$this->_hostInfo .= ':' . $port;
-				}
-			}
-		}
-
-		return $this->_hostInfo;
-	}
-
-	/**
-	 * Sets the schema and host part of the application URL.
-	 * This setter is provided in case the schema and hostname cannot be determined
-	 * on certain Web servers.
-	 * @param string $value the schema and host part of the application URL. The trailing slashes will be removed.
-	 */
-	public function setHostInfo($value)
-	{
-		$this->_hostInfo = rtrim($value, '/');
-	}
-
-	private $_baseUrl;
-
-	/**
-	 * Returns the relative URL for the application.
-	 * This is similar to [[scriptUrl]] except that it does not include the script file name,
-	 * and the ending slashes are removed.
-	 * @return string the relative URL for the application
-	 * @see setScriptUrl
-	 */
-	public function getBaseUrl()
-	{
-		if ($this->_baseUrl === null) {
-			$this->_baseUrl = rtrim(dirname($this->getScriptUrl()), '\\/');
-		}
-		return $this->_baseUrl;
-	}
-
-	/**
-	 * Sets the relative URL for the application.
-	 * By default the URL is determined based on the entry script URL.
-	 * This setter is provided in case you want to change this behavior.
-	 * @param string $value the relative URL for the application
-	 */
-	public function setBaseUrl($value)
-	{
-		$this->_baseUrl = $value;
-	}
-
-	private $_scriptUrl;
-
-	/**
-	 * Returns the relative URL of the entry script.
-	 * The implementation of this method referenced Zend_Controller_Request_Http in Zend Framework.
-	 * @return string the relative URL of the entry script.
-	 * @throws InvalidConfigException if unable to determine the entry script URL
-	 */
-	public function getScriptUrl()
-	{
-		if ($this->_scriptUrl === null) {
-			$scriptFile = $this->getScriptFile();
-			$scriptName = basename($scriptFile);
-			if (basename($_SERVER['SCRIPT_NAME']) === $scriptName) {
-				$this->_scriptUrl = $_SERVER['SCRIPT_NAME'];
-			} elseif (basename($_SERVER['PHP_SELF']) === $scriptName) {
-				$this->_scriptUrl = $_SERVER['PHP_SELF'];
-			} elseif (isset($_SERVER['ORIG_SCRIPT_NAME']) && basename($_SERVER['ORIG_SCRIPT_NAME']) === $scriptName) {
-				$this->_scriptUrl = $_SERVER['ORIG_SCRIPT_NAME'];
-			} elseif (($pos = strpos($_SERVER['PHP_SELF'], '/' . $scriptName)) !== false) {
-				$this->_scriptUrl = substr($_SERVER['SCRIPT_NAME'], 0, $pos) . '/' . $scriptName;
-			} elseif (isset($_SERVER['DOCUMENT_ROOT']) && strpos($scriptFile, $_SERVER['DOCUMENT_ROOT']) === 0) {
-				$this->_scriptUrl = str_replace('\\', '/', str_replace($_SERVER['DOCUMENT_ROOT'], '', $scriptFile));
-			} else {
-				throw new InvalidConfigException('Unable to determine the entry script URL.');
-			}
-		}
-		return $this->_scriptUrl;
-	}
-
-	/**
-	 * Sets the relative URL for the application entry script.
-	 * This setter is provided in case the entry script URL cannot be determined
-	 * on certain Web servers.
-	 * @param string $value the relative URL for the application entry script.
-	 */
-	public function setScriptUrl($value)
-	{
-		$this->_scriptUrl = '/' . trim($value, '/');
-	}
-
-	private $_scriptFile;
-
-	/**
-	 * Returns the entry script file path.
-	 * The default implementation will simply return `$_SERVER['SCRIPT_FILENAME']`.
-	 * @return string the entry script file path
-	 */
-	public function getScriptFile()
-	{
-		return isset($this->_scriptFile) ? $this->_scriptFile : $_SERVER['SCRIPT_FILENAME'];
-	}
-
-	/**
-	 * Sets the entry script file path.
-	 * The entry script file path normally can be obtained from `$_SERVER['SCRIPT_FILENAME']`.
-	 * If your server configuration does not return the correct value, you may configure
-	 * this property to make it right.
-	 * @param string $value the entry script file path.
-	 */
-	public function setScriptFile($value)
-	{
-		$this->_scriptFile = $value;
-	}
-
-	private $_pathInfo;
-
-	/**
-	 * Returns the path info of the currently requested URL.
-	 * A path info refers to the part that is after the entry script and before the question mark (query string).
-	 * The starting and ending slashes are both removed.
-	 * @return string part of the request URL that is after the entry script and before the question mark.
-	 * Note, the returned path info is already URL-decoded.
-	 * @throws InvalidConfigException if the path info cannot be determined due to unexpected server configuration
-	 */
-	public function getPathInfo()
-	{
-		if ($this->_pathInfo === null) {
-			$this->_pathInfo = $this->resolvePathInfo();
-		}
-		return $this->_pathInfo;
-	}
-
-	/**
-	 * Sets the path info of the current request.
-	 * This method is mainly provided for testing purpose.
-	 * @param string $value the path info of the current request
-	 */
-	public function setPathInfo($value)
-	{
-		$this->_pathInfo = trim($value, '/');
-	}
-
-	/**
-	 * Resolves the path info part of the currently requested URL.
-	 * A path info refers to the part that is after the entry script and before the question mark (query string).
-	 * The starting and ending slashes are both removed.
-	 * @return string part of the request URL that is after the entry script and before the question mark.
-	 * Note, the returned path info is decoded.
-	 * @throws InvalidConfigException if the path info cannot be determined due to unexpected server configuration
-	 */
-	protected function resolvePathInfo()
-	{
-		$pathInfo = $this->getUrl();
-
-		if (($pos = strpos($pathInfo, '?')) !== false) {
-			$pathInfo = substr($pathInfo, 0, $pos);
-		}
-
-		$pathInfo = urldecode($pathInfo);
-
-		// try to encode in UTF8 if not so
-		// http://w3.org/International/questions/qa-forms-utf-8.html
-		if (!preg_match('%^(?:
-				[\x09\x0A\x0D\x20-\x7E]              # ASCII
-				| [\xC2-\xDF][\x80-\xBF]             # non-overlong 2-byte
-				| \xE0[\xA0-\xBF][\x80-\xBF]         # excluding overlongs
-				| [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}  # straight 3-byte
-				| \xED[\x80-\x9F][\x80-\xBF]         # excluding surrogates
-				| \xF0[\x90-\xBF][\x80-\xBF]{2}      # planes 1-3
-				| [\xF1-\xF3][\x80-\xBF]{3}          # planes 4-15
-				| \xF4[\x80-\x8F][\x80-\xBF]{2}      # plane 16
-				)*$%xs', $pathInfo)) {
-			$pathInfo = utf8_encode($pathInfo);
-		}
-
-		$scriptUrl = $this->getScriptUrl();
-		$baseUrl = $this->getBaseUrl();
-		if (strpos($pathInfo, $scriptUrl) === 0) {
-			$pathInfo = substr($pathInfo, strlen($scriptUrl));
-		} elseif ($baseUrl === '' || strpos($pathInfo, $baseUrl) === 0) {
-			$pathInfo = substr($pathInfo, strlen($baseUrl));
-		} elseif (strpos($_SERVER['PHP_SELF'], $scriptUrl) === 0) {
-			$pathInfo = substr($_SERVER['PHP_SELF'], strlen($scriptUrl));
-		} else {
-			throw new InvalidConfigException('Unable to determine the path info of the current request.');
-		}
-
-		return trim($pathInfo, '/');
-	}
-
-	/**
-	 * Returns the currently requested absolute URL.
-	 * This is a shortcut to the concatenation of [[hostInfo]] and [[url]].
-	 * @return string the currently requested absolute URL.
-	 */
-	public function getAbsoluteUrl()
-	{
-		return $this->getHostInfo() . $this->getUrl();
-	}
-
-	private $_url;
-
-	/**
-	 * Returns the currently requested relative URL.
-	 * This refers to the portion of the URL that is after the [[hostInfo]] part.
-	 * It includes the [[queryString]] part if any.
-	 * @return string the currently requested relative URL. Note that the URI returned is URL-encoded.
-	 * @throws InvalidConfigException if the URL cannot be determined due to unusual server configuration
-	 */
-	public function getUrl()
-	{
-		if ($this->_url === null) {
-			$this->_url = $this->resolveRequestUri();
-		}
-		return $this->_url;
-	}
-
-	/**
-	 * Sets the currently requested relative URL.
-	 * The URI must refer to the portion that is after [[hostInfo]].
-	 * Note that the URI should be URL-encoded.
-	 * @param string $value the request URI to be set
-	 */
-	public function setUrl($value)
-	{
-		$this->_url = $value;
-	}
-
-	/**
-	 * Resolves the request URI portion for the currently requested URL.
-	 * This refers to the portion that is after the [[hostInfo]] part. It includes the [[queryString]] part if any.
-	 * The implementation of this method referenced Zend_Controller_Request_Http in Zend Framework.
-	 * @return string|boolean the request URI portion for the currently requested URL.
-	 * Note that the URI returned is URL-encoded.
-	 * @throws InvalidConfigException if the request URI cannot be determined due to unusual server configuration
-	 */
-	protected function resolveRequestUri()
-	{
-		if (isset($_SERVER['HTTP_X_REWRITE_URL'])) { // IIS
-			$requestUri = $_SERVER['HTTP_X_REWRITE_URL'];
-		} elseif (isset($_SERVER['REQUEST_URI'])) {
-			$requestUri = $_SERVER['REQUEST_URI'];
-			if ($requestUri !== '' && $requestUri[0] !== '/') {
-				$requestUri = preg_replace('/^(http|https):\/\/[^\/]+/i', '', $requestUri);
-			}
-		} elseif (isset($_SERVER['ORIG_PATH_INFO'])) { // IIS 5.0 CGI
-			$requestUri = $_SERVER['ORIG_PATH_INFO'];
-			if (!empty($_SERVER['QUERY_STRING'])) {
-				$requestUri .= '?' . $_SERVER['QUERY_STRING'];
-			}
-		} else {
-			throw new InvalidConfigException('Unable to determine the request URI.');
-		}
-		return $requestUri;
-	}
-
-	/**
-	 * Returns part of the request URL that is after the question mark.
-	 * @return string part of the request URL that is after the question mark
-	 */
-	public function getQueryString()
-	{
-		return isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '';
-	}
-
-	/**
-	 * Return if the request is sent via secure channel (https).
-	 * @return boolean if the request is sent via secure channel (https)
-	 */
-	public function getIsSecureConnection()
-	{
-		return !empty($_SERVER['HTTPS']) && strcasecmp($_SERVER['HTTPS'], 'off');
-	}
-
-	/**
-	 * Returns the server name.
-	 * @return string server name
-	 */
-	public function getServerName()
-	{
-		return $_SERVER['SERVER_NAME'];
-	}
-
-	/**
-	 * Returns the server port number.
-	 * @return integer server port number
-	 */
-	public function getServerPort()
-	{
-		return (int)$_SERVER['SERVER_PORT'];
-	}
-
-	/**
-	 * Returns the URL referrer, null if not present
-	 * @return string URL referrer, null if not present
-	 */
-	public function getReferrer()
-	{
-		return isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : null;
-	}
-
-	/**
-	 * Returns the user agent, null if not present.
-	 * @return string user agent, null if not present
-	 */
-	public function getUserAgent()
-	{
-		return isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : null;
-	}
-
-	/**
-	 * Returns the user IP address.
-	 * @return string user IP address
-	 */
-	public function getUserIP()
-	{
-		return isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '127.0.0.1';
-	}
-
-	/**
-	 * Returns the user host name, null if it cannot be determined.
-	 * @return string user host name, null if cannot be determined
-	 */
-	public function getUserHost()
-	{
-		return isset($_SERVER['REMOTE_HOST']) ? $_SERVER['REMOTE_HOST'] : null;
-	}
-
-	/**
-	 * Returns user browser accept types, null if not present.
-	 * @return string user browser accept types, null if not present
-	 */
-	public function getAcceptTypes()
-	{
-		return isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null;
-	}
-
-	private $_port;
-
-	/**
-	 * Returns the port to use for insecure requests.
-	 * Defaults to 80, or the port specified by the server if the current
-	 * request is insecure.
-	 * @return integer port number for insecure requests.
-	 * @see setPort
-	 */
-	public function getPort()
-	{
-		if ($this->_port === null) {
-			$this->_port = !$this->getIsSecureConnection() && isset($_SERVER['SERVER_PORT']) ? (int)$_SERVER['SERVER_PORT'] : 80;
-		}
-		return $this->_port;
-	}
-
-	/**
-	 * Sets the port to use for insecure requests.
-	 * This setter is provided in case a custom port is necessary for certain
-	 * server configurations.
-	 * @param integer $value port number.
-	 */
-	public function setPort($value)
-	{
-		if ($value != $this->_port) {
-			$this->_port = (int)$value;
-			$this->_hostInfo = null;
-		}
-	}
-
-	private $_securePort;
-
-	/**
-	 * Returns the port to use for secure requests.
-	 * Defaults to 443, or the port specified by the server if the current
-	 * request is secure.
-	 * @return integer port number for secure requests.
-	 * @see setSecurePort
-	 */
-	public function getSecurePort()
-	{
-		if ($this->_securePort === null) {
-			$this->_securePort = $this->getIsSecureConnection() && isset($_SERVER['SERVER_PORT']) ? (int)$_SERVER['SERVER_PORT'] : 443;
-		}
-		return $this->_securePort;
-	}
-
-	/**
-	 * Sets the port to use for secure requests.
-	 * This setter is provided in case a custom port is necessary for certain
-	 * server configurations.
-	 * @param integer $value port number.
-	 */
-	public function setSecurePort($value)
-	{
-		if ($value != $this->_securePort) {
-			$this->_securePort = (int)$value;
-			$this->_hostInfo = null;
-		}
-	}
-
-	private $_preferredLanguages;
-
-	/**
-	 * Returns the user preferred languages.
-	 * The languages returned are ordered by user's preference, starting with the language that the user
-	 * prefers the most.
-	 * @return string the user preferred languages. An empty array may be returned if the user has no preference.
-	 */
-	public function getPreferredLanguages()
-	{
-		if ($this->_preferredLanguages === null) {
-			if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) && ($n = preg_match_all('/([\w\-_]+)\s*(;\s*q\s*=\s*(\d*\.\d*))?/', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $matches)) > 0) {
-				$languages = array();
-				for ($i = 0; $i < $n; ++$i) {
-					$languages[$matches[1][$i]] = empty($matches[3][$i]) ? 1.0 : floatval($matches[3][$i]);
-				}
-				arsort($languages);
-				$this->_preferredLanguages = array_keys($languages);
-			} else {
-				$this->_preferredLanguages = array();
-			}
-		}
-		return $this->_preferredLanguages;
-	}
-
-	/**
-	 * Returns the language most preferred by the user.
-	 * @return string|boolean the language most preferred by the user. If the user has no preference, false
-	 * will be returned.
-	 */
-	public function getPreferredLanguage()
-	{
-		$languages = $this->getPreferredLanguages();
-		return isset($languages[0]) ? $languages[0] : false;
-	}
-
-	/**
-	 * Returns the cookie collection.
-	 * Through the returned cookie collection, you may access a cookie using the following syntax:
-	 *
-	 * ~~~
-	 * $cookie = $request->cookies['name']
-	 * if ($cookie !== null) {
-	 *     $value = $cookie->value;
-	 * }
-	 *
-	 * // alternatively
-	 * $value = $request->cookies->getValue('name');
-	 * ~~~
-	 *
-	 * @return CookieCollection the cookie collection.
-	 */
-	public function getCookies()
-	{
-		if ($this->_cookies === null) {
-			$this->_cookies = new CookieCollection(array(
-				'enableValidation' => $this->enableCookieValidation,
-				'validationKey' => $this->cookieValidationKey,
-			));
-		}
-		return $this->_cookies;
-	}
-
-	private $_csrfToken;
-
-	/**
-	 * Returns the random token used to perform CSRF validation.
-	 * The token will be read from cookie first. If not found, a new token will be generated.
-	 * @return string the random token for CSRF validation.
-	 * @see enableCsrfValidation
-	 */
-	public function getCsrfToken()
-	{
-		if ($this->_csrfToken === null) {
-			$cookies = $this->getCookies();
-			if (($this->_csrfToken = $cookies->getValue($this->csrfTokenName)) === null) {
-				$cookie = $this->createCsrfCookie();
-				$this->_csrfToken = $cookie->value;
-				$cookies->add($cookie);
-			}
-		}
-
-		return $this->_csrfToken;
-	}
-
-	/**
-	 * Creates a cookie with a randomly generated CSRF token.
-	 * Initial values specified in [[csrfCookie]] will be applied to the generated cookie.
-	 * @return Cookie the generated cookie
-	 * @see enableCsrfValidation
-	 */
-	protected function createCsrfCookie()
-	{
-		$options = $this->csrfCookie;
-		$options['name'] = $this->csrfTokenName;
-		$options['value'] = sha1(uniqid(mt_rand(), true));
-		return new Cookie($options);
-	}
-
-	/**
-	 * Performs the CSRF validation.
-	 * The method will compare the CSRF token obtained from a cookie and from a POST field.
-	 * If they are different, a CSRF attack is detected and a 400 HTTP exception will be raised.
-	 * @throws HttpException if the validation fails
-	 */
-	public function validateCsrfToken()
-	{
-		if (!$this->enableCsrfValidation) {
-			return;
-		}
-		$method = $this->getRequestMethod();
-		if ($method === 'POST' || $method === 'PUT' || $method === 'DELETE') {
-			$cookies = $this->getCookies();
-			switch ($method) {
-				case 'POST':
-					$token = $this->getPost($this->csrfTokenName);
-					break;
-				case 'PUT':
-					$token = $this->getPut($this->csrfTokenName);
-					break;
-				case 'DELETE':
-					$token = $this->getDelete($this->csrfTokenName);
-			}
-
-			if (empty($token) || $cookies->getValue($this->csrfTokenName) !== $token) {
-				throw new HttpException(400, Yii::t('yii|Unable to verify your data submission.'));
-			}
-		}
-	}
-}
-
diff --git a/framework/web/Response.php b/framework/web/Response.php
deleted file mode 100644
index 0503755..0000000
--- a/framework/web/Response.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-use Yii;
-use yii\helpers\FileHelper;
-use yii\helpers\Html;
-
-/**
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Response extends \yii\base\Response
-{
-	/**
-	 * @var integer the HTTP status code that should be used when redirecting in AJAX mode.
-	 * This is used by [[redirect()]]. A 2xx code should normally be used for this purpose
-	 * so that the AJAX handler will treat the response as a success.
-	 * @see redirect
-	 */
-	public $ajaxRedirectCode = 278;
-
-	/**
-	 * Sends a file to user.
-	 * @param string $fileName file name
-	 * @param string $content content to be set.
-	 * @param string $mimeType mime type of the content. If null, it will be guessed automatically based on the given file name.
-	 * @param boolean $terminate whether to terminate the current application after calling this method
-	 * @todo
-	 */
-	public function sendFile($fileName, $content, $mimeType = null, $terminate = true)
-	{
-		if ($mimeType === null && ($mimeType = FileHelper::getMimeType($fileName)) === null) {
-			$mimeType = 'application/octet-stream';
-		}
-		header('Pragma: public');
-		header('Expires: 0');
-		header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
-		header("Content-type: $mimeType");
-		if (ob_get_length() === false) {
-			header('Content-Length: ' . (function_exists('mb_strlen') ? mb_strlen($content, '8bit') : strlen($content)));
-		}
-		header("Content-Disposition: attachment; filename=\"$fileName\"");
-		header('Content-Transfer-Encoding: binary');
-
-		if ($terminate) {
-			// clean up the application first because the file downloading could take long time
-			// which may cause timeout of some resources (such as DB connection)
-			Yii::app()->end(0, false);
-			echo $content;
-			exit(0);
-		} else {
-			echo $content;
-		}
-	}
-
-	/**
-	 * Sends existing file to a browser as a download using x-sendfile.
-	 *
-	 * X-Sendfile is a feature allowing a web application to redirect the request for a file to the webserver
-	 * that in turn processes the request, this way eliminating the need to perform tasks like reading the file
-	 * and sending it to the user. When dealing with a lot of files (or very big files) this can lead to a great
-	 * increase in performance as the web application is allowed to terminate earlier while the webserver is
-	 * handling the request.
-	 *
-	 * The request is sent to the server through a special non-standard HTTP-header.
-	 * When the web server encounters the presence of such header it will discard all output and send the file
-	 * specified by that header using web server internals including all optimizations like caching-headers.
-	 *
-	 * As this header directive is non-standard different directives exists for different web servers applications:
-	 * <ul>
-	 * <li>Apache: {@link http://tn123.org/mod_xsendfile X-Sendfile}</li>
-	 * <li>Lighttpd v1.4: {@link http://redmine.lighttpd.net/projects/lighttpd/wiki/X-LIGHTTPD-send-file X-LIGHTTPD-send-file}</li>
-	 * <li>Lighttpd v1.5: {@link http://redmine.lighttpd.net/projects/lighttpd/wiki/X-LIGHTTPD-send-file X-Sendfile}</li>
-	 * <li>Nginx: {@link http://wiki.nginx.org/XSendfile X-Accel-Redirect}</li>
-	 * <li>Cherokee: {@link http://www.cherokee-project.com/doc/other_goodies.html#x-sendfile X-Sendfile and X-Accel-Redirect}</li>
-	 * </ul>
-	 * So for this method to work the X-SENDFILE option/module should be enabled by the web server and
-	 * a proper xHeader should be sent.
-	 *
-	 * <b>Note:</b>
-	 * This option allows to download files that are not under web folders, and even files that are otherwise protected (deny from all) like .htaccess
-	 *
-	 * <b>Side effects</b>:
-	 * If this option is disabled by the web server, when this method is called a download configuration dialog
-	 * will open but the downloaded file will have 0 bytes.
-	 *
-	 * <b>Known issues</b>:
-	 * There is a Bug with Internet Explorer 6, 7 and 8 when X-SENDFILE is used over an SSL connection, it will show
-	 * an error message like this: "Internet Explorer was not able to open this Internet site. The requested site is either unavailable or cannot be found.".
-	 * You can work around this problem by removing the <code>Pragma</code>-header.
-	 *
-	 * <b>Example</b>:
-	 * <pre>
-	 * <?php
-	 *    Yii::app()->request->xSendFile('/home/user/Pictures/picture1.jpg',array(
-	 *        'saveName'=>'image1.jpg',
-	 *        'mimeType'=>'image/jpeg',
-	 *        'terminate'=>false,
-	 *    ));
-	 * ?>
-	 * </pre>
-	 * @param string $filePath file name with full path
-	 * @param array $options additional options:
-	 * <ul>
-	 * <li>saveName: file name shown to the user, if not set real file name will be used</li>
-	 * <li>mimeType: mime type of the file, if not set it will be guessed automatically based on the file name, if set to null no content-type header will be sent.</li>
-	 * <li>xHeader: appropriate x-sendfile header, defaults to "X-Sendfile"</li>
-	 * <li>terminate: whether to terminate the current application after calling this method, defaults to true</li>
-	 * <li>forceDownload: specifies whether the file will be downloaded or shown inline, defaults to true</li>
-	 * <li>addHeaders: an array of additional http headers in header-value pairs</li>
-	 * </ul>
-	 * @todo
-	 */
-	public function xSendFile($filePath, $options = array())
-	{
-		if (!isset($options['forceDownload']) || $options['forceDownload']) {
-			$disposition = 'attachment';
-		} else {
-			$disposition = 'inline';
-		}
-
-		if (!isset($options['saveName'])) {
-			$options['saveName'] = basename($filePath);
-		}
-
-		if (!isset($options['mimeType'])) {
-			if (($options['mimeType'] = CFileHelper::getMimeTypeByExtension($filePath)) === null) {
-				$options['mimeType'] = 'text/plain';
-			}
-		}
-
-		if (!isset($options['xHeader'])) {
-			$options['xHeader'] = 'X-Sendfile';
-		}
-
-		if ($options['mimeType'] !== null) {
-			header('Content-type: ' . $options['mimeType']);
-		}
-		header('Content-Disposition: ' . $disposition . '; filename="' . $options['saveName'] . '"');
-		if (isset($options['addHeaders'])) {
-			foreach ($options['addHeaders'] as $header => $value) {
-				header($header . ': ' . $value);
-			}
-		}
-		header(trim($options['xHeader']) . ': ' . $filePath);
-
-		if (!isset($options['terminate']) || $options['terminate']) {
-			Yii::$app->end();
-		}
-	}
-
-	/**
-	 * Redirects the browser to the specified URL.
-	 * This method will send out a "Location" header to achieve the redirection.
-	 * In AJAX mode, this normally will not work as expected unless there are some
-	 * client-side JavaScript code handling the redirection. To help achieve this goal,
-	 * this method will use [[ajaxRedirectCode]] as the HTTP status code when performing
-	 * redirection in AJAX mode. The following JavaScript code may be used on the client
-	 * side to handle the redirection response:
-	 *
-	 * ~~~
-	 * $(document).ajaxSuccess(function(event, xhr, settings) {
-	 *     if (xhr.status == 278) {
-	 *         window.location = xhr.getResponseHeader('Location');
-	 *     }
-	 * });
-	 * ~~~
-	 *
-	 * @param array|string $url the URL to be redirected to. [[\yii\helpers\Html::url()]]
-	 * will be used to normalize the URL. If the resulting URL is still a relative URL
-	 * (one without host info), the current request host info will be used.
-	 * @param boolean $terminate whether to terminate the current application
-	 * @param integer $statusCode the HTTP status code. Defaults to 302.
-	 * See [[http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html]]
-	 * for details about HTTP status code.
-	 * Note that if the request is an AJAX request, [[ajaxRedirectCode]] will be used instead.
-	 */
-	public function redirect($url, $terminate = true, $statusCode = 302)
-	{
-		$url = Html::url($url);
-		if (strpos($url, '/') === 0 && strpos($url, '//') !== 0) {
-			$url = Yii::$app->getRequest()->getHostInfo() . $url;
-		}
-		if (Yii::$app->getRequest()->getIsAjaxRequest()) {
-			$statusCode = $this->ajaxRedirectCode;
-		}
-		header('Location: ' . $url, true, $statusCode);
-		if ($terminate) {
-			Yii::$app->end();
-		}
-	}
-
-	/**
-	 * Refreshes the current page.
-	 * The effect of this method call is the same as the user pressing the refresh button of his browser
-	 * (without re-posting data).
-	 * @param boolean $terminate whether to terminate the current application after calling this method
-	 * @param string $anchor the anchor that should be appended to the redirection URL.
-	 * Defaults to empty. Make sure the anchor starts with '#' if you want to specify it.
-	 */
-	public function refresh($terminate = true, $anchor = '')
-	{
-		$this->redirect(Yii::$app->getRequest()->getUrl() . $anchor, $terminate);
-	}
-
-	/**
-	 * Returns the cookie collection.
-	 * Through the returned cookie collection, you add or remove cookies as follows,
-	 *
-	 * ~~~
-	 * // add a cookie
-	 * $response->cookies->add(new Cookie(array(
-	 *     'name' => $name,
-	 *     'value' => $value,
-	 * ));
-	 *
-	 * // remove a cookie
-	 * $response->cookies->remove('name');
-	 * // alternatively
-	 * unset($response->cookies['name']);
-	 * ~~~
-	 *
-	 * @return CookieCollection the cookie collection.
-	 */
-	public function getCookies()
-	{
-		return Yii::$app->getRequest()->getCookies();
-	}
-}
diff --git a/framework/web/Session.php b/framework/web/Session.php
deleted file mode 100644
index 1b48433..0000000
--- a/framework/web/Session.php
+++ /dev/null
@@ -1,678 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-use Yii;
-use yii\base\Component;
-use yii\base\InvalidParamException;
-
-/**
- * Session provides session data management and the related configurations.
- *
- * Session is a Web application component that can be accessed via `Yii::$app->session`.
-
- * To start the session, call [[open()]]; To complete and send out session data, call [[close()]];
- * To destroy the session, call [[destroy()]].
- *
- * By default, [[autoStart]] is true which means the session will be started automatically
- * when the session component is accessed the first time.
- *
- * Session can be used like an array to set and get session data. For example,
- *
- * ~~~
- * $session = new Session;
- * $session->open();
- * $value1 = $session['name1'];  // get session variable 'name1'
- * $value2 = $session['name2'];  // get session variable 'name2'
- * foreach ($session as $name => $value) // traverse all session variables
- * $session['name3'] = $value3;  // set session variable 'name3'
- * ~~~
- *
- * Session can be extended to support customized session storage.
- * To do so, override [[useCustomStorage()]] so that it returns true, and
- * override these methods with the actual logic about using custom storage:
- * [[openSession()]], [[closeSession()]], [[readSession()]], [[writeSession()]],
- * [[destroySession()]] and [[gcSession()]].
- *
- * Session also supports a special type of session data, called *flash messages*.
- * A flash message is available only in the current request and the next request.
- * After that, it will be deleted automatically. Flash messages are particularly
- * useful for displaying confirmation messages. To use flash messages, simply
- * call methods such as [[setFlash()]], [[getFlash()]].
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Session extends Component implements \IteratorAggregate, \ArrayAccess, \Countable
-{
-	/**
-	 * @var boolean whether the session should be automatically started when the session component is initialized.
-	 */
-	public $autoStart = true;
-	/**
-	 * @var string the name of the session variable that stores the flash message data.
-	 */
-	public $flashVar = '__flash';
-
-	/**
-	 * @var array parameter-value pairs to override default session cookie parameters
-	 */
-	public $cookieParams = array(
-		'httponly' => true
-	);
-
-	/**
-	 * Initializes the application component.
-	 * This method is required by IApplicationComponent and is invoked by application.
-	 */
-	public function init()
-	{
-		parent::init();
-		if ($this->autoStart) {
-			$this->open();
-		}
-		register_shutdown_function(array($this, 'close'));
-	}
-
-	/**
-	 * Returns a value indicating whether to use custom session storage.
-	 * This method should be overridden to return true by child classes that implement custom session storage.
-	 * To implement custom session storage, override these methods: [[openSession()]], [[closeSession()]],
-	 * [[readSession()]], [[writeSession()]], [[destroySession()]] and [[gcSession()]].
-	 * @return boolean whether to use custom storage.
-	 */
-	public function getUseCustomStorage()
-	{
-		return false;
-	}
-
-	private $_opened = false;
-
-	/**
-	 * Starts the session.
-	 */
-	public function open()
-	{
-		// this is available in PHP 5.4.0+
-		if (function_exists('session_status')) {
-			if (session_status() == PHP_SESSION_ACTIVE) {
-				$this->_opened = true;
-				return;
-			}
-		}
-
-		if (!$this->_opened) {
-			if ($this->getUseCustomStorage()) {
-				@session_set_save_handler(
-					array($this, 'openSession'),
-					array($this, 'closeSession'),
-					array($this, 'readSession'),
-					array($this, 'writeSession'),
-					array($this, 'destroySession'),
-					array($this, 'gcSession')
-				);
-			}
-
-			$this->setCookieParams($this->cookieParams);
-
-			@session_start();
-
-			if (session_id() == '') {
-				$this->_opened = false;
-				$error = error_get_last();
-				$message = isset($error['message']) ? $error['message'] : 'Failed to start session.';
-				Yii::error($message, __METHOD__);
-			} else {
-				$this->_opened = true;
-				$this->updateFlashCounters();
-			}
-		}
-	}
-
-	/**
-	 * Ends the current session and store session data.
-	 */
-	public function close()
-	{
-		$this->_opened = false;
-		if (session_id() !== '') {
-			@session_write_close();
-		}
-	}
-
-	/**
-	 * Frees all session variables and destroys all data registered to a session.
-	 */
-	public function destroy()
-	{
-		if (session_id() !== '') {
-			@session_unset();
-			@session_destroy();
-		}
-	}
-
-	/**
-	 * @return boolean whether the session has started
-	 */
-	public function getIsActive()
-	{
-		if (function_exists('session_status')) {
-			// available in PHP 5.4.0+
-			return session_status() == PHP_SESSION_ACTIVE;
-		} else {
-			// this is not very reliable
-			return $this->_opened && session_id() !== '';
-		}
-	}
-
-	/**
-	 * @return string the current session ID
-	 */
-	public function getId()
-	{
-		return session_id();
-	}
-
-	/**
-	 * @param string $value the session ID for the current session
-	 */
-	public function setId($value)
-	{
-		session_id($value);
-	}
-
-	/**
-	 * Updates the current session ID with a newly generated one .
-	 * Please refer to [[http://php.net/session_regenerate_id]] for more details.
-	 * @param boolean $deleteOldSession Whether to delete the old associated session file or not.
-	 */
-	public function regenerateID($deleteOldSession = false)
-	{
-		session_regenerate_id($deleteOldSession);
-	}
-
-	/**
-	 * @return string the current session name
-	 */
-	public function getName()
-	{
-		return session_name();
-	}
-
-	/**
-	 * @param string $value the session name for the current session, must be an alphanumeric string.
-	 * It defaults to "PHPSESSID".
-	 */
-	public function setName($value)
-	{
-		session_name($value);
-	}
-
-	/**
-	 * @return string the current session save path, defaults to '/tmp'.
-	 */
-	public function getSavePath()
-	{
-		return session_save_path();
-	}
-
-	/**
-	 * @param string $value the current session save path. This can be either a directory name or a path alias.
-	 * @throws InvalidParamException if the path is not a valid directory
-	 */
-	public function setSavePath($value)
-	{
-		$path = Yii::getAlias($value);
-		if (is_dir($path)) {
-			session_save_path($path);
-		} else {
-			throw new InvalidParamException("Session save path is not a valid directory: $value");
-		}
-	}
-
-	/**
-	 * @return array the session cookie parameters.
-	 * @see http://us2.php.net/manual/en/function.session-get-cookie-params.php
-	 */
-	public function getCookieParams()
-	{
-		return session_get_cookie_params();
-	}
-
-	/**
-	 * Sets the session cookie parameters.
-	 * The effect of this method only lasts for the duration of the script.
-	 * Call this method before the session starts.
-	 * @param array $value cookie parameters, valid keys include: lifetime, path, domain, secure and httponly.
-	 * @throws InvalidParamException if the parameters are incomplete.
-	 * @see http://us2.php.net/manual/en/function.session-set-cookie-params.php
-	 */
-	public function setCookieParams($value)
-	{
-		$data = session_get_cookie_params();
-		extract($data);
-		extract($value);
-		if (isset($lifetime, $path, $domain, $secure, $httponly)) {
-			session_set_cookie_params($lifetime, $path, $domain, $secure, $httponly);
-		} else {
-			throw new InvalidParamException('Please make sure these parameters are provided: lifetime, path, domain, secure and httponly.');
-		}
-	}
-
-	/**
-	 * Returns the value indicating whether cookies should be used to store session IDs.
-	 * @return boolean|null the value indicating whether cookies should be used to store session IDs.
-	 * @see setUseCookies()
-	 */
-	public function getUseCookies()
-	{
-		if (ini_get('session.use_cookies') === '0') {
-			return false;
-		} elseif (ini_get('session.use_only_cookies') === '1') {
-			return true;
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Sets the value indicating whether cookies should be used to store session IDs.
-	 * Three states are possible:
-	 *
-	 * - true: cookies and only cookies will be used to store session IDs.
-	 * - false: cookies will not be used to store session IDs.
-	 * - null: if possible, cookies will be used to store session IDs; if not, other mechanisms will be used (e.g. GET parameter)
-	 *
-	 * @param boolean|null $value the value indicating whether cookies should be used to store session IDs.
-	 */
-	public function setUseCookies($value)
-	{
-		if ($value === false) {
-			ini_set('session.use_cookies', '0');
-			ini_set('session.use_only_cookies', '0');
-		} elseif ($value === true) {
-			ini_set('session.use_cookies', '1');
-			ini_set('session.use_only_cookies', '1');
-		} else {
-			ini_set('session.use_cookies', '1');
-			ini_set('session.use_only_cookies', '0');
-		}
-	}
-
-	/**
-	 * @return float the probability (percentage) that the GC (garbage collection) process is started on every session initialization, defaults to 1 meaning 1% chance.
-	 */
-	public function getGCProbability()
-	{
-		return (float)(ini_get('session.gc_probability') / ini_get('session.gc_divisor') * 100);
-	}
-
-	/**
-	 * @param float $value the probability (percentage) that the GC (garbage collection) process is started on every session initialization.
-	 * @throws InvalidParamException if the value is not between 0 and 100.
-	 */
-	public function setGCProbability($value)
-	{
-		if ($value >= 0 && $value <= 100) {
-			// percent * 21474837 / 2147483647 ≈ percent * 0.01
-			ini_set('session.gc_probability', floor($value * 21474836.47));
-			ini_set('session.gc_divisor', 2147483647);
-		} else {
-			throw new InvalidParamException('GCProbability must be a value between 0 and 100.');
-		}
-	}
-
-	/**
-	 * @return boolean whether transparent sid support is enabled or not, defaults to false.
-	 */
-	public function getUseTransparentSessionID()
-	{
-		return ini_get('session.use_trans_sid') == 1;
-	}
-
-	/**
-	 * @param boolean $value whether transparent sid support is enabled or not.
-	 */
-	public function setUseTransparentSessionID($value)
-	{
-		ini_set('session.use_trans_sid', $value ? '1' : '0');
-	}
-
-	/**
-	 * @return integer the number of seconds after which data will be seen as 'garbage' and cleaned up.
-	 * The default value is 1440 seconds (or the value of "session.gc_maxlifetime" set in php.ini).
-	 */
-	public function getTimeout()
-	{
-		return (int)ini_get('session.gc_maxlifetime');
-	}
-
-	/**
-	 * @param integer $value the number of seconds after which data will be seen as 'garbage' and cleaned up
-	 */
-	public function setTimeout($value)
-	{
-		ini_set('session.gc_maxlifetime', $value);
-	}
-
-	/**
-	 * Session open handler.
-	 * This method should be overridden if [[useCustomStorage()]] returns true.
-	 * Do not call this method directly.
-	 * @param string $savePath session save path
-	 * @param string $sessionName session name
-	 * @return boolean whether session is opened successfully
-	 */
-	public function openSession($savePath, $sessionName)
-	{
-		return true;
-	}
-
-	/**
-	 * Session close handler.
-	 * This method should be overridden if [[useCustomStorage()]] returns true.
-	 * Do not call this method directly.
-	 * @return boolean whether session is closed successfully
-	 */
-	public function closeSession()
-	{
-		return true;
-	}
-
-	/**
-	 * Session read handler.
-	 * This method should be overridden if [[useCustomStorage()]] returns true.
-	 * Do not call this method directly.
-	 * @param string $id session ID
-	 * @return string the session data
-	 */
-	public function readSession($id)
-	{
-		return '';
-	}
-
-	/**
-	 * Session write handler.
-	 * This method should be overridden if [[useCustomStorage()]] returns true.
-	 * Do not call this method directly.
-	 * @param string $id session ID
-	 * @param string $data session data
-	 * @return boolean whether session write is successful
-	 */
-	public function writeSession($id, $data)
-	{
-		return true;
-	}
-
-	/**
-	 * Session destroy handler.
-	 * This method should be overridden if [[useCustomStorage()]] returns true.
-	 * Do not call this method directly.
-	 * @param string $id session ID
-	 * @return boolean whether session is destroyed successfully
-	 */
-	public function destroySession($id)
-	{
-		return true;
-	}
-
-	/**
-	 * Session GC (garbage collection) handler.
-	 * This method should be overridden if [[useCustomStorage()]] returns true.
-	 * Do not call this method directly.
-	 * @param integer $maxLifetime the number of seconds after which data will be seen as 'garbage' and cleaned up.
-	 * @return boolean whether session is GCed successfully
-	 */
-	public function gcSession($maxLifetime)
-	{
-		return true;
-	}
-
-	/**
-	 * Returns an iterator for traversing the session variables.
-	 * This method is required by the interface IteratorAggregate.
-	 * @return SessionIterator an iterator for traversing the session variables.
-	 */
-	public function getIterator()
-	{
-		return new SessionIterator;
-	}
-
-	/**
-	 * Returns the number of items in the session.
-	 * @return integer the number of session variables
-	 */
-	public function getCount()
-	{
-		return count($_SESSION);
-	}
-
-	/**
-	 * Returns the number of items in the session.
-	 * This method is required by Countable interface.
-	 * @return integer number of items in the session.
-	 */
-	public function count()
-	{
-		return $this->getCount();
-	}
-
-	/**
-	 * Returns the session variable value with the session variable name.
-	 * If the session variable does not exist, the `$defaultValue` will be returned.
-	 * @param string $key the session variable name
-	 * @param mixed $defaultValue the default value to be returned when the session variable does not exist.
-	 * @return mixed the session variable value, or $defaultValue if the session variable does not exist.
-	 */
-	public function get($key, $defaultValue = null)
-	{
-		return isset($_SESSION[$key]) ? $_SESSION[$key] : $defaultValue;
-	}
-
-	/**
-	 * Adds a session variable.
-	 * If the specified name already exists, the old value will be overwritten.
-	 * @param string $key session variable name
-	 * @param mixed $value session variable value
-	 */
-	public function set($key, $value)
-	{
-		$_SESSION[$key] = $value;
-	}
-
-	/**
-	 * Removes a session variable.
-	 * @param string $key the name of the session variable to be removed
-	 * @return mixed the removed value, null if no such session variable.
-	 */
-	public function remove($key)
-	{
-		if (isset($_SESSION[$key])) {
-			$value = $_SESSION[$key];
-			unset($_SESSION[$key]);
-			return $value;
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Removes all session variables
-	 */
-	public function removeAll()
-	{
-		foreach (array_keys($_SESSION) as $key) {
-			unset($_SESSION[$key]);
-		}
-	}
-
-	/**
-	 * @param mixed $key session variable name
-	 * @return boolean whether there is the named session variable
-	 */
-	public function has($key)
-	{
-		return isset($_SESSION[$key]);
-	}
-
-	/**
-	 * @return array the list of all session variables in array
-	 */
-	public function toArray()
-	{
-		return $_SESSION;
-	}
-
-	/**
-	 * Updates the counters for flash messages and removes outdated flash messages.
-	 * This method should only be called once in [[init()]].
-	 */
-	protected function updateFlashCounters()
-	{
-		$counters = $this->get($this->flashVar, array());
-		if (is_array($counters)) {
-			foreach ($counters as $key => $count) {
-				if ($count) {
-					unset($counters[$key], $_SESSION[$key]);
-				} else {
-					$counters[$key]++;
-				}
-			}
-			$_SESSION[$this->flashVar] = $counters;
-		} else {
-			// fix the unexpected problem that flashVar doesn't return an array
-			unset($_SESSION[$this->flashVar]);
-		}
-	}
-
-	/**
-	 * Returns a flash message.
-	 * A flash message is available only in the current request and the next request.
-	 * @param string $key the key identifying the flash message
-	 * @param mixed $defaultValue value to be returned if the flash message does not exist.
-	 * @return mixed the flash message
-	 */
-	public function getFlash($key, $defaultValue = null)
-	{
-		$counters = $this->get($this->flashVar, array());
-		return isset($counters[$key]) ? $this->get($key, $defaultValue) : $defaultValue;
-	}
-
-	/**
-	 * Returns all flash messages.
-	 * @return array flash messages (key => message).
-	 */
-	public function getAllFlashes()
-	{
-		$counters = $this->get($this->flashVar, array());
-		$flashes = array();
-		foreach (array_keys($counters) as $key) {
-			if (isset($_SESSION[$key])) {
-				$flashes[$key] = $_SESSION[$key];
-			}
-		}
-		return $flashes;
-	}
-
-	/**
-	 * Stores a flash message.
-	 * A flash message is available only in the current request and the next request.
-	 * @param string $key the key identifying the flash message. Note that flash messages
-	 * and normal session variables share the same name space. If you have a normal
-	 * session variable using the same name, its value will be overwritten by this method.
-	 * @param mixed $value flash message
-	 */
-	public function setFlash($key, $value = true)
-	{
-		$counters = $this->get($this->flashVar, array());
-		$counters[$key] = 0;
-		$_SESSION[$key] = $value;
-		$_SESSION[$this->flashVar] = $counters;
-	}
-
-	/**
-	 * Removes a flash message.
-	 * Note that flash messages will be automatically removed after the next request.
-	 * @param string $key the key identifying the flash message. Note that flash messages
-	 * and normal session variables share the same name space.  If you have a normal
-	 * session variable using the same name, it will be removed by this method.
-	 * @return mixed the removed flash message. Null if the flash message does not exist.
-	 */
-	public function removeFlash($key)
-	{
-		$counters = $this->get($this->flashVar, array());
-		$value = isset($_SESSION[$key], $counters[$key]) ? $_SESSION[$key] : null;
-		unset($counters[$key], $_SESSION[$key]);
-		$_SESSION[$this->flashVar] = $counters;
-		return $value;
-	}
-
-	/**
-	 * Removes all flash messages.
-	 * Note that flash messages and normal session variables share the same name space.
-	 * If you have a normal session variable using the same name, it will be removed
-	 * by this method.
-	 */
-	public function removeAllFlashes()
-	{
-		$counters = $this->get($this->flashVar, array());
-		foreach (array_keys($counters) as $key) {
-			unset($_SESSION[$key]);
-		}
-		unset($_SESSION[$this->flashVar]);
-	}
-
-	/**
-	 * Returns a value indicating whether there is a flash message associated with the specified key.
-	 * @param string $key key identifying the flash message
-	 * @return boolean whether the specified flash message exists
-	 */
-	public function hasFlash($key)
-	{
-		return $this->getFlash($key) !== null;
-	}
-
-	/**
-	 * This method is required by the interface ArrayAccess.
-	 * @param mixed $offset the offset to check on
-	 * @return boolean
-	 */
-	public function offsetExists($offset)
-	{
-		return isset($_SESSION[$offset]);
-	}
-
-	/**
-	 * This method is required by the interface ArrayAccess.
-	 * @param integer $offset the offset to retrieve element.
-	 * @return mixed the element at the offset, null if no element is found at the offset
-	 */
-	public function offsetGet($offset)
-	{
-		return isset($_SESSION[$offset]) ? $_SESSION[$offset] : null;
-	}
-
-	/**
-	 * This method is required by the interface ArrayAccess.
-	 * @param integer $offset the offset to set element
-	 * @param mixed $item the element value
-	 */
-	public function offsetSet($offset, $item)
-	{
-		$_SESSION[$offset] = $item;
-	}
-
-	/**
-	 * This method is required by the interface ArrayAccess.
-	 * @param mixed $offset the offset to unset element
-	 */
-	public function offsetUnset($offset)
-	{
-		unset($_SESSION[$offset]);
-	}
-}
diff --git a/framework/web/SessionIterator.php b/framework/web/SessionIterator.php
deleted file mode 100644
index c960dd4..0000000
--- a/framework/web/SessionIterator.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-/**
- * SessionIterator implements an iterator for traversing session variables managed by [[Session]].
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class SessionIterator implements \Iterator
-{
-	/**
-	 * @var array list of keys in the map
-	 */
-	private $_keys;
-	/**
-	 * @var mixed current key
-	 */
-	private $_key;
-
-	/**
-	 * Constructor.
-	 */
-	public function __construct()
-	{
-		$this->_keys = array_keys($_SESSION);
-	}
-
-	/**
-	 * Rewinds internal array pointer.
-	 * This method is required by the interface Iterator.
-	 */
-	public function rewind()
-	{
-		$this->_key = reset($this->_keys);
-	}
-
-	/**
-	 * Returns the key of the current array element.
-	 * This method is required by the interface Iterator.
-	 * @return mixed the key of the current array element
-	 */
-	public function key()
-	{
-		return $this->_key;
-	}
-
-	/**
-	 * Returns the current array element.
-	 * This method is required by the interface Iterator.
-	 * @return mixed the current array element
-	 */
-	public function current()
-	{
-		return isset($_SESSION[$this->_key]) ? $_SESSION[$this->_key] : null;
-	}
-
-	/**
-	 * Moves the internal pointer to the next array element.
-	 * This method is required by the interface Iterator.
-	 */
-	public function next()
-	{
-		do {
-			$this->_key = next($this->_keys);
-		} while (!isset($_SESSION[$this->_key]) && $this->_key !== false);
-	}
-
-	/**
-	 * Returns whether there is an element at current position.
-	 * This method is required by the interface Iterator.
-	 * @return boolean
-	 */
-	public function valid()
-	{
-		return $this->_key !== false;
-	}
-}
diff --git a/framework/web/Sort.php b/framework/web/Sort.php
deleted file mode 100644
index 324e733..0000000
--- a/framework/web/Sort.php
+++ /dev/null
@@ -1,336 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-use Yii;
-use yii\helpers\Html;
-
-/**
- * Sort represents information relevant to sorting.
- *
- * When data needs to be sorted according to one or several attributes,
- * we can use Sort to represent the sorting information and generate
- * appropriate hyperlinks that can lead to sort actions.
- *
- * A typical usage example is as follows,
- *
- * ~~~
- * function actionIndex()
- * {
- *     $sort = new Sort(array(
- *         'attributes' => array(
- *             'age',
- *             'name' => array(
- *                 'asc' => array('last_name', 'first_name'),
- *                 'desc' => array('last_name' => true, 'first_name' => true),
- *             ),
- *         ),
- *     ));
- *
- *     $models = Article::find()
- *         ->where(array('status' => 1))
- *         ->orderBy($sort->orders)
- *         ->all();
- *
- *     $this->render('index', array(
- *          'models' => $models,
- *          'sort' => $sort,
- *     ));
- * }
- * ~~~
- *
- * View:
- *
- * ~~~
- * // display links leading to sort actions
- * echo $sort->link('name', 'Name') . ' | ' . $sort->link('age', 'Age');
- *
- * foreach($models as $model) {
- *     // display $model here
- * }
- * ~~~
- *
- * In the above, we declare two [[attributes]] that support sorting: name and age.
- * We pass the sort information to the Article query so that the query results are
- * sorted by the orders specified by the Sort object. In the view, we show two hyperlinks
- * that can lead to pages with the data sorted by the corresponding attributes.
- *
- * @property array $orders Sort directions indexed by column names. The sort direction
- * can be either [[Sort::ASC]] for ascending order or [[Sort::DESC]] for descending order.
- * @property array $attributeOrders Sort directions indexed by attribute names. The sort
- * direction can be either [[Sort::ASC]] for ascending order or [[Sort::DESC]] for descending order.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Sort extends \yii\base\Object
-{
-	/**
-	 * Sort ascending
-	 */
-	const ASC = false;
-
-	/**
-	 * Sort descending
-	 */
-	const DESC = true;
-
-	/**
-	 * @var boolean whether the sorting can be applied to multiple attributes simultaneously.
-	 * Defaults to false, which means each time the data can only be sorted by one attribute.
-	 */
-	public $enableMultiSort = false;
-
-	/**
-	 * @var array list of attributes that are allowed to be sorted. Its syntax can be
-	 * described using the following example:
-	 *
-	 * ~~~
-	 * array(
-	 *     'age',
-	 *     'user' => array(
-	 *         'asc' => array('first_name' => Sort::ASC, 'last_name' => Sort::ASC),
-	 *         'desc' => array('first_name' => Sort::DESC, 'last_name' => Sort::DESC),
-	 *         'default' => 'desc',
-	 *     ),
-	 * )
-	 * ~~~
-	 *
-	 * In the above, two attributes are declared: "age" and "user". The "age" attribute is
-	 * a simple attribute which is equivalent to the following:
-	 *
-	 * ~~~
-	 * 'age' => array(
-	 *     'asc' => array('age' => Sort::ASC),
-	 *     'desc' => array('age' => Sort::DESC),
-	 * )
-	 * ~~~
-	 *
-	 * The "user" attribute is a composite attribute:
-	 *
-	 * - The "user" key represents the attribute name which will appear in the URLs leading
-	 *   to sort actions. Attribute names cannot contain characters listed in [[separators]].
-	 * - The "asc" and "desc" elements specify how to sort by the attribute in ascending
-	 *   and descending orders, respectively. Their values represent the actual columns and
-	 *   the directions by which the data should be sorted by.
-	 * - And the "default" element specifies if the attribute is not sorted currently,
-	 *   in which direction it should be sorted (the default value is ascending order).
-	 */
-	public $attributes = array();
-	/**
-	 * @var string the name of the parameter that specifies which attributes to be sorted
-	 * in which direction. Defaults to 'sort'.
-	 * @see params
-	 */
-	public $sortVar = 'sort';
-	/**
-	 * @var string the tag appeared in the [[sortVar]] parameter that indicates the attribute should be sorted
-	 * in descending order. Defaults to 'desc'.
-	 */
-	public $descTag = 'desc';
-	/**
-	 * @var array the order that should be used when the current request does not specify any order.
-	 * The array keys are attribute names and the array values are the corresponding sort directions. For example,
-	 *
-	 * ~~~
-	 * array(
-	 *     'name' => Sort::ASC,
-	 *     'create_time' => Sort::DESC,
-	 * )
-	 * ~~~
-	 *
-	 * @see attributeOrders
-	 */
-	public $defaults;
-	/**
-	 * @var string the route of the controller action for displaying the sorted contents.
-	 * If not set, it means using the currently requested route.
-	 */
-	public $route;
-	/**
-	 * @var array separators used in the generated URL. This must be an array consisting of
-	 * two elements. The first element specifies the character separating different
-	 * attributes, while the second element specifies the character separating attribute name
-	 * and the corresponding sort direction. Defaults to `array('-', '.')`.
-	 */
-	public $separators = array('-', '.');
-	/**
-	 * @var array parameters (name => value) that should be used to obtain the current sort directions
-	 * and to create new sort URLs. If not set, $_GET will be used instead.
-	 *
-	 * The array element indexed by [[sortVar]] is considered to be the current sort directions.
-	 * If the element does not exist, the [[defaults|default order]] will be used.
-	 *
-	 * @see sortVar
-	 * @see defaults
-	 */
-	public $params;
-
-	/**
-	 * Returns the columns and their corresponding sort directions.
-	 * @return array the columns (keys) and their corresponding sort directions (values).
-	 * This can be passed to [[\yii\db\Query::orderBy()]] to construct a DB query.
-	 */
-	public function getOrders()
-	{
-		$attributeOrders = $this->getAttributeOrders();
-		$orders = array();
-		foreach ($attributeOrders as $attribute => $direction) {
-			$definition = $this->getAttribute($attribute);
-			$columns = $definition[$direction === self::ASC ? 'asc' : 'desc'];
-			foreach ($columns as $name => $dir) {
-				$orders[$name] = $dir;
-			}
-		}
-		return $orders;
-	}
-
-	/**
-	 * Generates a hyperlink that links to the sort action to sort by the specified attribute.
-	 * Based on the sort direction, the CSS class of the generated hyperlink will be appended
-	 * with "asc" or "desc".
-	 * @param string $attribute the attribute name by which the data should be sorted by.
-	 * @param string $label the link label. Note that the label will not be HTML-encoded.
-	 * @param array $htmlOptions additional HTML attributes for the hyperlink tag
-	 * @return string the generated hyperlink
-	 */
-	public function link($attribute, $label, $htmlOptions = array())
-	{
-		if (($definition = $this->getAttribute($attribute)) === false) {
-			return $label;
-		}
-
-		if (($direction = $this->getAttributeOrder($attribute)) !== null) {
-			$class = $direction ? 'desc' : 'asc';
-			if (isset($htmlOptions['class'])) {
-				$htmlOptions['class'] .= ' ' . $class;
-			} else {
-				$htmlOptions['class'] = $class;
-			}
-		}
-
-		$url = $this->createUrl($attribute);
-
-		return Html::a($label, $url, $htmlOptions);
-	}
-
-	private $_attributeOrders;
-
-	/**
-	 * Returns the currently requested sort information.
-	 * @param boolean $recalculate whether to recalculate the sort directions
-	 * @return array sort directions indexed by attribute names.
-	 * Sort direction can be either [[Sort::ASC]] for ascending order or
-	 * [[Sort::DESC]] for descending order.
-	 */
-	public function getAttributeOrders($recalculate = false)
-	{
-		if ($this->_attributeOrders === null || $recalculate) {
-			$this->_attributeOrders = array();
-			$params = $this->params === null ? $_GET : $this->params;
-			if (isset($params[$this->sortVar]) && is_scalar($params[$this->sortVar])) {
-				$attributes = explode($this->separators[0], $params[$this->sortVar]);
-				foreach ($attributes as $attribute) {
-					$descending = false;
-					if (($pos = strrpos($attribute, $this->separators[1])) !== false) {
-						if ($descending = (substr($attribute, $pos + 1) === $this->descTag)) {
-							$attribute = substr($attribute, 0, $pos);
-						}
-					}
-
-					if (($this->getAttribute($attribute)) !== false) {
-						$this->_attributeOrders[$attribute] = $descending;
-						if (!$this->enableMultiSort) {
-							return $this->_attributeOrders;
-						}
-					}
-				}
-			}
-			if (empty($this->_attributeOrders) && is_array($this->defaults)) {
-				$this->_attributeOrders = $this->defaults;
-			}
-		}
-		return $this->_attributeOrders;
-	}
-
-	/**
-	 * Returns the sort direction of the specified attribute in the current request.
-	 * @param string $attribute the attribute name
-	 * @return boolean|null Sort direction of the attribute. Can be either [[Sort::ASC]]
-	 * for ascending order or [[Sort::DESC]] for descending order. Null is returned
-	 * if the attribute is invalid or does not need to be sorted.
-	 */
-	public function getAttributeOrder($attribute)
-	{
-		$this->getAttributeOrders();
-		return isset($this->_attributeOrders[$attribute]) ? $this->_attributeOrders[$attribute] : null;
-	}
-
-	/**
-	 * Creates a URL for sorting the data by the specified attribute.
-	 * This method will consider the current sorting status given by [[attributeOrders]].
-	 * For example, if the current page already sorts the data by the specified attribute in ascending order,
-	 * then the URL created will lead to a page that sorts the data by the specified attribute in descending order.
-	 * @param string $attribute the attribute name
-	 * @return string|boolean the URL for sorting. False if the attribute is invalid.
-	 * @see attributeOrders
-	 * @see params
-	 */
-	public function createUrl($attribute)
-	{
-		if (($definition = $this->getAttribute($attribute)) === false) {
-			return false;
-		}
-		$directions = $this->getAttributeOrders();
-		if (isset($directions[$attribute])) {
-			$descending = !$directions[$attribute];
-			unset($directions[$attribute]);
-		} elseif (isset($definition['default'])) {
-			$descending = $definition['default'] === 'desc';
-		} else {
-			$descending = false;
-		}
-
-		if ($this->enableMultiSort) {
-			$directions = array_merge(array($attribute => $descending), $directions);
-		} else {
-			$directions = array($attribute => $descending);
-		}
-
-		$sorts = array();
-		foreach ($directions as $attribute => $descending) {
-			$sorts[] = $descending ? $attribute . $this->separators[1] . $this->descTag : $attribute;
-		}
-		$params = $this->params === null ? $_GET : $this->params;
-		$params[$this->sortVar] = implode($this->separators[0], $sorts);
-		$route = $this->route === null ? Yii::$app->controller->route : $this->route;
-
-		return Yii::$app->getUrlManager()->createUrl($route, $params);
-	}
-
-	/**
-	 * Returns the attribute definition of the specified name.
-	 * @param string $name the attribute name
-	 * @return array|boolean the sort definition (column names => sort directions).
-	 * False is returned if the attribute cannot be sorted.
-	 * @see attributes
-	 */
-	public function getAttribute($name)
-	{
-		if (isset($this->attributes[$name])) {
-			return $this->attributes[$name];
-		} elseif (in_array($name, $this->attributes, true)) {
-			return array(
-				'asc' => array($name => self::ASC),
-				'desc' => array($name => self::DESC),
-			);
-		} else {
-			return false;
-		}
-	}
-}
diff --git a/framework/web/SpicyRice.md b/framework/web/SpicyRice.md
deleted file mode 100644
index d99f3dc..0000000
--- a/framework/web/SpicyRice.md
+++ /dev/null
@@ -1,11 +0,0 @@
-## Spicy Rice font
-
-* **Author:** Brian J. Bonislawsky, Astigmatic (AOETI, Astigmatic One Eye Typographic Institute)
-* **License:** SIL Open Font License (OFL), version 1.1, [notes and FAQ](http://scripts.sil.org/OFL)
-
-## Links
-
-* [Astigmatic](http://www.astigmatic.com/)
-* [Google WebFonts](http://www.google.com/webfonts/specimen/Spicy+Rice)
-* [fontsquirrel.com](http://www.fontsquirrel.com/fonts/spicy-rice)
-* [fontspace.com](http://www.fontspace.com/astigmatic-one-eye-typographic-institute/spicy-rice)
diff --git a/framework/web/SpicyRice.ttf b/framework/web/SpicyRice.ttf
deleted file mode 100644
index 638436cd38eab22a9e9d1a3d160a4542ec73f955..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 67244
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
W)Br(I?aL1N<zBQ1@#S7c`TqbUUn^Gt

diff --git a/framework/web/UploadedFile.php b/framework/web/UploadedFile.php
deleted file mode 100644
index 6e685a3..0000000
--- a/framework/web/UploadedFile.php
+++ /dev/null
@@ -1,246 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-use yii\widgets\Html;
-
-/**
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class UploadedFile extends \yii\base\Object
-{
-	private static $_files;
-	private $_name;
-	private $_tempName;
-	private $_type;
-	private $_size;
-	private $_error;
-
-
-	/**
-	 * Constructor.
-	 * Instead of using the constructor to create a new instance,
-	 * you should normally call [[getInstance()]] or [[getInstances()]]
-	 * to obtain new instances.
-	 * @param string $name the original name of the file being uploaded
-	 * @param string $tempName the path of the uploaded file on the server.
-	 * @param string $type the MIME-type of the uploaded file (such as "image/gif").
-	 * @param integer $size the actual size of the uploaded file in bytes
-	 * @param integer $error the error code
-	 */
-	public function __construct($name, $tempName, $type, $size, $error)
-	{
-		$this->_name = $name;
-		$this->_tempName = $tempName;
-		$this->_type = $type;
-		$this->_size = $size;
-		$this->_error = $error;
-	}
-
-	/**
-	 * String output.
-	 * This is PHP magic method that returns string representation of an object.
-	 * The implementation here returns the uploaded file's name.
-	 * @return string the string representation of the object
-	 */
-	public function __toString()
-	{
-		return $this->_name;
-	}
-
-	/**
-	 * Returns an uploaded file for the given model attribute.
-	 * The file should be uploaded using [[ActiveForm::fileInput()]].
-	 * @param \yii\base\Model $model the data model
-	 * @param string $attribute the attribute name. The attribute name may contain array indexes.
-	 * For example, '[1]file' for tabular file uploading; and 'file[1]' for an element in a file array.
-	 * @return UploadedFile the instance of the uploaded file.
-	 * Null is returned if no file is uploaded for the specified model attribute.
-	 * @see getInstanceByName
-	 */
-	public static function getInstance($model, $attribute)
-	{
-		$name = Html::getInputName($model, $attribute);
-		return static::getInstanceByName($name);
-	}
-
-	/**
-	 * Returns all uploaded files for the given model attribute.
-	 * @param \yii\base\Model $model the data model
-	 * @param string $attribute the attribute name. The attribute name may contain array indexes
-	 * for tabular file uploading, e.g. '[1]file'.
-	 * @return UploadedFile[] array of UploadedFile objects.
-	 * Empty array is returned if no available file was found for the given attribute.
-	 */
-	public static function getInstances($model, $attribute)
-	{
-		$name = Html::getInputName($model, $attribute);
-		return static::getInstancesByName($name);
-	}
-
-	/**
-	 * Returns an uploaded file according to the given file input name.
-	 * The name can be a plain string or a string like an array element (e.g. 'Post[imageFile]', or 'Post[0][imageFile]').
-	 * @param string $name the name of the file input field.
-	 * @return UploadedFile the instance of the uploaded file.
-	 * Null is returned if no file is uploaded for the specified name.
-	 */
-	public static function getInstanceByName($name)
-	{
-		$files = static::loadFiles();
-		return isset($files[$name]) ? $files[$name] : null;
-	}
-
-	/**
-	 * Returns an array of uploaded files corresponding to the specified file input name.
-	 * This is mainly used when multiple files were uploaded and saved as 'files[0]', 'files[1]',
-	 * 'files[n]'..., and you can retrieve them all by passing 'files' as the name.
-	 * @param string $name the name of the array of files
-	 * @return UploadedFile[] the array of CUploadedFile objects. Empty array is returned
-	 * if no adequate upload was found. Please note that this array will contain
-	 * all files from all sub-arrays regardless how deeply nested they are.
-	 */
-	public static function getInstancesByName($name)
-	{
-		$files = static::loadFiles();
-		if (isset($files[$name])) {
-			return array($files[$name]);
-		}
-		$results = array();
-		foreach ($files as $key => $file) {
-			if (strpos($key, "{$name}[") === 0) {
-				$results[] = self::$_files[$key];
-			}
-		}
-		return $results;
-	}
-
-	/**
-	 * Cleans up the loaded UploadedFile instances.
-	 * This method is mainly used by test scripts to set up a fixture.
-	 */
-	public static function reset()
-	{
-		self::$_files = null;
-	}
-
-	/**
-	 * Saves the uploaded file.
-	 * Note that this method uses php's move_uploaded_file() method. If the target file `$file`
-	 * already exists, it will be overwritten.
-	 * @param string $file the file path used to save the uploaded file
-	 * @param boolean $deleteTempFile whether to delete the temporary file after saving.
-	 * If true, you will not be able to save the uploaded file again in the current request.
-	 * @return boolean true whether the file is saved successfully
-	 * @see error
-	 */
-	public function saveAs($file, $deleteTempFile = true)
-	{
-		if ($this->_error == UPLOAD_ERR_OK) {
-			if ($deleteTempFile) {
-				return move_uploaded_file($this->_tempName, $file);
-			} elseif (is_uploaded_file($this->_tempName)) {
-				return copy($this->_tempName, $file);
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @return string the original name of the file being uploaded
-	 */
-	public function getName()
-	{
-		return $this->_name;
-	}
-
-	/**
-	 * @return string the path of the uploaded file on the server.
-	 * Note, this is a temporary file which will be automatically deleted by PHP
-	 * after the current request is processed.
-	 */
-	public function getTempName()
-	{
-		return $this->_tempName;
-	}
-
-	/**
-	 * @return string the MIME-type of the uploaded file (such as "image/gif").
-	 * Since this MIME type is not checked on the server side, do not take this value for granted.
-	 * Instead, use [[FileHelper::getMimeType()]] to determine the exact MIME type.
-	 */
-	public function getType()
-	{
-		return $this->_type;
-	}
-
-	/**
-	 * @return integer the actual size of the uploaded file in bytes
-	 */
-	public function getSize()
-	{
-		return $this->_size;
-	}
-
-	/**
-	 * Returns an error code describing the status of this file uploading.
-	 * @return integer the error code
-	 * @see http://www.php.net/manual/en/features.file-upload.errors.php
-	 */
-	public function getError()
-	{
-		return $this->_error;
-	}
-
-	/**
-	 * @return boolean whether there is an error with the uploaded file.
-	 * Check [[error]] for detailed error code information.
-	 */
-	public function getHasError()
-	{
-		return $this->_error != UPLOAD_ERR_OK;
-	}
-
-	/**
-	 * Creates UploadedFile instances from $_FILE.
-	 * @return array the UploadedFile instances
-	 */
-	private static function loadFiles()
-	{
-		if (self::$_files === null) {
-			self::$_files = array();
-			if (isset($_FILES) && is_array($_FILES)) {
-				foreach ($_FILES as $class => $info) {
-					self::loadFilesRecursive($class, $info['name'], $info['tmp_name'], $info['type'], $info['size'], $info['error']);
-				}
-			}
-		}
-		return self::$_files;
-	}
-
-	/**
-	 * Creates UploadedFile instances from $_FILE recursively.
-	 * @param string $key key for identifying uploaded file: class name and sub-array indexes
-	 * @param mixed $names file names provided by PHP
-	 * @param mixed $tempNames temporary file names provided by PHP
-	 * @param mixed $types file types provided by PHP
-	 * @param mixed $sizes file sizes provided by PHP
-	 * @param mixed $errors uploading issues provided by PHP
-	 */
-	private static function loadFilesRecursive($key, $names, $tempNames, $types, $sizes, $errors)
-	{
-		if (is_array($names)) {
-			foreach ($names as $i => $name) {
-				self::loadFilesRecursive($key . '[' . $i . ']', $name, $tempNames[$i], $types[$i], $sizes[$i], $errors[$i]);
-			}
-		} else {
-			self::$_files[$key] = new self($names, $tempNames, $types, $sizes, $errors);
-		}
-	}
-}
diff --git a/framework/web/UrlManager.php b/framework/web/UrlManager.php
deleted file mode 100644
index aab7979..0000000
--- a/framework/web/UrlManager.php
+++ /dev/null
@@ -1,264 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-use Yii;
-use yii\base\Component;
-use yii\caching\Cache;
-
-/**
- * UrlManager handles HTTP request parsing and creation of URLs based on a set of rules.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class UrlManager extends Component
-{
-	/**
-	 * @var boolean whether to enable pretty URLs. Instead of putting all parameters in the query
-	 * string part of a URL, pretty URLs allow using path info to represent some of the parameters
-	 * and can thus produce more user-friendly URLs, such as "/news/Yii-is-released", instead of
-	 * "/index.php?r=news/view&id=100".
-	 */
-	public $enablePrettyUrl = false;
-	/**
-	 * @var array the rules for creating and parsing URLs when [[enablePrettyUrl]] is true.
-	 * This property is used only if [[enablePrettyUrl]] is true. Each element in the array
-	 * is the configuration array for creating a single URL rule. The configuration will
-	 * be merged with [[ruleConfig]] first before it is used for creating the rule object.
-	 *
-	 * A special shortcut format can be used if a rule only specifies [[UrlRule::pattern|pattern]]
-	 * and [[UrlRule::route|route]]: `'pattern' => 'route'`. That is, instead of using a configuration
-	 * array, one can use the key to represent the pattern and the value the corresponding route.
-	 * For example, `'post/<id:\d+>' => 'post/view'`.
-	 *
-	 * Note that if you modify this property after the UrlManager object is created, make sure
-	 * you populate the array with rule objects instead of rule configurations.
-	 */
-	public $rules = array();
-	/**
-	 * @var string the URL suffix used when in 'path' format.
-	 * For example, ".html" can be used so that the URL looks like pointing to a static HTML page.
-	 * This property is used only if [[enablePrettyUrl]] is true.
-	 */
-	public $suffix;
-	/**
-	 * @var boolean whether to show entry script name in the constructed URL. Defaults to true.
-	 * This property is used only if [[enablePrettyUrl]] is true.
-	 */
-	public $showScriptName = false;
-	/**
-	 * @var string the GET variable name for route. This property is used only if [[enablePrettyUrl]] is false.
-	 */
-	public $routeVar = 'r';
-	/**
-	 * @var Cache|string the cache object or the application component ID of the cache object.
-	 * Compiled URL rules will be cached through this cache object, if it is available.
-	 *
-	 * After the UrlManager object is created, if you want to change this property,
-	 * you should only assign it with a cache object.
-	 * Set this property to null if you do not want to cache the URL rules.
-	 */
-	public $cache = 'cache';
-	/**
-	 * @var array the default configuration of URL rules. Individual rule configurations
-	 * specified via [[rules]] will take precedence when the same property of the rule is configured.
-	 */
-	public $ruleConfig = array(
-		'class' => 'yii\web\UrlRule',
-	);
-
-	private $_baseUrl;
-	private $_hostInfo;
-
-	/**
-	 * Initializes UrlManager.
-	 */
-	public function init()
-	{
-		parent::init();
-		$this->compileRules();
-	}
-
-	/**
-	 * Parses the URL rules.
-	 */
-	protected function compileRules()
-	{
-		if (!$this->enablePrettyUrl || empty($this->rules)) {
-			return;
-		}
-		if (is_string($this->cache)) {
-			$this->cache = Yii::$app->getComponent($this->cache);
-		}
-		if ($this->cache instanceof Cache) {
-			$key = $this->cache->buildKey(__CLASS__);
-			$hash = md5(json_encode($this->rules));
-			if (($data = $this->cache->get($key)) !== false && isset($data[1]) && $data[1] === $hash) {
-				$this->rules = $data[0];
-				return;
-			}
-		}
-
-		$rules = array();
-		foreach ($this->rules as $key => $rule) {
-			if (!is_array($rule)) {
-				$rule = array(
-					'pattern' => $key,
-					'route' => $rule,
-				);
-			}
-			$rules[] = Yii::createObject(array_merge($this->ruleConfig, $rule));
-		}
-		$this->rules = $rules;
-
-		if (isset($key, $hash)) {
-			$this->cache->set($key, array($this->rules, $hash));
-		}
-	}
-
-	/**
-	 * Parses the user request.
-	 * @param Request $request the request component
-	 * @return array|boolean the route and the associated parameters. The latter is always empty
-	 * if [[enablePrettyUrl]] is false. False is returned if the current request cannot be successfully parsed.
-	 */
-	public function parseRequest($request)
-	{
-		if ($this->enablePrettyUrl) {
-			$pathInfo = $request->pathInfo;
-			/** @var $rule UrlRule */
-			foreach ($this->rules as $rule) {
-				if (($result = $rule->parseRequest($this, $request)) !== false) {
-					return $result;
-				}
-			}
-
-			$suffix = (string)$this->suffix;
-			if ($suffix !== '' && $suffix !== '/' && $pathInfo !== '') {
-				$n = strlen($this->suffix);
-				if (substr($pathInfo, -$n) === $this->suffix) {
-					$pathInfo = substr($pathInfo, 0, -$n);
-					if ($pathInfo === '') {
-						// suffix alone is not allowed
-						return false;
-					}
-				} else {
-					// suffix doesn't match
-					return false;
-				}
-			}
-
-			return array($pathInfo, array());
-		} else {
-			$route = $request->getParam($this->routeVar);
-			if (is_array($route)) {
-				$route = '';
-			}
-			return array((string)$route, array());
-		}
-	}
-
-	/**
-	 * Creates a URL using the given route and parameters.
-	 * The URL created is a relative one. Use [[createAbsoluteUrl()]] to create an absolute URL.
-	 * @param string $route the route
-	 * @param array $params the parameters (name-value pairs)
-	 * @return string the created URL
-	 */
-	public function createUrl($route, $params = array())
-	{
-		$anchor = isset($params['#']) ? '#' . $params['#'] : '';
-		unset($params['#'], $params[$this->routeVar]);
-
-		$route = trim($route, '/');
-		$baseUrl = $this->getBaseUrl();
-
-		if ($this->enablePrettyUrl) {
-			/** @var $rule UrlRule */
-			foreach ($this->rules as $rule) {
-				if (($url = $rule->createUrl($this, $route, $params)) !== false) {
-					return rtrim($baseUrl, '/') . '/' . $url . $anchor;
-				}
-			}
-
-			if ($this->suffix !== null) {
-				$route .= $this->suffix;
-			}
-			if (!empty($params)) {
-				$route .= '?' . http_build_query($params);
-			}
-			return rtrim($baseUrl, '/') . '/' . $route . $anchor;
-		} else {
-			$url = $baseUrl . '?' . $this->routeVar . '=' . $route;
-			if (!empty($params)) {
-				$url .= '&' . http_build_query($params);
-			}
-			return $url;
-		}
-	}
-
-	/**
-	 * Creates an absolute URL using the given route and parameters.
-	 * This method prepends the URL created by [[createUrl()]] with the [[hostInfo]].
-	 * @param string $route the route
-	 * @param array $params the parameters (name-value pairs)
-	 * @return string the created URL
-	 * @see createUrl()
-	 */
-	public function createAbsoluteUrl($route, $params = array())
-	{
-		return $this->getHostInfo() . $this->createUrl($route, $params);
-	}
-
-	/**
-	 * Returns the base URL that is used by [[createUrl()]] to prepend URLs it creates.
-	 * It defaults to [[Request::scriptUrl]] if [[showScriptName]] is true or [[enablePrettyUrl]] is false;
-	 * otherwise, it defaults to [[Request::baseUrl]].
-	 * @return string the base URL that is used by [[createUrl()]] to prepend URLs it creates.
-	 */
-	public function getBaseUrl()
-	{
-		if ($this->_baseUrl === null) {
-			/** @var $request \yii\web\Request */
-			$request = Yii::$app->getRequest();
-			$this->_baseUrl = $this->showScriptName || !$this->enablePrettyUrl ? $request->getScriptUrl() : $request->getBaseUrl();
-		}
-		return $this->_baseUrl;
-	}
-
-	/**
-	 * Sets the base URL that is used by [[createUrl()]] to prepend URLs it creates.
-	 * @param string $value the base URL that is used by [[createUrl()]] to prepend URLs it creates.
-	 */
-	public function setBaseUrl($value)
-	{
-		$this->_baseUrl = $value;
-	}
-
-	/**
-	 * Returns the host info that is used by [[createAbsoluteUrl()]] to prepend URLs it creates.
-	 * @return string the host info (e.g. "http://www.example.com") that is used by [[createAbsoluteUrl()]] to prepend URLs it creates.
-	 */
-	public function getHostInfo()
-	{
-		if ($this->_hostInfo === null) {
-			$this->_hostInfo = Yii::$app->getRequest()->getHostInfo();
-		}
-		return $this->_hostInfo;
-	}
-
-	/**
-	 * Sets the host info that is used by [[createAbsoluteUrl()]] to prepend URLs it creates.
-	 * @param string $value the host info (e.g. "http://www.example.com") that is used by [[createAbsoluteUrl()]] to prepend URLs it creates.
-	 */
-	public function setHostInfo($value)
-	{
-		$this->_hostInfo = rtrim($value, '/');
-	}
-}
diff --git a/framework/web/UrlRule.php b/framework/web/UrlRule.php
deleted file mode 100644
index 96cb994..0000000
--- a/framework/web/UrlRule.php
+++ /dev/null
@@ -1,283 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-use yii\base\Object;
-use yii\base\InvalidConfigException;
-
-/**
- * UrlRule represents a rule used for parsing and generating URLs.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class UrlRule extends Object
-{
-	/**
-	 * Set [[mode]] with this value to mark that this rule is for URL parsing only
-	 */
-	const PARSING_ONLY = 1;
-	/**
-	 * Set [[mode]] with this value to mark that this rule is for URL creation only
-	 */
-	const CREATION_ONLY = 2;
-
-	/**
-	 * @var string regular expression used to parse a URL
-	 */
-	public $pattern;
-	/**
-	 * @var string the route to the controller action
-	 */
-	public $route;
-	/**
-	 * @var array the default GET parameters (name=>value) that this rule provides.
-	 * When this rule is used to parse the incoming request, the values declared in this property
-	 * will be injected into $_GET.
-	 */
-	public $defaults = array();
-	/**
-	 * @var string the URL suffix used for this rule.
-	 * For example, ".html" can be used so that the URL looks like pointing to a static HTML page.
-	 * If not, the value of [[UrlManager::suffix]] will be used.
-	 */
-	public $suffix;
-	/**
-	 * @var string|array the HTTP verb (e.g. GET, POST, DELETE) that this rule should match.
-	 * Use array to represent multiple verbs that this rule may match.
-	 * If this property is not set, the rule can match any verb.
-	 * Note that this property is only used when parsing a request. It is ignored for URL creation.
-	 */
-	public $verb;
-	/**
-	 * @var integer a value indicating if this rule should be used for both request parsing and URL creation,
-	 * parsing only, or creation only.
-	 * If not set or 0, it means the rule is both request parsing and URL creation.
-	 * If it is [[PARSING_ONLY]], the rule is for request parsing only.
-	 * If it is [[CREATION_ONLY]], the rule is for URL creation only.
-	 */
-	public $mode;
-
-	/**
-	 * @var string the template for generating a new URL. This is derived from [[pattern]] and is used in generating URL.
-	 */
-	private $_template;
-	/**
-	 * @var string the regex for matching the route part. This is used in generating URL.
-	 */
-	private $_routeRule;
-	/**
-	 * @var array list of regex for matching parameters. This is used in generating URL.
-	 */
-	private $_paramRules = array();
-	/**
-	 * @var array list of parameters used in the route.
-	 */
-	private $_routeParams = array();
-
-	/**
-	 * Initializes this rule.
-	 */
-	public function init()
-	{
-		if ($this->pattern === null) {
-			throw new InvalidConfigException('UrlRule::pattern must be set.');
-		}
-		if ($this->route === null) {
-			throw new InvalidConfigException('UrlRule::route must be set.');
-		}
-		if ($this->verb !== null) {
-			if (is_array($this->verb)) {
-				foreach ($this->verb as $i => $verb) {
-					$this->verb[$i] = strtoupper($verb);
-				}
-			} else {
-				$this->verb = array(strtoupper($this->verb));
-			}
-		}
-
-		$this->pattern = trim($this->pattern, '/');
-		if ($this->pattern === '') {
-			$this->_template = '';
-			$this->pattern = '#^$#u';
-			return;
-		} else {
-			$this->pattern = '/' . $this->pattern . '/';
-		}
-
-		$this->route = trim($this->route, '/');
-		if (strpos($this->route, '<') !== false && preg_match_all('/<(\w+)>/', $this->route, $matches)) {
-			foreach ($matches[1] as $name) {
-				$this->_routeParams[$name] = "<$name>";
-			}
-		}
-
-		$tr = $tr2 = array();
-		if (preg_match_all('/<(\w+):?([^>]+)?>/', $this->pattern, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
-			foreach ($matches as $match) {
-				$name = $match[1][0];
-				$pattern = isset($match[2][0]) ? $match[2][0] : '[^\/]+';
-				if (isset($this->defaults[$name])) {
-					$length = strlen($match[0][0]);
-					$offset = $match[0][1];
-					if ($offset > 1 && $this->pattern[$offset - 1] === '/' && $this->pattern[$offset + $length] === '/') {
-						$tr["/<$name>"] = "(/(?P<$name>$pattern))?";
-					} else {
-						$tr["<$name>"] = "(?P<$name>$pattern)?";
-					}
-				} else {
-					$tr["<$name>"] = "(?P<$name>$pattern)";
-				}
-				if (isset($this->_routeParams[$name])) {
-					$tr2["<$name>"] = "(?P<$name>$pattern)";
-				} else {
-					$this->_paramRules[$name] = $pattern === '[^\/]+' ? '' : "#^$pattern$#";
-				}
-			}
-		}
-
-		$this->_template = preg_replace('/<(\w+):?([^>]+)?>/', '<$1>', $this->pattern);
-		$this->pattern = '#^' . trim(strtr($this->_template, $tr), '/') . '$#u';
-
-		if (!empty($this->_routeParams)) {
-			$this->_routeRule = '#^' . strtr($this->route, $tr2) . '$#u';
-		}
-	}
-
-	/**
-	 * Parses the given request and returns the corresponding route and parameters.
-	 * @param UrlManager $manager the URL manager
-	 * @param Request $request the request component
-	 * @return array|boolean the parsing result. The route and the parameters are returned as an array.
-	 * If false, it means this rule cannot be used to parse this path info.
-	 */
-	public function parseRequest($manager, $request)
-	{
-		if ($this->mode === self::CREATION_ONLY) {
-			return false;
-		}
-
-		if ($this->verb !== null && !in_array($request->verb, $this->verb, true)) {
-			return false;
-		}
-
-		$pathInfo = $request->pathInfo;
-		$suffix = (string)($this->suffix === null ? $manager->suffix : $this->suffix);
-		if ($suffix !== '' && $pathInfo !== '') {
-			$n = strlen($suffix);
-			if (substr($pathInfo, -$n) === $suffix) {
-				$pathInfo = substr($pathInfo, 0, -$n);
-				if ($pathInfo === '') {
-					// suffix alone is not allowed
-					return false;
-				}
-			} elseif ($suffix !== '/') {
-				// we allow the ending '/' to be optional if it is a suffix
-				return false;
-			}
-		}
-
-		if (!preg_match($this->pattern, $pathInfo, $matches)) {
-			return false;
-		}
-		foreach ($this->defaults as $name => $value) {
-			if (!isset($matches[$name]) || $matches[$name] === '') {
-				$matches[$name] = $value;
-			}
-		}
-		$params = $this->defaults;
-		$tr = array();
-		foreach ($matches as $name => $value) {
-			if (isset($this->_routeParams[$name])) {
-				$tr[$this->_routeParams[$name]] = $value;
-				unset($params[$name]);
-			} elseif (isset($this->_paramRules[$name])) {
-				$params[$name] = $value;
-			}
-		}
-		if ($this->_routeRule !== null) {
-			$route = strtr($this->route, $tr);
-		} else {
-			$route = $this->route;
-		}
-		return array($route, $params);
-	}
-
-	/**
-	 * Creates a URL according to the given route and parameters.
-	 * @param UrlManager $manager the URL manager
-	 * @param string $route the route. It should not have slashes at the beginning or the end.
-	 * @param array $params the parameters
-	 * @return string|boolean the created URL, or false if this rule cannot be used for creating this URL.
-	 */
-	public function createUrl($manager, $route, $params)
-	{
-		if ($this->mode === self::PARSING_ONLY) {
-			return false;
-		}
-
-		$tr = array();
-
-		// match the route part first
-		if ($route !== $this->route) {
-			if ($this->_routeRule !== null && preg_match($this->_routeRule, $route, $matches)) {
-				foreach ($this->_routeParams as $name => $token) {
-					if (isset($this->defaults[$name]) && strcmp($this->defaults[$name], $matches[$name]) === 0) {
-						$tr[$token] = '';
-					} else {
-						$tr[$token] = $matches[$name];
-					}
-				}
-			} else {
-				return false;
-			}
-		}
-
-		// match default params
-		// if a default param is not in the route pattern, its value must also be matched
-		foreach ($this->defaults as $name => $value) {
-			if (isset($this->_routeParams[$name])) {
-				continue;
-			}
-			if (!isset($params[$name])) {
-				return false;
-			} elseif (strcmp($params[$name], $value) === 0) { // strcmp will do string conversion automatically
-				unset($params[$name]);
-				if (isset($this->_paramRules[$name])) {
-					$tr["<$name>"] = '';
-				}
-			} elseif (!isset($this->_paramRules[$name])) {
-				return false;
-			}
-		}
-
-		// match params in the pattern
-		foreach ($this->_paramRules as $name => $rule) {
-			if (isset($params[$name]) && ($rule === '' || preg_match($rule, $params[$name]))) {
-				$tr["<$name>"] = urlencode($params[$name]);
-				unset($params[$name]);
-			} elseif (!isset($this->defaults[$name]) || isset($params[$name])) {
-				return false;
-			}
-		}
-
-		$url = trim(strtr($this->_template, $tr), '/');
-		if (strpos($url, '//') !== false) {
-			$url = preg_replace('#/+#', '/', $url);
-		}
-
-		if ($url !== '') {
-			$url .= ($this->suffix === null ? $manager->suffix : $this->suffix);
-		}
-
-		if (!empty($params)) {
-			$url .= '?' . http_build_query($params);
-		}
-		return $url;
-	}
-}
diff --git a/framework/web/User.php b/framework/web/User.php
deleted file mode 100644
index 88fc12d..0000000
--- a/framework/web/User.php
+++ /dev/null
@@ -1,467 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-use Yii;
-use yii\base\Component;
-use yii\base\HttpException;
-use yii\base\InvalidConfigException;
-
-/**
- * User is the class for the "user" application component that manages the user authentication status.
- *
- * In particular, [[User::isGuest]] returns a value indicating whether the current user is a guest or not.
- * Through methods [[login()]] and [[logout()]], you can change the user authentication status.
- *
- * User works with a class implementing the [[Identity]] interface. This class implements
- * the actual user authentication logic and is often backed by a user database table.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class User extends Component
-{
-	const EVENT_BEFORE_LOGIN = 'beforeLogin';
-	const EVENT_AFTER_LOGIN = 'afterLogin';
-	const EVENT_BEFORE_LOGOUT = 'beforeLogout';
-	const EVENT_AFTER_LOGOUT = 'afterLogout';
-
-	/**
-	 * @var string the class name of the [[identity]] object.
-	 */
-	public $identityClass;
-	/**
-	 * @var boolean whether to enable cookie-based login. Defaults to false.
-	 */
-	public $enableAutoLogin = false;
-	/**
-	 * @var string|array the URL for login when [[loginRequired()]] is called. 
-	 * If an array is given, [[UrlManager::createUrl()]] will be called to create the corresponding URL.
-	 * The first element of the array should be the route to the login action, and the rest of 
-	 * the name-value pairs are GET parameters used to construct the login URL. For example,
-	 * 
-	 * ~~~
-	 * array('site/login', 'ref' => 1)
-	 * ~~~
-	 *
-	 * If this property is null, a 403 HTTP exception will be raised when [[loginRequired()]] is called.
-	 */
-	public $loginUrl = array('site/login');
-	/**
-	 * @var array the configuration of the identity cookie. This property is used only when [[enableAutoLogin]] is true.
-	 * @see Cookie
-	 */
-	public $identityCookie = array('name' => '_identity', 'httponly' => true);
-	/**
-	 * @var integer the number of seconds in which the user will be logged out automatically if he
-	 * remains inactive. If this property is not set, the user will be logged out after
-	 * the current session expires (c.f. [[Session::timeout]]).
-	 */
-	public $authTimeout;
-	/**
-	 * @var boolean whether to automatically renew the identity cookie each time a page is requested.
-	 * This property is effective only when [[enableAutoLogin]] is true.
-	 * When this is false, the identity cookie will expire after the specified duration since the user
-	 * is initially logged in. When this is true, the identity cookie will expire after the specified duration
-	 * since the user visits the site the last time.
-	 * @see enableAutoLogin
-	 */
-	public $autoRenewCookie = true;
-	/**
-	 * @var string the session variable name used to store the value of [[id]].
-	 */
-	public $idVar = '__id';
-	/**
-	 * @var string the session variable name used to store the value of expiration timestamp of the authenticated state.
-	 * This is used when [[authTimeout]] is set.
-	 */
-	public $authTimeoutVar = '__expire';
-	/**
-	 * @var string the session variable name used to store the value of [[returnUrl]].
-	 */
-	public $returnUrlVar = '__returnUrl';
-
-
-	/**
-	 * Initializes the application component.
-	 */
-	public function init()
-	{
-		parent::init();
-
-		if ($this->identityClass === null) {
-			throw new InvalidConfigException('User::identityClass must be set.');
-		}
-		if ($this->enableAutoLogin && !isset($this->identityCookie['name'])) {
-			throw new InvalidConfigException('User::identityCookie must contain the "name" element.');
-		}
-
-		Yii::$app->getSession()->open();
-
-		$this->renewAuthStatus();
-
-		if ($this->enableAutoLogin) {
-			if ($this->getIsGuest()) {
-				$this->loginByCookie();
-			} elseif ($this->autoRenewCookie) {
-				$this->renewIdentityCookie();
-			}
-		}
-	}
-
-	private $_identity = false;
-
-	/**
-	 * Returns the identity object associated with the currently logged user.
-	 * @return Identity the identity object associated with the currently logged user.
-	 * Null is returned if the user is not logged in (not authenticated).
-	 * @see login
-	 * @see logout
-	 */
-	public function getIdentity()
-	{
-		if ($this->_identity === false) {
-			$id = $this->getId();
-			if ($id === null) {
-				$this->_identity = null;
-			} else {
-				/** @var $class Identity */
-				$class = Yii::import($this->identityClass);
-				$this->_identity = $class::findIdentity($id);
-			}
-		}
-		return $this->_identity;
-	}
-
-	/**
-	 * Sets the identity object.
-	 * This method should be mainly be used by the User component or its child class
-	 * to maintain the identity object.
-	 *
-	 * You should normally update the user identity via methods [[login()]], [[logout()]]
-	 * or [[switchIdentity()]].
-	 *
-	 * @param Identity $identity the identity object associated with the currently logged user.
-	 */
-	public function setIdentity($identity)
-	{
-		$this->_identity = $identity;
-	}
-
-	/**
-	 * Logs in a user.
-	 *
-	 * This method stores the necessary session information to keep track
-	 * of the user identity information. If `$duration` is greater than 0
-	 * and [[enableAutoLogin]] is true, it will also send out an identity
-	 * cookie to support cookie-based login.
-	 *
-	 * @param Identity $identity the user identity (which should already be authenticated)
-	 * @param integer $duration number of seconds that the user can remain in logged-in status.
-	 * Defaults to 0, meaning login till the user closes the browser or the session is manually destroyed.
-	 * If greater than 0 and [[enableAutoLogin]] is true, cookie-based login will be supported.
-	 * @return boolean whether the user is logged in
-	 */
-	public function login($identity, $duration = 0)
-	{
-		if ($this->beforeLogin($identity, false)) {
-			$this->switchIdentity($identity, $duration);
-			$this->afterLogin($identity, false);
-		}
-		return !$this->getIsGuest();
-	}
-
-	/**
-	 * Logs in a user by cookie.
-	 *
-	 * This method attempts to log in a user using the ID and authKey information
-	 * provided by the given cookie.
-	 */
-	protected function loginByCookie()
-	{
-		$name = $this->identityCookie['name'];
-		$value = Yii::$app->getRequest()->getCookies()->getValue($name);
-		if ($value !== null) {
-			$data = json_decode($value, true);
-			if (count($data) === 3 && isset($data[0], $data[1], $data[2])) {
-				list ($id, $authKey, $duration) = $data;
-				/** @var $class Identity */
-				$class = $this->identityClass;
-				$identity = $class::findIdentity($id);
-				if ($identity !== null && $identity->validateAuthKey($authKey)) {
-					if ($this->beforeLogin($identity, true)) {
-						$this->switchIdentity($identity, $this->autoRenewCookie ? $duration : 0);
-						$this->afterLogin($identity, true);
-					}
-				} elseif ($identity !== null) {
-					Yii::warning("Invalid auth key attempted for user '$id': $authKey", __METHOD__);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Logs out the current user.
-	 * This will remove authentication-related session data.
-	 * If `$destroySession` is true, all session data will be removed.
-	 * @param boolean $destroySession whether to destroy the whole session. Defaults to true.
-	 */
-	public function logout($destroySession = true)
-	{
-		$identity = $this->getIdentity();
-		if ($identity !== null && $this->beforeLogout($identity)) {
-			$this->switchIdentity(null);
-			if ($destroySession) {
-				Yii::$app->getSession()->destroy();
-			}
- 			$this->afterLogout($identity);
-		}
-	}
-
-	/**
-	 * Returns a value indicating whether the user is a guest (not authenticated).
-	 * @return boolean whether the current user is a guest.
-	 */
-	public function getIsGuest()
-	{
-		return $this->getIdentity() === null;
-	}
-
-	/**
-	 * Returns a value that uniquely represents the user.
-	 * @return string|integer the unique identifier for the user. If null, it means the user is a guest.
-	 */
-	public function getId()
-	{
-		return Yii::$app->getSession()->get($this->idVar);
-	}
-
-	/**
-	 * Returns the URL that the user should be redirected to after successful login.
-	 * This property is usually used by the login action. If the login is successful,
-	 * the action should read this property and use it to redirect the user browser.
-	 * @param string|array $defaultUrl the default return URL in case it was not set previously.
-	 * If this is null, it means [[Application::homeUrl]] will be redirected to.
-	 * Please refer to [[\yii\helpers\Html::url()]] on acceptable URL formats.
-	 * @return string the URL that the user should be redirected to after login.
-	 * @see loginRequired
-	 */
-	public function getReturnUrl($defaultUrl = null)
-	{
-		$url = Yii::$app->getSession()->get($this->returnUrlVar, $defaultUrl);
-		return $url === null ? Yii::$app->getHomeUrl() : $url;
-	}
-
-	/**
-	 * @param string|array $url the URL that the user should be redirected to after login.
-	 * Please refer to [[\yii\helpers\Html::url()]] on acceptable URL formats.
-	 */
-	public function setReturnUrl($url)
-	{
-		Yii::$app->getSession()->set($this->returnUrlVar, $url);
-	}
-
-	/**
-	 * Redirects the user browser to the login page.
-	 * Before the redirection, the current URL (if it's not an AJAX url) will be
-	 * kept as [[returnUrl]] so that the user browser may be redirected back
-	 * to the current page after successful login. Make sure you set [[loginUrl]]
-	 * so that the user browser can be redirected to the specified login URL after
-	 * calling this method.
-	 * After calling this method, the current request processing will be terminated.
-	 */
-	public function loginRequired()
-	{
-		$request = Yii::$app->getRequest();
-		if (!$request->getIsAjaxRequest()) {
-			$this->setReturnUrl($request->getUrl());
-		}
-		if ($this->loginUrl !== null) {
-			Yii::$app->getResponse()->redirect($this->loginUrl);
-		} else {
-			throw new HttpException(403, Yii::t('yii|Login Required'));
-		}
-	}
-
-	/**
-	 * This method is called before logging in a user.
-	 * The default implementation will trigger the [[EVENT_BEFORE_LOGIN]] event.
-	 * If you override this method, make sure you call the parent implementation
-	 * so that the event is triggered.
-	 * @param Identity $identity the user identity information
-	 * @param boolean $cookieBased whether the login is cookie-based
-	 * @return boolean whether the user should continue to be logged in
-	 */
-	protected function beforeLogin($identity, $cookieBased)
-	{
-		$event = new UserEvent(array(
-			'identity' => $identity,
-			'cookieBased' => $cookieBased,
-		));
-		$this->trigger(self::EVENT_BEFORE_LOGIN, $event);
-		return $event->isValid;
-	}
-
-	/**
-	 * This method is called after the user is successfully logged in.
-	 * The default implementation will trigger the [[EVENT_AFTER_LOGIN]] event.
-	 * If you override this method, make sure you call the parent implementation
-	 * so that the event is triggered.
-	 * @param Identity $identity the user identity information
-	 * @param boolean $cookieBased whether the login is cookie-based
-	 */
-	protected function afterLogin($identity, $cookieBased)
-	{
-		$this->trigger(self::EVENT_AFTER_LOGIN, new UserEvent(array(
-			'identity' => $identity,
-			'cookieBased' => $cookieBased,
-		)));
-	}
-
-	/**
-	 * This method is invoked when calling [[logout()]] to log out a user.
-	 * The default implementation will trigger the [[EVENT_BEFORE_LOGOUT]] event.
-	 * If you override this method, make sure you call the parent implementation
-	 * so that the event is triggered.
-	 * @param Identity $identity the user identity information
-	 * @return boolean whether the user should continue to be logged out
-	 */
-	protected function beforeLogout($identity)
-	{
-		$event = new UserEvent(array(
-			'identity' => $identity,
-		));
-		$this->trigger(self::EVENT_BEFORE_LOGOUT, $event);
-		return $event->isValid;
-	}
-
-	/**
-	 * This method is invoked right after a user is logged out via [[logout()]].
-	 * The default implementation will trigger the [[EVENT_AFTER_LOGOUT]] event.
-	 * If you override this method, make sure you call the parent implementation
-	 * so that the event is triggered.
-	 * @param Identity $identity the user identity information
-	 */
-	protected function afterLogout($identity)
-	{
-		$this->trigger(self::EVENT_AFTER_LOGOUT, new UserEvent(array(
-			'identity' => $identity,
-		)));
-	}
-
-	/**
-	 * Renews the identity cookie.
-	 * This method will set the expiration time of the identity cookie to be the current time
-	 * plus the originally specified cookie duration.
-	 */
-	protected function renewIdentityCookie()
-	{
-		$name = $this->identityCookie['name'];
-		$value = Yii::$app->getRequest()->getCookies()->getValue($name);
-		if ($value !== null) {
-			$data = json_decode($value, true);
-			if (is_array($data) && isset($data[2])) {
-				$cookie = new Cookie($this->identityCookie);
-				$cookie->value = $value;
-				$cookie->expire = time() + (int)$data[2];
-				Yii::$app->getResponse()->getCookies()->add($cookie);
-			}
-		}
-	}
-
-	/**
-	 * Sends an identity cookie.
-	 * This method is used when [[enableAutoLogin]] is true.
-	 * It saves [[id]], [[Identity::getAuthKey()|auth key]], and the duration of cookie-based login
-	 * information in the cookie.
-	 * @param Identity $identity
-	 * @param integer $duration number of seconds that the user can remain in logged-in status.
-	 * @see loginByCookie
-	 */
-	protected function sendIdentityCookie($identity, $duration)
-	{
-		$cookie = new Cookie($this->identityCookie);
-		$cookie->value = json_encode(array(
-			$identity->getId(),
-			$identity->getAuthKey(),
-			$duration,
-		));
-		$cookie->expire = time() + $duration;
-		Yii::$app->getResponse()->getCookies()->add($cookie);
-	}
-
-	/**
-	 * Switches to a new identity for the current user.
-	 *
-	 * This method will save necessary session information to keep track of the user authentication status.
-	 * If `$duration` is provided, it will also send out appropriate identity cookie
-	 * to support cookie-based login.
-	 *
-	 * This method is mainly called by [[login()]], [[logout()]] and [[loginByCookie()]]
-	 * when the current user needs to be associated with the corresponding identity information.
-	 *
-	 * @param Identity $identity the identity information to be associated with the current user.
-	 * If null, it means switching to be a guest.
-	 * @param integer $duration number of seconds that the user can remain in logged-in status.
-	 * This parameter is used only when `$identity` is not null.
-	 */
-	public function switchIdentity($identity, $duration = 0)
-	{
-		$session = Yii::$app->getSession();
-		$session->regenerateID(true);
-		$this->setIdentity($identity);
-		$session->remove($this->idVar);
-		$session->remove($this->authTimeoutVar);
-		if ($identity instanceof Identity) {
-			$session->set($this->idVar, $identity->getId());
-			if ($this->authTimeout !== null) {
-				$session->set($this->authTimeoutVar, time() + $this->authTimeout);
-			}
-			if ($duration > 0 && $this->enableAutoLogin) {
-				$this->sendIdentityCookie($identity, $duration);
-			}
-		} elseif ($this->enableAutoLogin) {
-			Yii::$app->getResponse()->getCookies()->remove(new Cookie($this->identityCookie));
-		}
-	}
-
-	/**
-	 * Updates the authentication status according to [[authTimeout]].
-	 * This method is called during [[init()]].
-	 * It will update the user's authentication status if it has not outdated yet.
-	 * Otherwise, it will logout the user.
-	 */
-	protected function renewAuthStatus()
-	{
-		if ($this->authTimeout !== null && !$this->getIsGuest()) {
-			$expire = Yii::$app->getSession()->get($this->authTimeoutVar);
-			if ($expire !== null && $expire < time()) {
-				$this->logout(false);
-			} else {
-				Yii::$app->getSession()->set($this->authTimeoutVar, time() + $this->authTimeout);
-			}
-		}
-	}
-
-	/**
-	 * Checks whether the user has access to the specified operation.
-	 * @param $operator
-	 * @param array $params
-	 * @return bool
-	 * @todo
-	 */
-	public function checkAccess($operation, $params = array())
-	{
-		$auth = Yii::$app->getAuthManager();
-		if ($auth !== null) {
-			return $auth->checkAccess($this->getId(), $operation, $params);
-		} else {
-			return false;
-		}
-	}
-}
diff --git a/framework/web/UserEvent.php b/framework/web/UserEvent.php
deleted file mode 100644
index 4e39380..0000000
--- a/framework/web/UserEvent.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-use yii\base\Event;
-
-/**
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class UserEvent extends Event
-{
-	/**
-	 * @var Identity the identity object associated with this event
-	 */
-	public $identity;
-	/**
-	 * @var boolean whether the login is cookie-based. This property is only meaningful
-	 * for [[User::EVENT_BEFORE_LOGIN]] and [[User::EVENT_AFTER_LOGIN]] events.
-	 */
-	public $cookieBased;
-	/**
-	 * @var boolean whether the login or logout should proceed.
-	 * Event handlers may modify this property to determine whether the login or logout should proceed.
-	 * This property is only meaningful for [[User::EVENT_BEFORE_LOGIN]] and [[User::EVENT_BEFORE_LOGOUT]] events.
-	 */
-	public $isValid = true;
-}
diff --git a/framework/widgets/ActiveField.php b/framework/widgets/ActiveField.php
deleted file mode 100644
index 9f3f201..0000000
--- a/framework/widgets/ActiveField.php
+++ /dev/null
@@ -1,544 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-namespace yii\widgets;
-
-use yii\base\Component;
-use yii\db\ActiveRecord;
-use yii\helpers\Html;
-use yii\base\Model;
-use yii\web\JsExpression;
-
-/**
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class ActiveField extends Component
-{
-	/**
-	 * @var ActiveForm the form that this field is associated with.
-	 */
-	public $form;
-	/**
-	 * @var Model the data model that this field is associated with
-	 */
-	public $model;
-	/**
-	 * @var string the model attribute that this field is associated with
-	 */
-	public $attribute;
-	/**
-	 * @var string the tag name for the field container.
-	 */
-	public $tag = 'div';
-	/**
-	 * @var array the HTML attributes (name-value pairs) for the field container tag.
-	 * The values will be HTML-encoded using [[Html::encode()]].
-	 * If a value is null, the corresponding attribute will not be rendered.
-	 */
-	public $options = array(
-		'class' => 'control-group',
-	);
-	/**
-	 * @var string the template that is used to arrange the label, the input and the error message.
-	 * The following tokens will be replaced when [[render()]] is called: `{label}`, `{input}` and `{error}`.
-	 */
-	public $template = "{label}\n<div class=\"controls\">\n{input}\n{error}\n</div>";
-	/**
-	 * @var array the default options for the input tags. The parameter passed to individual input methods
-	 * (e.g. [[textInput()]]) will be merged with this property when rendering the input tag.
-	 */
-	public $inputOptions = array();
-	/**
-	 * @var array the default options for the error tags. The parameter passed to [[error()]] will be
-	 * merged with this property when rendering the error tag.
-	 */
-	public $errorOptions = array('tag' => 'span', 'class' => 'help-inline');
-	/**
-	 * @var array the default options for the label tags. The parameter passed to [[label()]] will be
-	 * merged with this property when rendering the label tag.
-	 */
-	public $labelOptions = array('class' => 'control-label');
-	/**
-	 * @var boolean whether to enable client-side data validation.
-	 * If not set, it will take the value of [[ActiveForm::enableClientValidation]].
-	 */
-	public $enableClientValidation;
-	/**
-	 * @var boolean whether to enable AJAX-based data validation.
-	 * If not set, it will take the value of [[ActiveForm::enableAjaxValidation]].
-	 */
-	public $enableAjaxValidation;
-	/**
-	 * @var boolean whether to perform validation when the input field loses focus and its value is found changed.
-	 * If not set, it will take the value of [[ActiveForm::validateOnChange]].
-	 */
-	public $validateOnChange;
-	/**
-	 * @var boolean whether to perform validation while the user is typing in the input field.
-	 * If not set, it will take the value of [[ActiveForm::validateOnType]].
-	 * @see validationDelay
-	 */
-	public $validateOnType;
-	/**
-	 * @var integer number of milliseconds that the validation should be delayed when the input field
-	 * is changed or the user types in the field.
-	 * If not set, it will take the value of [[ActiveForm::validationDelay]].
-	 */
-	public $validationDelay;
-	/**
-	 * @var array the jQuery selectors for selecting the container, input and error tags.
-	 * The array keys should be "container", "input", and/or "error", and the array values
-	 * are the corresponding selectors. For example, `array('input' => '#my-input')`.
-	 *
-	 * The container selector is used under the context of the form, while the input and the error
-	 * selectors are used under the context of the container.
-	 *
-	 * You normally do not need to set this property as the default selectors should work well for most cases.
-	 */
-	public $selectors;
-
-	public function begin()
-	{
-		$options = $this->getClientOptions();
-		if (!empty($options)) {
-			$this->form->attributes[$this->attribute] = $options;
-		}
-
-		$inputID = Html::getInputId($this->model, $this->attribute);
-		$attribute = Html::getAttributeName($this->attribute);
-		$options = $this->options;
-		$class = isset($options['class']) ? array($options['class']) : array();
-		$class[] = "field-$inputID";
-		if ($this->model->isAttributeRequired($attribute)) {
-			$class[] = $this->form->requiredCssClass;
-		}
-		if ($this->model->hasErrors($attribute)) {
-			$class[] = $this->form->errorCssClass;
-		}
-		$options['class'] = implode(' ', $class);
-
-		return Html::beginTag($this->tag, $options);
-	}
-
-	public function end()
-	{
-		return Html::endTag($this->tag);
-	}
-
-	protected function getClientOptions()
-	{
-		$enableClientValidation = $this->enableClientValidation || $this->enableClientValidation === null && $this->form->enableClientValidation;
-		$enableAjaxValidation = $this->enableAjaxValidation || $this->enableAjaxValidation === null && $this->form->enableAjaxValidation;
-		if ($enableClientValidation) {
-			$attribute = Html::getAttributeName($this->attribute);
-			$validators = array();
-			foreach ($this->model->getActiveValidators($attribute) as $validator) {
-				/** @var \yii\validators\Validator $validator */
-				$js = $validator->clientValidateAttribute($this->model, $attribute);
-				if ($validator->enableClientValidation && $js != '') {
-					$validators[] = $js;
-				}
-			}
-			if (!empty($validators)) {
-				$options['validate'] = new JsExpression("function(attribute,value,messages){" . implode('', $validators) . '}');
-			}
-		}
-
-		if ($enableAjaxValidation) {
-			$options['enableAjaxValidation'] = 1;
-		}
-
-		if ($enableClientValidation && !empty($options['validate']) || $enableAjaxValidation) {
-			$inputID = Html::getInputId($this->model, $this->attribute);
-			$options['name'] = $inputID;
-			$names = array(
-				'validateOnChange',
-				'validateOnType',
-				'validationDelay',
-			);
-			foreach ($names as $name) {
-				$options[$name] = $this->$name === null ? $this->form->$name : $this->$name;
-			}
-			$options['container'] = isset($this->selectors['container']) ? $this->selectors['container'] : ".field-$inputID";
-			$options['input'] = isset($this->selectors['input']) ? $this->selectors['input'] : "#$inputID";
-			if (isset($this->errorOptions['class'])) {
-				$options['error'] = '.' . implode('.', preg_split('/\s+/', $this->errorOptions['class'], -1, PREG_SPLIT_NO_EMPTY));
-			} else {
-				$options['error'] = isset($this->errorOptions['tag']) ? $this->errorOptions['tag'] : 'span';
-			}
-			return $options;
-		} else {
-			return array();
-		}
-	}
-
-	/**
-	 * Generates a label tag for [[attribute]].
-	 * The label text is the label associated with the attribute, obtained via [[Model::getAttributeLabel()]].
-	 * @param array $options the tag options in terms of name-value pairs. It will be merged with [[labelOptions]].
-	 * The options will be rendered as the attributes of the resulting tag. The values will be HTML-encoded
-	 * using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
-	 *
-	 * The following options are specially handled:
-	 *
-	 * - label: this specifies the label to be displayed. Note that this will NOT be [[encoded()]].
-	 *   If this is not set, [[Model::getAttributeLabel()]] will be called to get the label for display
-	 *   (after encoding).
-	 *
-	 * @return string the generated label tag
-	 */
-	public function label($options = array())
-	{
-		$options = array_merge($this->labelOptions, $options);
-		return Html::activeLabel($this->model, $this->attribute, $options);
-	}
-
-	/**
-	 * Generates a tag that contains the first validation error of [[attribute]].
-	 * Note that even if there is no validation error, this method will still return an empty error tag.
-	 * @param array $options the tag options in terms of name-value pairs. It will be merged with [[errorOptions]].
-	 * The options will be rendered as the attributes of the resulting tag. The values will be HTML-encoded
-	 * using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
-	 *
-	 * The following options are specially handled:
-	 *
-	 * - tag: this specifies the tag name. If not set, "span" will be used.
-	 *
-	 * @return string the generated label tag
-	 */
-	public function error($options = array())
-	{
-		$options = array_merge($this->errorOptions, $options);
-		$attribute = Html::getAttributeName($this->attribute);
-		$error = $this->model->getFirstError($attribute);
-		$tag = isset($options['tag']) ? $options['tag'] : 'span';
-		unset($options['tag']);
-		return Html::tag($tag, Html::encode($error), $options);
-	}
-
-	/**
-	 * Renders the field with the given input HTML.
-	 * This method will generate the label and error tags, and return them together with the given
-	 * input HTML according to [[template]].
-	 * @param string $input the input HTML
-	 * @return string the rendering result
-	 */
-	public function render($input)
-	{
-		return $this->begin() . "\n" . strtr($this->template, array(
-			'{input}' => $input,
-			'{label}' => $this->label(),
-			'{error}' => $this->error(),
-		)) . "\n" . $this->end();
-	}
-
-	/**
-	 * Generates an input tag for the given model attribute.
-	 * @param string $type the input type (e.g. 'text', 'password')
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * @return string the generated input tag
-	 */
-	public function input($type, $options = array())
-	{
-		$options = array_merge($this->inputOptions, $options);
-		return $this->render(Html::activeInput($type, $this->model, $this->attribute, $options));
-	}
-
-	/**
-	 * Generates a text input tag for the given model attribute.
-	 * This method will generate the "name" and "value" tag attributes automatically for the model attribute
-	 * unless they are explicitly specified in `$options`.
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * @return string the generated input tag
-	 */
-	public function textInput($options = array())
-	{
-		$options = array_merge($this->inputOptions, $options);
-		return $this->render(Html::activeTextInput($this->model, $this->attribute, $options));
-	}
-
-	/**
-	 * Generates a hidden input tag for the given model attribute.
-	 * This method will generate the "name" and "value" tag attributes automatically for the model attribute
-	 * unless they are explicitly specified in `$options`.
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * @return string the generated input tag
-	 */
-	public function hiddenInput($options = array())
-	{
-		$options = array_merge($this->inputOptions, $options);
-		return $this->render(Html::activeHiddenInput($this->model, $this->attribute, $options));
-	}
-
-	/**
-	 * Generates a password input tag for the given model attribute.
-	 * This method will generate the "name" and "value" tag attributes automatically for the model attribute
-	 * unless they are explicitly specified in `$options`.
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * @return string the generated input tag
-	 */
-	public function passwordInput($options = array())
-	{
-		$options = array_merge($this->inputOptions, $options);
-		return $this->render(Html::activePasswordInput($this->model, $this->attribute, $options));
-	}
-
-	/**
-	 * Generates a file input tag for the given model attribute.
-	 * This method will generate the "name" and "value" tag attributes automatically for the model attribute
-	 * unless they are explicitly specified in `$options`.
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * @return string the generated input tag
-	 */
-	public function fileInput($options = array())
-	{
-		$options = array_merge($this->inputOptions, $options);
-		return $this->render(Html::activeFileInput($this->model, $this->attribute, $options));
-	}
-
-	/**
-	 * Generates a textarea tag for the given model attribute.
-	 * The model attribute value will be used as the content in the textarea.
-	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
-	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
-	 * @return string the generated textarea tag
-	 */
-	public function textarea($options = array())
-	{
-		$options = array_merge($this->inputOptions, $options);
-		return $this->render(Html::activeTextarea($this->model, $this->attribute, $options));
-	}
-
-	/**
-	 * Generates a radio button tag for the given model attribute.
-	 * This method will generate the "name" tag attribute automatically unless it is explicitly specified in `$options`.
-	 * This method will generate the "checked" tag attribute according to the model attribute value.
-	 * @param array $options the tag options in terms of name-value pairs. The following options are specially handled:
-	 *
-	 * - uncheck: string, the value associated with the uncheck state of the radio button. If not set,
-	 *   it will take the default value '0'. This method will render a hidden input so that if the radio button
-	 *   is not checked and is submitted, the value of this attribute will still be submitted to the server
-	 *   via the hidden input.
-	 *
-	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will
-	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
-	 * @param boolean $enclosedByLabel whether to enclose the radio within the label.
-	 * If true, the method will still use [[template]] to layout the checkbox and the error message
-	 * except that the radio is enclosed by the label tag.
-	 * @return string the generated radio button tag
-	 */
-	public function radio($options = array(), $enclosedByLabel = true)
-	{
-		$options = array_merge($this->inputOptions, $options);
-		if ($enclosedByLabel) {
-			$hidden = '';
-			$radio = Html::activeRadio($this->model, $this->attribute, $options);
-			if (($pos = strpos($radio, '><')) !== false) {
-				$hidden = substr($radio, 0, $pos + 1);
-				$radio = substr($radio, $pos + 1);
-			}
-			$label = isset($this->labelOptions['label']) ? $this->labelOptions['label'] : Html::encode($this->model->getAttributeLabel($this->attribute));
-			return $this->begin() . "\n" . $hidden . strtr($this->template, array(
-				'{input}' => Html::label("$radio $label", null, array('class' => 'radio')),
-				'{label}' => '',
-				'{error}' => $this->error(),
-			)) . "\n" . $this->end();
-		} else {
-			return $this->render(Html::activeRadio($this->model, $this->attribute, $options));
-		}
-	}
-
-	/**
-	 * Generates a checkbox tag for the given model attribute.
-	 * This method will generate the "name" tag attribute automatically unless it is explicitly specified in `$options`.
-	 * This method will generate the "checked" tag attribute according to the model attribute value.
-	 * @param array $options the tag options in terms of name-value pairs. The following options are specially handled:
-	 *
-	 * - uncheck: string, the value associated with the uncheck state of the radio button. If not set,
-	 *   it will take the default value '0'. This method will render a hidden input so that if the radio button
-	 *   is not checked and is submitted, the value of this attribute will still be submitted to the server
-	 *   via the hidden input.
-	 *
-	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will
-	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
-	 * @param boolean $enclosedByLabel whether to enclose the checkbox within the label.
-	 * If true, the method will still use [[template]] to layout the checkbox and the error message
-	 * except that the checkbox is enclosed by the label tag.
-	 * @return string the generated checkbox tag
-	 */
-	public function checkbox($options = array(), $enclosedByLabel = true)
-	{
-		$options = array_merge($this->inputOptions, $options);
-		if ($enclosedByLabel) {
-			$hidden = '';
-			$checkbox = Html::activeCheckbox($this->model, $this->attribute, $options);
-			if (($pos = strpos($checkbox, '><')) !== false) {
-				$hidden = substr($checkbox, 0, $pos + 1);
-				$checkbox = substr($checkbox, $pos + 1);
-			}
-			$label = isset($this->labelOptions['label']) ? $this->labelOptions['label'] : Html::encode($this->model->getAttributeLabel($this->attribute));
-			return $this->begin() . "\n" . $hidden . strtr($this->template, array(
-				'{input}' => Html::label("$checkbox $label", null, array('class' => 'checkbox')),
-				'{label}' => '',
-				'{error}' => $this->error(),
-			)) . "\n" . $this->end();
-		} else {
-			return $this->render(Html::activeCheckbox($this->model, $this->attribute, $options));
-		}
-	}
-
-	/**
-	 * Generates a drop-down list for the given model attribute.
-	 * The selection of the drop-down list is taken from the value of the model attribute.
-	 * @param array $items the option data items. The array keys are option values, and the array values
-	 * are the corresponding option labels. The array can also be nested (i.e. some array values are arrays too).
-	 * For each sub-array, an option group will be generated whose label is the key associated with the sub-array.
-	 * If you have a list of data models, you may convert them into the format described above using
-	 * [[\yii\helpers\ArrayHelper::map()]].
-	 *
-	 * Note, the values and labels will be automatically HTML-encoded by this method, and the blank spaces in
-	 * the labels will also be HTML-encoded.
-	 * @param array $options the tag options in terms of name-value pairs. The following options are specially handled:
-	 *
-	 * - prompt: string, a prompt text to be displayed as the first option;
-	 * - options: array, the attributes for the select option tags. The array keys must be valid option values,
-	 *   and the array values are the extra attributes for the corresponding option tags. For example,
-	 *
-	 * ~~~
-	 * array(
-	 *     'value1' => array('disabled' => true),
-	 *     'value2' => array('label' => 'value 2'),
-	 * );
-	 * ~~~
-	 *
-	 * - groups: array, the attributes for the optgroup tags. The structure of this is similar to that of 'options',
-	 *   except that the array keys represent the optgroup labels specified in $items.
-	 *
-	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will
-	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
-	 *
-	 * @return string the generated drop-down list tag
-	 */
-	public function dropDownList($items, $options = array())
-	{
-		$options = array_merge($this->inputOptions, $options);
-		return $this->render(Html::activeDropDownList($this->model, $this->attribute, $items, $options));
-	}
-
-	/**
-	 * Generates a list box.
-	 * The selection of the list box is taken from the value of the model attribute.
-	 * @param array $items the option data items. The array keys are option values, and the array values
-	 * are the corresponding option labels. The array can also be nested (i.e. some array values are arrays too).
-	 * For each sub-array, an option group will be generated whose label is the key associated with the sub-array.
-	 * If you have a list of data models, you may convert them into the format described above using
-	 * [[\yii\helpers\ArrayHelper::map()]].
-	 *
-	 * Note, the values and labels will be automatically HTML-encoded by this method, and the blank spaces in
-	 * the labels will also be HTML-encoded.
-	 * @param array $options the tag options in terms of name-value pairs. The following options are specially handled:
-	 *
-	 * - prompt: string, a prompt text to be displayed as the first option;
-	 * - options: array, the attributes for the select option tags. The array keys must be valid option values,
-	 *   and the array values are the extra attributes for the corresponding option tags. For example,
-	 *
-	 * ~~~
-	 * array(
-	 *     'value1' => array('disabled' => true),
-	 *     'value2' => array('label' => 'value 2'),
-	 * );
-	 * ~~~
-	 *
-	 * - groups: array, the attributes for the optgroup tags. The structure of this is similar to that of 'options',
-	 *   except that the array keys represent the optgroup labels specified in $items.
-	 * - unselect: string, the value that will be submitted when no option is selected.
-	 *   When this attribute is set, a hidden field will be generated so that if no option is selected in multiple
-	 *   mode, we can still obtain the posted unselect value.
-	 *
-	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will
-	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
-	 *
-	 * @return string the generated list box tag
-	 */
-	public function listBox($items, $options = array())
-	{
-		$options = array_merge($this->inputOptions, $options);
-		return $this->render(Html::activeListBox($this->model, $this->attribute, $items, $options));
-	}
-
-	/**
-	 * Generates a list of checkboxes.
-	 * A checkbox list allows multiple selection, like [[listBox()]].
-	 * As a result, the corresponding submitted value is an array.
-	 * The selection of the checkbox list is taken from the value of the model attribute.
-	 * @param array $items the data item used to generate the checkboxes.
-	 * The array keys are the labels, while the array values are the corresponding checkbox values.
-	 * Note that the labels will NOT be HTML-encoded, while the values will.
-	 * @param array $options options (name => config) for the checkbox list. The following options are specially handled:
-	 *
-	 * - unselect: string, the value that should be submitted when none of the checkboxes is selected.
-	 *   By setting this option, a hidden input will be generated.
-	 * - separator: string, the HTML code that separates items.
-	 * - item: callable, a callback that can be used to customize the generation of the HTML code
-	 *   corresponding to a single item in $items. The signature of this callback must be:
-	 *
-	 * ~~~
-	 * function ($index, $label, $name, $checked, $value)
-	 * ~~~
-	 *
-	 * where $index is the zero-based index of the checkbox in the whole list; $label
-	 * is the label for the checkbox; and $name, $value and $checked represent the name,
-	 * value and the checked status of the checkbox input.
-	 * @return string the generated checkbox list
-	 */
-	public function checkboxList($items, $options = array())
-	{
-		return $this->render(
-			'<div id="' . Html::getInputId($this->model, $this->attribute) . '">'
-			. Html::activeCheckboxList($this->model, $this->attribute, $items, $options)
-			. '</div>'
-		);
-	}
-
-	/**
-	 * Generates a list of radio buttons.
-	 * A radio button list is like a checkbox list, except that it only allows single selection.
-	 * The selection of the radio buttons is taken from the value of the model attribute.
-	 * @param array $items the data item used to generate the radio buttons.
-	 * The array keys are the labels, while the array values are the corresponding radio button values.
-	 * Note that the labels will NOT be HTML-encoded, while the values will.
-	 * @param array $options options (name => config) for the radio button list. The following options are specially handled:
-	 *
-	 * - unselect: string, the value that should be submitted when none of the radio buttons is selected.
-	 *   By setting this option, a hidden input will be generated.
-	 * - separator: string, the HTML code that separates items.
-	 * - item: callable, a callback that can be used to customize the generation of the HTML code
-	 *   corresponding to a single item in $items. The signature of this callback must be:
-	 *
-	 * ~~~
-	 * function ($index, $label, $name, $checked, $value)
-	 * ~~~
-	 *
-	 * where $index is the zero-based index of the radio button in the whole list; $label
-	 * is the label for the radio button; and $name, $value and $checked represent the name,
-	 * value and the checked status of the radio button input.
-	 * @return string the generated radio button list
-	 */
-	public function radioList($items, $options = array())
-	{
-		return $this->render(
-			'<div id="' . Html::getInputId($this->model, $this->attribute) . '">'
-			. Html::activeRadioList($this->model, $this->attribute, $items, $options)
-			. '</div>'
-		);
-	}
-}
diff --git a/framework/widgets/ActiveForm.php b/framework/widgets/ActiveForm.php
deleted file mode 100644
index 24451b9..0000000
--- a/framework/widgets/ActiveForm.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\widgets;
-
-use Yii;
-use yii\base\Widget;
-use yii\base\Model;
-use yii\helpers\Html;
-use yii\helpers\Json;
-
-/**
- * ActiveForm ...
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class ActiveForm extends Widget
-{
-	/**
-	 * @param array|string $action the form action URL. This parameter will be processed by [[\yii\helpers\Html::url()]].
-	 */
-	public $action = '';
-	/**
-	 * @var string the form submission method. This should be either 'post' or 'get'.
-	 * Defaults to 'post'.
-	 */
-	public $method = 'post';
-	/**
-	 * @var array the HTML attributes (name-value pairs) for the form tag.
-	 * The values will be HTML-encoded using [[Html::encode()]].
-	 * If a value is null, the corresponding attribute will not be rendered.
-	 */
-	public $options = array();
-	/**
-	 * @var array the default configuration used by [[field()]] when creating a new field object.
-	 */
-	public $fieldConfig;
-	/**
-	 * @var string the default CSS class for the error summary container.
-	 * @see errorSummary()
-	 */
-	public $errorSummaryCssClass = 'error-summary';
-	/**
-	 * @var string the CSS class that is added to a field container when the associated attribute is required.
-	 */
-	public $requiredCssClass = 'required';
-	/**
-	 * @var string the CSS class that is added to a field container when the associated attribute has validation error.
-	 */
-	public $errorCssClass = 'error';
-	/**
-	 * @var string the CSS class that is added to a field container when the associated attribute is successfully validated.
-	 */
-	public $successCssClass = 'success';
-	/**
-	 * @var string the CSS class that is added to a field container when the associated attribute is being validated.
-	 */
-	public $validatingCssClass = 'validating';
-	/**
-	 * @var boolean whether to enable client-side data validation.
-	 * If [[ActiveField::enableClientValidation]] is set, its value will take precedence for that input field.
-	 */
-	public $enableClientValidation = true;
-	/**
-	 * @var boolean whether to enable AJAX-based data validation.
-	 * If [[ActiveField::enableAjaxValidation]] is set, its value will take precedence for that input field.
-	 */
-	public $enableAjaxValidation = false;
-	/**
-	 * @var array|string the URL for performing AJAX-based validation. This property will be processed by
-	 * [[Html::url()]]. Please refer to [[Html::url()]] for more details on how to configure this property.
-	 * If this property is not set, it will take the value of the form's action attribute.
-	 */
-	public $validationUrl;
-	/**
-	 * @var boolean whether to perform validation when the form is submitted.
-	 */
-	public $validateOnSubmit = true;
-	/**
-	 * @var boolean whether to perform validation when an input field loses focus and its value is found changed.
-	 * If [[ActiveField::validateOnChange]] is set, its value will take precedence for that input field.
-	 */
-	public $validateOnChange = true;
-	/**
-	 * @var boolean whether to perform validation while the user is typing in an input field.
-	 * If [[ActiveField::validateOnType]] is set, its value will take precedence for that input field.
-	 * @see validationDelay
-	 */
-	public $validateOnType = false;
-	/**
-	 * @var integer number of milliseconds that the validation should be delayed when an input field
-	 * is changed or the user types in the field.
-	 * If [[ActiveField::validationDelay]] is set, its value will take precedence for that input field.
-	 */
-	public $validationDelay = 200;
-	/**
-	 * @var string the name of the GET parameter indicating the validation request is an AJAX request.
-	 */
-	public $ajaxVar = 'ajax';
-	/**
-	 * @var array the client validation options for individual attributes. Each element of the array
-	 * represents the validation options for a particular attribute.
-	 * @internal
-	 */
-	public $attributes = array();
-
-	/**
-	 * Initializes the widget.
-	 * This renders the form open tag.
-	 */
-	public function init()
-	{
-		if (!isset($this->options['id'])) {
-			$this->options['id'] = $this->getId();
-		}
-		if (!isset($this->fieldConfig['class'])) {
-			$this->fieldConfig['class'] = 'yii\widgets\ActiveField';
-		}
-		echo Html::beginForm($this->action, $this->method, $this->options);
-	}
-
-	/**
-	 * Runs the widget.
-	 * This registers the necessary javascript code and renders the form close tag.
-	 */
-	public function run()
-	{
-		if (!empty($this->attributes)) {
-			$id = $this->options['id'];
-			$options = Json::encode($this->getClientOptions());
-			$attributes = Json::encode($this->attributes);
-			$this->view->registerAssetBundle('yii/form');
-			$this->view->registerJs("jQuery('#$id').yiiActiveForm($attributes, $options);");
-		}
-		echo Html::endForm();
-	}
-
-	/**
-	 * Returns the options for the form JS widget.
-	 * @return array the options
-	 */
-	protected function getClientOptions()
-	{
-		$options = array(
-			'errorSummary' => '.' . $this->errorSummaryCssClass,
-			'validateOnSubmit' => $this->validateOnSubmit,
-			'errorCssClass' => $this->errorCssClass,
-			'successCssClass' => $this->successCssClass,
-			'validatingCssClass' => $this->validatingCssClass,
-			'ajaxVar' => $this->ajaxVar,
-		);
-		if ($this->validationUrl !== null) {
-			$options['validationUrl'] = Html::url($this->validationUrl);
-		}
-		return $options;
-	}
-
-	/**
-	 * Generates a summary of the validation errors.
-	 * If there is no validation error, an empty error summary markup will still be generated, but it will be hidden.
-	 * @param Model|Model[] $models the model(s) associated with this form
-	 * @param array $options the tag options in terms of name-value pairs. The following options are specially handled:
-	 *
-	 * - header: string, the header HTML for the error summary. If not set, a default prompt string will be used.
-	 * - footer: string, the footer HTML for the error summary.
-	 *
-	 * The rest of the options will be rendered as the attributes of the container tag. The values will
-	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
-	 * @return string the generated error summary
-	 */
-	public function errorSummary($models, $options = array())
-	{
-		if (!is_array($models)) {
-			$models = array($models);
-		}
-
-		$lines = array();
-		foreach ($models as $model) {
-			/** @var $model Model */
-			foreach ($model->getFirstErrors() as $error) {
-				$lines[] = Html::encode($error);
-			}
-		}
-
-		$header = isset($options['header']) ? $options['header'] : '<p>' . Yii::t('yii|Please fix the following errors:') . '</p>';
-		$footer = isset($options['footer']) ? $options['footer'] : '';
-		unset($options['header'], $options['footer']);
-
-		if (!isset($options['class'])) {
-			$options['class'] = $this->errorSummaryCssClass;
-		} else {
-			$options['class'] .= ' ' . $this->errorSummaryCssClass;
-		}
-
-		if (!empty($lines)) {
-			$content = "<ul><li>" . implode("</li>\n<li>", $lines) . "</li><ul>";
-			return Html::tag('div', $header . $content . $footer, $options);
-		} else {
-			$content = "<ul></ul>";
-			$options['style'] = isset($options['style']) ? rtrim($options['style'], ';') . '; display:none' : 'display:none';
-			return Html::tag('div', $header . $content . $footer, $options);
-		}
-	}
-
-	/**
-	 * Generates a form field.
-	 * A form field is associated with a model and an attribute. It contains a label, an input and an error message
-	 * and use them to interact with end users to collect their inputs for the attribute.
-	 * @param Model $model the data model
-	 * @param string $attribute the attribute name or expression. See [[Html::getAttributeName()]] for the format
-	 * about attribute expression.
-	 * @param array $options the additional configurations for the field object
-	 * @return ActiveField the created ActiveField object
-	 * @see fieldConfig
-	 */
-	public function field($model, $attribute, $options = array())
-	{
-		return Yii::createObject(array_merge($this->fieldConfig, $options, array(
-			'model' => $model,
-			'attribute' => $attribute,
-			'form' => $this,
-		)));
-	}
-}
diff --git a/framework/widgets/Block.php b/framework/widgets/Block.php
deleted file mode 100644
index fdd210f..0000000
--- a/framework/widgets/Block.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\widgets;
-
-use yii\base\Widget;
-
-/**
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Block extends Widget
-{
-	/**
-	 * @var string the ID of this block.
-	 */
-	public $id;
-	/**
-	 * @var boolean whether to render the block content in place. Defaults to false,
-	 * meaning the captured block content will not be displayed.
-	 */
-	public $renderInPlace = false;
-
-	/**
-	 * Starts recording a block.
-	 */
-	public function init()
-	{
-		ob_start();
-		ob_implicit_flush(false);
-	}
-
-	/**
-	 * Ends recording a block.
-	 * This method stops output buffering and saves the rendering result as a named block in the controller.
-	 */
-	public function run()
-	{
-		$block = ob_get_clean();
-		if ($this->renderInPlace) {
-			echo $block;
-		}
-		$this->view->blocks[$this->id] = $block;
-	}
-}
diff --git a/framework/widgets/Breadcrumbs.php b/framework/widgets/Breadcrumbs.php
deleted file mode 100644
index 22d09b3..0000000
--- a/framework/widgets/Breadcrumbs.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\widgets;
-
-use Yii;
-use yii\base\Widget;
-use yii\base\InvalidConfigException;
-use yii\helpers\Html;
-
-/**
- * Breadcrumbs displays a list of links indicating the position of the current page in the whole site hierarchy.
- *
- * For example, breadcrumbs like "Home / Sample Post / Edit" means the user is viewing an edit page
- * for the "Sample Post". He can click on "Sample Post" to view that page, or he can click on "Home"
- * to return to the homepage.
- *
- * To use Breadcrumbs, you need to configure its [[links]] property, which specifiesthe links to be displayed. For example,
- *
- * ~~~
- * $this->widget('yii\widgets\Breadcrumbs', array(
- *     'links' => array(
- *         array('label' => 'Sample Post', 'url' => array('post/edit', 'id' => 1)),
- *         'Edit',
- *     ),
- * ));
- * ~~~
- *
- * Because breadcrumbs usually appears in nearly every page of a website, you may consider place it in a layout view.
- * You can then use a view parameter (e.g. `$this->params['breadcrumbs']`) to configure the links in different
- * views. In the layout view, you assign this view parameter to the [[links]] property like the following:
- *
- * ~~~
- * $this->widget('yii\widgets\Breadcrumbs', array(
- *     'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : array(),
- * ));
- * ~~~
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Breadcrumbs extends Widget
-{
-	/**
-	 * @var string the name of the breadcrumb container tag.
-	 */
-	public $tag = 'ul';
-	/**
-	 * @var array the HTML attributes for the breadcrumb container tag.
-	 */
-	public $options = array('class' => 'breadcrumb');
-	/**
-	 * @var boolean whether to HTML-encode the link labels.
-	 */
-	public $encodeLabels = true;
-	/**
-	 * @var string the first hyperlink in the breadcrumbs (called home link).
-	 * If this property is not set, it will default to a link pointing to [[\yii\web\Application::homeUrl]]
-	 * with the label 'Home'. If this property is false, the home link will not be rendered.
-	 */
-	public $homeLink;
-	/**
-	 * @var array list of links to appear in the breadcrumbs. If this property is empty,
-	 * the widget will not render anything. Each array element represents a single link in the breadcrumbs
-	 * with the following structure:
-	 *
-	 * ~~~
-	 * array(
-	 *     'label' => 'label of the link',  // required
-	 *     'url' => 'url of the link',      // optional, will be processed by Html::url()
-	 * )
-	 * ~~~
-	 *
-	 * If a link is active, you only need to specify its "label", and instead of writing `array('label' => $label)`,
-	 * you should simply use `$label`.
-	 */
-	public $links = array();
-	/**
-	 * @var string the template used to render each inactive item in the breadcrumbs. The token `{link}`
-	 * will be replaced with the actual HTML link for each inactive item.
-	 */
-	public $itemTemplate = "<li>{link} <span class=\"divider\">/</span></li>\n";
-	/**
-	 * @var string the template used to render each active item in the breadcrumbs. The token `{link}`
-	 * will be replaced with the actual HTML link for each active item.
-	 */
-	public $activeItemTemplate = "<li class=\"active\">{link}</li>\n";
-
-	/**
-	 * Renders the widget.
-	 */
-	public function run()
-	{
-		if (empty($this->links)) {
-			return;
-		}
-		$links = array();
-		if ($this->homeLink === null) {
-			$links[] = $this->renderItem(array(
-				'label' => Yii::t('yii|Home'),
-				'url' => Yii::$app->homeUrl,
-			), $this->itemTemplate);
-		} elseif ($this->homeLink !== false) {
-			$links[] = $this->renderItem($this->homeLink, $this->itemTemplate);
-		}
-		foreach ($this->links as $link) {
-			if (!is_array($link)) {
-				$link = array('label' => $link);
-			}
-			$links[] = $this->renderItem($link, isset($link['url']) ? $this->itemTemplate : $this->activeItemTemplate);
-		}
-		echo Html::tag($this->tag, implode('', $links), $this->options);
-	}
-
-	/**
-	 * Renders a single breadcrumb item.
-	 * @param array $link the link to be rendered. It must contain the "label" element. The "url" element is optional.
-	 * @param string $template the template to be used to rendered the link. The token "{link}" will be replaced by the link.
-	 * @return string the rendering result
-	 * @throws InvalidConfigException if `$link` does not have "label" element.
-	 */
-	protected function renderItem($link, $template)
-	{
-		if (isset($link['label'])) {
-			$label = $this->encodeLabels ? Html::encode($link['label']) : $link['label'];
-		} else {
-			throw new InvalidConfigException('The "label" element is required for each link.');
-		}
-		if (isset($link['url'])) {
-			return strtr($template, array('{link}' => Html::a($label, $link['url'])));
-		} else {
-			return strtr($template, array('{link}' => $label));
-		}
-	}
-}
diff --git a/framework/widgets/Captcha.php b/framework/widgets/Captcha.php
deleted file mode 100644
index 918e30c..0000000
--- a/framework/widgets/Captcha.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\widgets;
-
-use Yii;
-use yii\base\InvalidConfigException;
-use yii\base\Widget;
-use yii\helpers\Html;
-use yii\helpers\Json;
-use yii\web\CaptchaAction;
-
-/**
- * Captcha renders a CAPTCHA image element.
- *
- * Captcha is used together with [[CaptchaAction]] provide [CAPTCHA](http://en.wikipedia.org/wiki/Captcha)
- * - a way of preventing Website spamming.
- *
- * The image element rendered by Captcha will display a CAPTCHA image generated by
- * an action whose route is specified by [[captchaAction]]. This action must be an instance of [[CaptchaAction]].
- *
- * When the user clicks on the CAPTCHA image, it will cause the CAPTCHA image
- * to be refreshed with a new CAPTCHA.
- *
- * You may use [[\yii\validators\CaptchaValidator]] to validate the user input matches
- * the current CAPTCHA verification code.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Captcha extends Widget
-{
-	/**
-	 * @var string the route of the action that generates the CAPTCHA images.
-	 * The action represented by this route must be an action of [[CaptchaAction]].
-	 */
-	public $captchaAction = 'site/captcha';
-	/**
-	 * @var array HTML attributes to be applied to the rendered image element.
-	 */
-	public $options = array();
-
-
-	/**
-	 * Renders the widget.
-	 */
-	public function run()
-	{
-		$this->checkRequirements();
-
-		if (!isset($this->options['id'])) {
-			$this->options['id'] = $this->getId();
-		}
-		$id = $this->options['id'];
-		$options = Json::encode($this->getClientOptions());
-		$this->view->registerAssetBundle('yii/captcha');
-		$this->view->registerJs("jQuery('#$id').yiiCaptcha($options);");
-		$url = Yii::$app->getUrlManager()->createUrl($this->captchaAction, array('v' => uniqid()));
-		echo Html::img($url, $this->options);
-	}
-
-	/**
-	 * Returns the options for the captcha JS widget.
-	 * @return array the options
-	 */
-	protected function getClientOptions()
-	{
-		$options = array(
-			'refreshUrl' => Html::url(array($this->captchaAction, CaptchaAction::REFRESH_GET_VAR => 1)),
-			'hashKey' => "yiiCaptcha/{$this->captchaAction}",
-		);
-		return $options;
-	}
-
-	/**
-	 * Checks if there is graphic extension available to generate CAPTCHA images.
-	 * This method will check the existence of ImageMagick and GD extensions.
-	 * @return string the name of the graphic extension, either "imagick" or "gd".
-	 * @throws InvalidConfigException if neither ImageMagick nor GD is installed.
-	 */
-	public static function checkRequirements()
-	{
-		if (extension_loaded('imagick')) {
-			$imagick = new \Imagick();
-			$imagickFormats = $imagick->queryFormats('PNG');
-			if (in_array('PNG', $imagickFormats)) {
-				return 'imagick';
-			}
-		}
-		if (extension_loaded('gd')) {
-			$gdInfo = gd_info();
-			if (!empty($gdInfo['FreeType Support'])) {
-				return 'gd';
-			}
-		}
-		throw new InvalidConfigException('GD with FreeType or ImageMagick PHP extensions are required.');
-	}
-}
diff --git a/framework/widgets/ContentDecorator.php b/framework/widgets/ContentDecorator.php
deleted file mode 100644
index 3f63621..0000000
--- a/framework/widgets/ContentDecorator.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\widgets;
-
-use yii\base\InvalidConfigException;
-use yii\base\Widget;
-
-/**
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class ContentDecorator extends Widget
-{
-	/**
-	 * @var string the view file that will be used to decorate the content enclosed by this widget.
-	 * This can be specified as either the view file path or path alias.
-	 */
-	public $viewFile;
-	/**
-	 * @var array the parameters (name=>value) to be extracted and made available in the decorative view.
-	 */
-	public $params = array();
-
-	/**
-	 * Starts recording a clip.
-	 */
-	public function init()
-	{
-		if ($this->viewFile === null) {
-			throw new InvalidConfigException('ContentDecorator::viewFile must be set.');
-		}
-		ob_start();
-		ob_implicit_flush(false);
-	}
-
-	/**
-	 * Ends recording a clip.
-	 * This method stops output buffering and saves the rendering result as a named clip in the controller.
-	 */
-	public function run()
-	{
-		$params = $this->params;
-		$params['content'] = ob_get_clean();
-		// render under the existing context
-		echo $this->view->renderFile($this->viewFile, $params);
-	}
-}
diff --git a/framework/widgets/FragmentCache.php b/framework/widgets/FragmentCache.php
deleted file mode 100644
index aa24acd..0000000
--- a/framework/widgets/FragmentCache.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\widgets;
-
-use Yii;
-use yii\base\Widget;
-use yii\caching\Cache;
-use yii\caching\Dependency;
-
-/**
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class FragmentCache extends Widget
-{
-	/**
-	 * @var Cache|string the cache object or the application component ID of the cache object.
-	 * After the FragmentCache object is created, if you want to change this property,
-	 * you should only assign it with a cache object.
-	 */
-	public $cache = 'cache';
-	/**
-	 * @var integer number of seconds that the data can remain valid in cache.
-	 * Use 0 to indicate that the cached data will never expire.
-	 */
-	public $duration = 60;
-	/**
-	 * @var array|Dependency the dependency that the cached content depends on.
-	 * This can be either a [[Dependency]] object or a configuration array for creating the dependency object.
-	 * For example,
-	 *
-	 * ~~~
-	 * array(
-	 *     'class' => 'yii\caching\DbDependency',
-	 *     'sql' => 'SELECT MAX(lastModified) FROM Post',
-	 * )
-	 * ~~~
-	 *
-	 * would make the output cache depends on the last modified time of all posts.
-	 * If any post has its modification time changed, the cached content would be invalidated.
-	 */
-	public $dependency;
-	/**
-	 * @var array list of factors that would cause the variation of the content being cached.
-	 * Each factor is a string representing a variation (e.g. the language, a GET parameter).
-	 * The following variation setting will cause the content to be cached in different versions
-	 * according to the current application language:
-	 *
-	 * ~~~
-	 * array(
-	 *     Yii::$app->language,
-	 * )
-	 */
-	public $variations;
-	/**
-	 * @var boolean whether to enable the fragment cache. You may use this property to turn on and off
-	 * the fragment cache according to specific setting (e.g. enable fragment cache only for GET requests).
-	 */
-	public $enabled = true;
-	/**
-	 * @var array a list of placeholders for embedding dynamic contents. This property
-	 * is used internally to implement the content caching feature. Do not modify it.
-	 */
-	public $dynamicPlaceholders;
-
-	/**
-	 * Initializes the FragmentCache object.
-	 */
-	public function init()
-	{
-		parent::init();
-
-		if (!$this->enabled) {
-			$this->cache = null;
-		} elseif (is_string($this->cache)) {
-			$this->cache = Yii::$app->getComponent($this->cache);
-		}
-
-		if ($this->getCachedContent() === false) {
-			$this->view->cacheStack[] = $this;
-			ob_start();
-			ob_implicit_flush(false);
-		}
-	}
-
-	/**
-	 * Marks the end of content to be cached.
-	 * Content displayed before this method call and after {@link init()}
-	 * will be captured and saved in cache.
-	 * This method does nothing if valid content is already found in cache.
-	 */
-	public function run()
-	{
-		if (($content = $this->getCachedContent()) !== false) {
-			echo $content;
-		} elseif ($this->cache instanceof Cache) {
-			$content = ob_get_clean();
-			array_pop($this->view->cacheStack);
-			if (is_array($this->dependency)) {
-				$this->dependency = Yii::createObject($this->dependency);
-			}
-			$data = array($content, $this->dynamicPlaceholders);
-			$this->cache->set($this->calculateKey(), $data, $this->duration, $this->dependency);
-
-			if (empty($this->view->cacheStack) && !empty($this->dynamicPlaceholders)) {
-				$content = $this->updateDynamicContent($content, $this->dynamicPlaceholders);
-			}
-			echo $content;
-		}
-	}
-
-	/**
-	 * @var string|boolean the cached content. False if the content is not cached.
-	 */
-	private $_content;
-
-	/**
-	 * Returns the cached content if available.
-	 * @return string|boolean the cached content. False is returned if valid content is not found in the cache.
-	 */
-	public function getCachedContent()
-	{
-		if ($this->_content === null) {
-			$this->_content = false;
-			if ($this->cache instanceof Cache) {
-				$key = $this->calculateKey();
-				$data = $this->cache->get($key);
-				if (is_array($data) && count($data) === 2) {
-					list ($content, $placeholders) = $data;
-					if (is_array($placeholders) && count($placeholders) > 0) {
-						if (empty($this->view->cacheStack)) {
-							// outermost cache: replace placeholder with dynamic content
-							$content = $this->updateDynamicContent($content, $placeholders);
-						}
-						foreach ($placeholders as $name => $statements) {
-							$this->view->addDynamicPlaceholder($name, $statements);
-						}
-					}
-					$this->_content = $content;
-				}
-			}
-		}
-		return $this->_content;
-	}
-
-	protected function updateDynamicContent($content, $placeholders)
-	{
-		foreach ($placeholders as $name => $statements) {
-			$placeholders[$name] = $this->view->evaluateDynamicContent($statements);
-		}
-		return strtr($content, $placeholders);
-	}
-
-	/**
-	 * Generates a unique key used for storing the content in cache.
-	 * The key generated depends on both [[id]] and [[variations]].
-	 * @return string a valid cache key
-	 */
-	protected function calculateKey()
-	{
-		$factors = array(__CLASS__, $this->getId());
-		if (is_array($this->variations)) {
-			foreach ($this->variations as $factor) {
-				$factors[] = $factor;
-			}
-		}
-		return $this->cache->buildKey($factors);
-	}
-}
diff --git a/framework/widgets/Menu.php b/framework/widgets/Menu.php
deleted file mode 100644
index b8f69e1..0000000
--- a/framework/widgets/Menu.php
+++ /dev/null
@@ -1,287 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\widgets;
-
-use Yii;
-use yii\base\Widget;
-use yii\helpers\Html;
-
-/**
- * Menu displays a multi-level menu using nested HTML lists.
- *
- * The main property of Menu is [[items]], which specifies the possible items in the menu.
- * A menu item can contain sub-items which specify the sub-menu under that menu item.
- * 
- * Menu checks the current route and request parameters to toggle certain menu items
- * with active state.
- * 
- * Note that Menu only renders the HTML tags about the menu. It does do any styling.
- * You are responsible to provide CSS styles to make it look like a real menu.
- *
- * The following example shows how to use Menu:
- * 
- * ~~~
- * $this->widget('yii\widgets\Menu', array(
- *     'items' => array(
- *         // Important: you need to specify url as 'controller/action',
- *         // not just as 'controller' even if default acion is used.
- *         array('label' => 'Home', 'url' => array('site/index')),
- *         // 'Products' menu item will be selected as long as the route is 'product/index'
- *         array('label' => 'Products', 'url' => array('product/index'), 'items' => array(
- *             array('label' => 'New Arrivals', 'url' => array('product/index', 'tag' => 'new')),
- *             array('label' => 'Most Popular', 'url' => array('product/index', 'tag' => 'popular')),
- *         )),
- *         array('label' => 'Login', 'url' => array('site/login'), 'visible' => Yii::app()->user->isGuest),
- *     ),
- * ));
- * ~~~
- * 
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class Menu extends Widget
-{
-	/**
-	 * @var array list of menu items. Each menu item should be an array of the following structure:
-	 *
-	 * - label: string, optional, specifies the menu item label. When [[encodeLabels]] is true, the label
-	 *   will be HTML-encoded. If the label is not specified, an empty string will be used.
-	 * - url: string or array, optional, specifies the URL of the menu item. It will be processed by [[Html::url]].
-	 *   When this is set, the actual menu item content will be generated using [[linkTemplate]];
-	 *   otherwise, [[labelTemplate]] will be used.
-	 * - visible: boolean, optional, whether this menu item is visible. Defaults to true.
-	 * - items: array, optional, specifies the sub-menu items. Its format is the same as the parent items.
-	 * - active: boolean, optional, whether this menu item is in active state (currently selected).
-	 *   If a menu item is active, its CSS class will be appended with [[activeCssClass]].
-	 *   If this option is not set, the menu item will be set active automatically when the current request
-	 *   is triggered by [[url]]. For more details, please refer to [[isItemActive()]].
-	 * - template: string, optional, the template used to render the content of this menu item.
-	 *   The token `{url}` will be replaced by the URL associated with this menu item,
-	 *   and the token `{label}` will be replaced by the label of the menu item.
-	 *   If this option is not set, [[linkTemplate]] or [[labelTemplate]] will be used instead. 
-	 */
-	public $items = array();
-	/**
-	 * @var string the template used to render the body of a menu which is a link.
-	 * In this template, the token `{url}` will be replaced with the corresponding link URL;
-	 * while `{label}` will be replaced with the link text.
-	 * This property will be overridden by the `template` option set in individual menu items via [[items]].
-	 */
-	public $linkTemplate = '<a href="{url}">{label}</a>';
-	/**
-	 * @var string the template used to render the body of a menu which is NOT a link.
-	 * In this template, the token `{label}` will be replaced with the label of the menu item.
-	 * This property will be overridden by the `template` option set in individual menu items via [[items]].
-	 */
-	public $labelTemplate = '{label}';
-	/**
-	 * @var string the template used to render a list of sub-menus.
-	 * In this template, the token `{items}` will be replaced with the renderer sub-menu items.
-	 */
-	public $submenuTemplate = "\n<ul>\n{items}\n</ul>\n";
-	/**
-	 * @var boolean whether the labels for menu items should be HTML-encoded.
-	 */
-	public $encodeLabels = true;
-	/**
-	 * @var string the CSS class to be appended to the active menu item.
-	 */
-	public $activeCssClass = 'active';
-	/**
-	 * @var boolean whether to automatically activate items according to whether their route setting
-	 * matches the currently requested route.
-	 * @see isItemActive
-	 */
-	public $activateItems = true;
-	/**
-	 * @var boolean whether to activate parent menu items when one of the corresponding child menu items is active.
-	 * The activated parent menu items will also have its CSS classes appended with [[activeCssClass]].
-	 */
-	public $activateParents = false;
-	/**
-	 * @var boolean whether to hide empty menu items. An empty menu item is one whose `url` option is not
-	 * set and which has no visible child menu items.
-	 */
-	public $hideEmptyItems = true;
-	/**
-	 * @var array the HTML attributes for the menu's container tag.
-	 */
-	public $options = array();
-	/**
-	 * @var string the CSS class that will be assigned to the first item in the main menu or each submenu.
-	 * Defaults to null, meaning no such CSS class will be assigned.
-	 */
-	public $firstItemCssClass;
-	/**
-	 * @var string the CSS class that will be assigned to the last item in the main menu or each submenu.
-	 * Defaults to null, meaning no such CSS class will be assigned.
-	 */
-	public $lastItemCssClass;
-	/**
-	 * @var string the route used to determine if a menu item is active or not.
-	 * If not set, it will use the route of the current request. 
-	 * @see params
-	 * @see isItemActive
-	 */
-	public $route;
-	/**
-	 * @var array the parameters used to determine if a menu item is active or not.
-	 * If not set, it will use `$_GET`.
-	 * @see route
-	 * @see isItemActive
-	 */
-	public $params;
-
-
-	/**
-	 * Renders the menu.
-	 */
-	public function run()
-	{
-		if ($this->route === null && Yii::$app->controller !== null) {
-			$this->route = Yii::$app->controller->getRoute();
-		}
-		if ($this->params === null) {
-			$this->params = $_GET;
-		}
-		$items = $this->normalizeItems($this->items, $hasActiveChild);
-		echo Html::tag('ul', $this->renderItems($items), $this->options);
-	}
-
-	/**
-	 * Recursively renders the menu items (without the container tag).
-	 * @param array $items the menu items to be rendered recursively
-	 * @return string the rendering result
-	 */
-	protected function renderItems($items)
-	{
-		$n = count($items);
-		$lines = array();
-		foreach ($items as $i => $item) {
-			$options = isset($item['itemOptions']) ? $item['itemOptions'] : array();
-			$class = array();
-			if ($item['active']) {
-				$class[] = $this->activeCssClass;
-			}
-			if ($i === 0 && $this->firstItemCssClass !== null) {
-				$class[] = $this->firstItemCssClass;
-			}
-			if ($i === $n - 1 && $this->lastItemCssClass !== null) {
-				$class[] = $this->lastItemCssClass;
-			}
-			if (!empty($class)) {
-				if (empty($options['class'])) {
-					$options['class'] = implode(' ', $class);
-				} else {
-					$options['class'] .= ' ' . implode(' ', $class);
-				}
-			}
-
-			$menu = $this->renderItem($item);
-			if (!empty($item['items'])) {
-				$menu .= strtr($this->submenuTemplate, array(
-					'{items}' => $this->renderItems($item['items']),
-				));
-			}
-			$lines[] = Html::tag('li', $menu, $options);
-		}
-		return implode("\n", $lines);
-	}
-
-	/**
-	 * Renders the content of a menu item.
-	 * Note that the container and the sub-menus are not rendered here.
-	 * @param array $item the menu item to be rendered. Please refer to [[items]] to see what data might be in the item.
-	 * @return string the rendering result
-	 */
-	protected function renderItem($item)
-	{
-		if (isset($item['url'])) {
-			$template = isset($item['template']) ? $item['template'] : $this->linkTemplate;
-			return strtr($template, array(
-				'{url}' => Html::url($item['url']),
-				'{label}' => $item['label'],
-			));
-		} else {
-			$template = isset($item['template']) ? $item['template'] : $this->labelTemplate;
-			return strtr($template, array(
-				'{label}' => $item['label'],
-			));
-		}
-	}
-
-	/**
-	 * Normalizes the [[items]] property to remove invisible items and activate certain items.
-	 * @param array $items the items to be normalized.
-	 * @param boolean $active whether there is an active child menu item.
-	 * @return array the normalized menu items
-	 */
-	protected function normalizeItems($items, &$active)
-	{
-		foreach ($items as $i => $item) {
-			if (isset($item['visible']) && !$item['visible']) {
-				unset($items[$i]);
-				continue;
-			}
-			if (!isset($item['label'])) {
-				$item['label'] = '';
-			}
-			if ($this->encodeLabels) {
-				$items[$i]['label'] = Html::encode($item['label']);
-			}
-			$hasActiveChild = false;
-			if (isset($item['items'])) {
-				$items[$i]['items'] = $this->normalizeItems($item['items'], $route, $hasActiveChild);
-				if (empty($items[$i]['items']) && $this->hideEmptyItems) {
-					unset($items[$i]['items']);
-					if (!isset($item['url'])) {
-						unset($items[$i]);
-						continue;
-					}
-				}
-			}
-			if (!isset($item['active'])) {
-				if ($this->activateParents && $hasActiveChild || $this->activateItems && $this->isItemActive($item)) {
-					$active = $items[$i]['active'] = true;
-				} else {
-					$items[$i]['active'] = false;
-				}
-			} elseif ($item['active']) {
-				$active = true;
-			}
-		}
-		return array_values($items);
-	}
-
-	/**
-	 * Checks whether a menu item is active.
-	 * This is done by checking if [[route]] and [[params]] match that specified in the `url` option of the menu item.
-	 * When the `url` option of a menu item is specified in terms of an array, its first element is treated
-	 * as the route for the item and the rest of the elements are the associated parameters.
-	 * Only when its route and parameters match [[route]] and [[params]], respectively, will a menu item
-	 * be considered active.
-	 * @param array $item the menu item to be checked
-	 * @return boolean whether the menu item is active
-	 */
-	protected function isItemActive($item)
-	{
-		if (isset($item['url']) && is_array($item['url']) && trim($item['url'][0], '/') === $this->route) {
-			unset($item['url']['#']);
-			if (count($item['url']) > 1) {
-				foreach (array_splice($item['url'], 1) as $name => $value) {
-					if (!isset($this->params[$name]) || $this->params[$name] != $value) {
-						return false;
-					}
-				}
-			}
-			return true;
-		}
-		return false;
-	}
-
-}
diff --git a/framework/yiic b/framework/yiic
deleted file mode 100755
index d35d262..0000000
--- a/framework/yiic
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env php
-<?php
-/**
- * Yii command line script for Unix/Linux.
- *
- * This is the bootstrap script for running yiic on Unix/Linux.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-require_once(__DIR__ . '/yiic.php');
diff --git a/framework/yiic.bat b/framework/yiic.bat
deleted file mode 100644
index c63fc81..0000000
--- a/framework/yiic.bat
+++ /dev/null
@@ -1,22 +0,0 @@
-@echo off
-
-rem -------------------------------------------------------------
-rem  Yii command line script for Windows.
-rem
-rem  This is the bootstrap script for running yiic on Windows.
-rem
-rem  @author Qiang Xue <qiang.xue@gmail.com>
-rem  @link http://www.yiiframework.com/
-rem  @copyright Copyright &copy; 2012 Yii Software LLC
-rem  @license http://www.yiiframework.com/license/
-rem -------------------------------------------------------------
-
-@setlocal
-
-set YII_PATH=%~dp0
-
-if "%PHP_COMMAND%" == "" set PHP_COMMAND=php.exe
-
-"%PHP_COMMAND%" "%YII_PATH%yiic" %*
-
-@endlocal
\ No newline at end of file
diff --git a/framework/yiic.php b/framework/yiic.php
deleted file mode 100644
index 7cd0c40..0000000
--- a/framework/yiic.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Yii console bootstrap file.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-defined('YII_DEBUG') or define('YII_DEBUG', true);
-
-// fcgi doesn't have STDIN defined by default
-defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
-
-require(__DIR__ . '/Yii.php');
-
-$application = new yii\console\Application(array(
-	'id' => 'yiic',
-	'basePath' => __DIR__ . '/console',
-	'controllerPath' => '@yii/console/controllers',
-));
-$application->run();
diff --git a/tests/unit/bootstrap.php b/tests/unit/bootstrap.php
index 58a931b..285b55b 100644
--- a/tests/unit/bootstrap.php
+++ b/tests/unit/bootstrap.php
@@ -5,7 +5,7 @@ define('YII_DEBUG', true);
 $_SERVER['SCRIPT_NAME'] = '/' . __DIR__;
 $_SERVER['SCRIPT_FILENAME'] = __FILE__;
 
-require_once(__DIR__ . '/../../framework/Yii.php');
+require_once(__DIR__ . '/../../yii/Yii.php');
 
 Yii::setAlias('@yiiunit', __DIR__);
 
diff --git a/tests/web/app/index.php b/tests/web/app/index.php
index 72d3189..7096665 100644
--- a/tests/web/app/index.php
+++ b/tests/web/app/index.php
@@ -1,6 +1,6 @@
 <?php
 
-require(__DIR__ . '/../../../framework/Yii.php');
+require(__DIR__ . '/../../../yii/Yii.php');
 
 $application = new yii\web\Application('test', __DIR__ . '/protected');
 $application->run();
diff --git a/yii/.htaccess b/yii/.htaccess
new file mode 100644
index 0000000..e019832
--- /dev/null
+++ b/yii/.htaccess
@@ -0,0 +1 @@
+deny from all
diff --git a/yii/Yii.php b/yii/Yii.php
new file mode 100644
index 0000000..109e2fd
--- /dev/null
+++ b/yii/Yii.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Yii bootstrap file.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+require(__DIR__ . '/YiiBase.php');
+
+/**
+ * Yii is a helper class serving common framework functionalities.
+ *
+ * It extends from [[YiiBase]] which provides the actual implementation.
+ * By writing your own Yii class, you can customize some functionalities of [[YiiBase]].
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Yii extends \yii\YiiBase
+{
+}
+
+spl_autoload_register(array('Yii', 'autoload'));
diff --git a/yii/YiiBase.php b/yii/YiiBase.php
new file mode 100644
index 0000000..1a3f50c
--- /dev/null
+++ b/yii/YiiBase.php
@@ -0,0 +1,615 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+namespace yii;
+
+use yii\base\Exception;
+use yii\base\InvalidConfigException;
+use yii\base\InvalidParamException;
+use yii\base\UnknownClassException;
+use yii\logging\Logger;
+
+/**
+ * Gets the application start timestamp.
+ */
+defined('YII_BEGIN_TIME') or define('YII_BEGIN_TIME', microtime(true));
+/**
+ * This constant defines whether the application should be in debug mode or not. Defaults to false.
+ */
+defined('YII_DEBUG') or define('YII_DEBUG', false);
+/**
+ * This constant defines how much call stack information (file name and line number) should be logged by Yii::trace().
+ * Defaults to 0, meaning no backtrace information. If it is greater than 0,
+ * at most that number of call stacks will be logged. Note, only user application call stacks are considered.
+ */
+defined('YII_TRACE_LEVEL') or define('YII_TRACE_LEVEL', 0);
+/**
+ * This constant defines the framework installation directory.
+ */
+defined('YII_PATH') or define('YII_PATH', __DIR__);
+/**
+ * This constant defines whether error handling should be enabled. Defaults to true.
+ */
+defined('YII_ENABLE_ERROR_HANDLER') or define('YII_ENABLE_ERROR_HANDLER', true);
+
+
+/**
+ * YiiBase is the core helper class for the Yii framework.
+ *
+ * Do not use YiiBase directly. Instead, use its child class [[Yii]] where
+ * you can customize methods of YiiBase.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class YiiBase
+{
+	/**
+	 * @var array class map used by the Yii autoloading mechanism.
+	 * The array keys are the class names (without leading backslashes), and the array values
+	 * are the corresponding class file paths (or path aliases). This property mainly affects
+	 * how [[autoload()]] works.
+	 * @see import
+	 * @see autoload
+	 */
+	public static $classMap = array();
+	/**
+	 * @var boolean whether to search PHP include_path when autoloading unknown classes.
+	 * You may want to turn this off if you are also using autoloaders from other libraries.
+	 */
+	public static $enableIncludePath = true;
+	/**
+	 * @var \yii\console\Application|\yii\web\Application the application instance
+	 */
+	public static $app;
+	/**
+	 * @var array registered path aliases
+	 * @see getAlias
+	 * @see setAlias
+	 */
+	public static $aliases = array(
+		'@yii' => __DIR__,
+	);
+	/**
+	 * @var array initial property values that will be applied to objects newly created via [[createObject]].
+	 * The array keys are class names without leading backslashes "\", and the array values are the corresponding
+	 * name-value pairs for initializing the created class instances. For example,
+	 *
+	 * ~~~
+	 * array(
+	 *     'Bar' => array(
+	 *         'prop1' => 'value1',
+	 *         'prop2' => 'value2',
+	 *     ),
+	 *     'mycompany\foo\Car' => array(
+	 *         'prop1' => 'value1',
+	 *         'prop2' => 'value2',
+	 *     ),
+	 * )
+	 * ~~~
+	 *
+	 * @see createObject
+	 */
+	public static $objectConfig = array();
+
+	private static $_imported = array(); // alias => class name or directory
+	private static $_logger;
+
+	/**
+	 * @return string the version of Yii framework
+	 */
+	public static function getVersion()
+	{
+		return '2.0-dev';
+	}
+
+	/**
+	 * Imports a class by its alias.
+	 *
+	 * This method is provided to support autoloading of non-namespaced classes.
+	 * Such a class can be specified in terms of an alias. For example, the alias `@old/code/Sample`
+	 * may represent the `Sample` class under the directory `@old/code` (a path alias).
+	 *
+	 * By importing a class, the class is put in an internal storage such that when
+	 * the class is used for the first time, the class autoloader will be able to
+	 * find the corresponding class file and include it. For this reason, this method
+	 * is much lighter than `include()`.
+	 *
+	 * You may import the same class multiple times. Only the first importing will count.
+	 *
+	 * @param string $alias the class to be imported. This may be either a class alias or a fully-qualified class name.
+	 * If the latter, it will be returned back without change.
+	 * @return string the actual class name that `$alias` refers to
+	 * @throws Exception if the alias is invalid
+	 */
+	public static function import($alias)
+	{
+		if (strncmp($alias, '@', 1)) {
+			return $alias;
+		} else {
+			$alias = static::getAlias($alias);
+			if (!isset(self::$_imported[$alias])) {
+				$className = basename($alias);
+				self::$_imported[$alias] = $className;
+				self::$classMap[$className] = $alias . '.php';
+			}
+			return self::$_imported[$alias];
+		}
+	}
+
+	/**
+	 * Imports a set of namespaces.
+	 *
+	 * By importing a namespace, the method will create an alias for the directory corresponding
+	 * to the namespace. For example, if "foo\bar" is a namespace associated with the directory
+	 * "path/to/foo/bar", then an alias "@foo/bar" will be created for this directory.
+	 *
+	 * This method is typically invoked in the bootstrap file to import the namespaces of
+	 * the installed extensions. By default, Composer, when installing new extensions, will
+	 * generate such a mapping file which can be loaded and passed to this method.
+	 *
+	 * @param array $namespaces the namespaces to be imported. The keys are the namespaces,
+	 * and the values are the corresponding directories.
+	 */
+	public static function importNamespaces($namespaces)
+	{
+		foreach ($namespaces as $name => $path) {
+			if ($name !== '') {
+				$name = trim(strtr($name, array('\\' => '/', '_' => '/')), '/');
+				static::setAlias('@' . $name, rtrim($path, '/\\') . '/' . $name);
+			}
+		}
+	}
+
+	/**
+	 * Translates a path alias into an actual path.
+	 *
+	 * The translation is done according to the following procedure:
+	 *
+	 * 1. If the given alias does not start with '@', it is returned back without change;
+	 * 2. Otherwise, look for the longest registered alias that matches the beginning part
+	 *    of the given alias. If it exists, replace the matching part of the given alias with
+	 *    the corresponding registered path.
+	 * 3. Throw an exception or return false, depending on the `$throwException` parameter.
+	 *
+	 * For example, by default '@yii' is registered as the alias to the Yii framework directory,
+	 * say '/path/to/yii'. The alias '@yii/web' would then be translated into '/path/to/yii/web'.
+	 *
+	 * If you have registered two aliases '@foo' and '@foo/bar'. Then translating '@foo/bar/config'
+	 * would replace the part '@foo/bar' (instead of '@foo') with the corresponding registered path.
+	 * This is because the longest alias takes precedence.
+	 *
+	 * However, if the alias to be translated is '@foo/barbar/config', then '@foo' will be replaced
+	 * instead of '@foo/bar', because '/' serves as the boundary character.
+	 *
+	 * Note, this method does not check if the returned path exists or not.
+	 *
+	 * @param string $alias the alias to be translated.
+	 * @param boolean $throwException whether to throw an exception if the given alias is invalid.
+	 * If this is false and an invalid alias is given, false will be returned by this method.
+	 * @return string|boolean the path corresponding to the alias, false if the root alias is not previously registered.
+	 * @throws InvalidParamException if the alias is invalid while $throwException is true.
+	 * @see setAlias
+	 */
+	public static function getAlias($alias, $throwException = true)
+	{
+		if (strncmp($alias, '@', 1)) {
+			// not an alias
+			return $alias;
+		}
+
+		$pos = strpos($alias, '/');
+		$root = $pos === false ? $alias : substr($alias, 0, $pos);
+
+		if (isset(self::$aliases[$root])) {
+			if (is_string(self::$aliases[$root])) {
+				return $pos === false ? self::$aliases[$root] : self::$aliases[$root] . substr($alias, $pos);
+			} else {
+				foreach (self::$aliases[$root] as $name => $path) {
+					if (strpos($alias . '/', $name . '/') === 0) {
+						return $path . substr($alias, strlen($name));
+					}
+				}
+			}
+		}
+
+		if ($throwException) {
+			throw new InvalidParamException("Invalid path alias: $alias");
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Returns the root alias part of a given alias.
+	 * A root alias is an alias that has been registered via [[setAlias()]] previously.
+	 * If a given alias matches multiple root aliases, the longest one will be returned.
+	 * @param string $alias the alias
+	 * @return string|boolean the root alias, or false if no root alias is found
+	 */
+	public static function getRootAlias($alias)
+	{
+		$pos = strpos($alias, '/');
+		$root = $pos === false ? $alias : substr($alias, 0, $pos);
+
+		if (isset(self::$aliases[$root])) {
+			if (is_string(self::$aliases[$root])) {
+				return $root;
+			} else {
+				foreach (self::$aliases[$root] as $name => $path) {
+					if (strpos($alias . '/', $name . '/') === 0) {
+						return $name;
+					}
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Registers a path alias.
+	 *
+	 * A path alias is a short name representing a long path (a file path, a URL, etc.)
+	 * For example, we use '@yii' as the alias of the path to the Yii framework directory.
+	 *
+	 * A path alias must start with the character '@' so that it can be easily differentiated
+	 * from non-alias paths.
+	 *
+	 * Note that this method does not check if the given path exists or not. All it does is
+	 * to associate the alias with the path.
+	 *
+	 * Any trailing '/' and '\' characters in the given path will be trimmed.
+	 *
+	 * @param string $alias the alias name (e.g. "@yii"). It must start with a '@' character.
+	 * It may contain the forward slash '/' which serves as boundary character when performing
+	 * alias translation by [[getAlias()]].
+	 * @param string $path the path corresponding to the alias. Trailing '/' and '\' characters
+	 * will be trimmed. This can be
+	 *
+	 * - a directory or a file path (e.g. `/tmp`, `/tmp/main.txt`)
+	 * - a URL (e.g. `http://www.yiiframework.com`)
+	 * - a path alias (e.g. `@yii/base`). In this case, the path alias will be converted into the
+	 *   actual path first by calling [[getAlias()]].
+	 *
+	 * @throws InvalidParamException if $path is an invalid alias.
+	 * @see getAlias
+	 */
+	public static function setAlias($alias, $path)
+	{
+		if (strncmp($alias, '@', 1)) {
+			$alias = '@' . $alias;
+		}
+		$pos = strpos($alias, '/');
+		$root = $pos === false ? $alias : substr($alias, 0, $pos);
+		if ($path !== null) {
+			$path = strncmp($path, '@', 1) ? rtrim($path, '\\/') : static::getAlias($path);
+			if (!isset(self::$aliases[$root])) {
+				self::$aliases[$root] = $path;
+			} elseif (is_string(self::$aliases[$root])) {
+				if ($pos === false) {
+					self::$aliases[$root] = $path;
+				} else {
+					self::$aliases[$root] = array(
+						$alias => $path,
+						$root => self::$aliases[$root],
+					);
+				}
+			} else {
+				self::$aliases[$root][$alias] = $path;
+				krsort(self::$aliases[$root]);
+			}
+		} elseif (isset(self::$aliases[$root])) {
+			if (is_array(self::$aliases[$root])) {
+				unset(self::$aliases[$root][$alias]);
+			} elseif ($pos === false) {
+				unset(self::$aliases[$root]);
+			}
+		}
+	}
+
+	/**
+	 * Class autoload loader.
+	 * This method is invoked automatically when PHP sees an unknown class.
+	 * The method will attempt to include the class file according to the following procedure:
+	 *
+	 * 1. Search in [[classMap]];
+	 * 2. If the class is namespaced (e.g. `yii\base\Component`), it will attempt
+	 *    to include the file associated with the corresponding path alias
+	 *    (e.g. `@yii/base/Component.php`);
+	 * 3. If the class is named in PEAR style (e.g. `PHPUnit_Framework_TestCase`),
+	 *    it will attempt to include the file associated with the corresponding path alias
+	 *    (e.g. `@PHPUnit/Framework/TestCase.php`);
+	 * 4. Search PHP include_path for the actual class file if [[enableIncludePath]] is true;
+	 * 5. Return false so that other autoloaders have chance to include the class file.
+	 *
+	 * @param string $className class name
+	 * @return boolean whether the class has been loaded successfully
+	 * @throws InvalidConfigException if the class file does not exist
+	 * @throws UnknownClassException if the class does not exist in the class file
+	 */
+	public static function autoload($className)
+	{
+		$className = ltrim($className, '\\');
+
+		if (isset(self::$classMap[$className])) {
+			$classFile = static::getAlias(self::$classMap[$className]);
+			if (!is_file($classFile)) {
+				throw new InvalidConfigException("Class file does not exist: $classFile");
+			}
+		} else {
+			// follow PSR-0 to determine the class file
+			if (($pos = strrpos($className, '\\')) !== false) {
+				// namespaced class, e.g. yii\base\Component
+				$path = str_replace('\\', '/', substr($className, 0, $pos + 1))
+					. str_replace('_', '/', substr($className, $pos + 1)) . '.php';
+			} else {
+				$path = str_replace('_', '/', $className) . '.php';
+			}
+
+			// try via path alias first
+			if (strpos($path, '/') !== false) {
+				$fullPath = static::getAlias('@' . $path, false);
+				if ($fullPath !== false && is_file($fullPath)) {
+					$classFile = $fullPath;
+				}
+			}
+
+			// search include_path
+			if (!isset($classFile) && self::$enableIncludePath && ($fullPath = stream_resolve_include_path($path)) !== false) {
+				$classFile = $fullPath;
+			}
+
+			if (!isset($classFile)) {
+				// return false to let other autoloaders to try loading the class
+				return false;
+			}
+		}
+
+		include($classFile);
+
+		if (class_exists($className, false) || interface_exists($className, false) ||
+			function_exists('trait_exists') && trait_exists($className, false)) {
+			return true;
+		} else {
+			throw new UnknownClassException("Unable to find '$className' in file: $classFile");
+		}
+	}
+
+	/**
+	 * Creates a new object using the given configuration.
+	 *
+	 * The configuration can be either a string or an array.
+	 * If a string, it is treated as the *object class*; if an array,
+	 * it must contain a `class` element specifying the *object class*, and
+	 * the rest of the name-value pairs in the array will be used to initialize
+	 * the corresponding object properties.
+	 *
+	 * The object type can be either a class name or the [[getAlias()|alias]] of
+	 * the class. For example,
+	 *
+	 * - `app\components\GoogleMap`: fully-qualified namespaced class.
+	 * - `@app/components/GoogleMap`: an alias, used for non-namespaced class.
+	 *
+	 * Below are some usage examples:
+	 *
+	 * ~~~
+	 * $object = \Yii::createObject('@app/components/GoogleMap');
+	 * $object = \Yii::createObject(array(
+	 *     'class' => '\app\components\GoogleMap',
+	 *     'apiKey' => 'xyz',
+	 * ));
+	 * ~~~
+	 *
+	 * This method can be used to create any object as long as the object's constructor is
+	 * defined like the following:
+	 *
+	 * ~~~
+	 * public function __construct(..., $config = array()) {
+	 * }
+	 * ~~~
+	 *
+	 * The method will pass the given configuration as the last parameter of the constructor,
+	 * and any additional parameters to this method will be passed as the rest of the constructor parameters.
+	 *
+	 * @param string|array $config the configuration. It can be either a string representing the class name
+	 * or an array representing the object configuration.
+	 * @return mixed the created object
+	 * @throws InvalidConfigException if the configuration is invalid.
+	 */
+	public static function createObject($config)
+	{
+		static $reflections = array();
+
+		if (is_string($config)) {
+			$class = $config;
+			$config = array();
+		} elseif (isset($config['class'])) {
+			$class = $config['class'];
+			unset($config['class']);
+		} else {
+			throw new InvalidConfigException('Object configuration must be an array containing a "class" element.');
+		}
+
+		if (!class_exists($class, false)) {
+			$class = static::import($class);
+		}
+
+		$class = ltrim($class, '\\');
+
+		if (isset(self::$objectConfig[$class])) {
+			$config = array_merge(self::$objectConfig[$class], $config);
+		}
+
+		if (($n = func_num_args()) > 1) {
+			/** @var $reflection \ReflectionClass */
+			if (isset($reflections[$class])) {
+				$reflection = $reflections[$class];
+			} else {
+				$reflection = $reflections[$class] = new \ReflectionClass($class);
+			}
+			$args = func_get_args();
+			array_shift($args); // remove $config
+			if (!empty($config)) {
+				$args[] = $config;
+			}
+			return $reflection->newInstanceArgs($args);
+		} else {
+			return empty($config) ? new $class : new $class($config);
+		}
+	}
+
+	/**
+	 * Logs a trace message.
+	 * Trace messages are logged mainly for development purpose to see
+	 * the execution work flow of some code.
+	 * @param string $message the message to be logged.
+	 * @param string $category the category of the message.
+	 */
+	public static function trace($message, $category = 'application')
+	{
+		if (YII_DEBUG) {
+			self::getLogger()->log($message, Logger::LEVEL_TRACE, $category);
+		}
+	}
+
+	/**
+	 * Logs an error message.
+	 * An error message is typically logged when an unrecoverable error occurs
+	 * during the execution of an application.
+	 * @param string $message the message to be logged.
+	 * @param string $category the category of the message.
+	 */
+	public static function error($message, $category = 'application')
+	{
+		self::getLogger()->log($message, Logger::LEVEL_ERROR, $category);
+	}
+
+	/**
+	 * Logs a warning message.
+	 * A warning message is typically logged when an error occurs while the execution
+	 * can still continue.
+	 * @param string $message the message to be logged.
+	 * @param string $category the category of the message.
+	 */
+	public static function warning($message, $category = 'application')
+	{
+		self::getLogger()->log($message, Logger::LEVEL_WARNING, $category);
+	}
+
+	/**
+	 * Logs an informative message.
+	 * An informative message is typically logged by an application to keep record of
+	 * something important (e.g. an administrator logs in).
+	 * @param string $message the message to be logged.
+	 * @param string $category the category of the message.
+	 */
+	public static function info($message, $category = 'application')
+	{
+		self::getLogger()->log($message, Logger::LEVEL_INFO, $category);
+	}
+
+	/**
+	 * Marks the beginning of a code block for profiling.
+	 * This has to be matched with a call to [[endProfile]] with the same category name.
+	 * The begin- and end- calls must also be properly nested. For example,
+	 *
+	 * ~~~
+	 * \Yii::beginProfile('block1');
+	 * // some code to be profiled
+	 *     \Yii::beginProfile('block2');
+	 *     // some other code to be profiled
+	 *     \Yii::endProfile('block2');
+	 * \Yii::endProfile('block1');
+	 * ~~~
+	 * @param string $token token for the code block
+	 * @param string $category the category of this log message
+	 * @see endProfile
+	 */
+	public static function beginProfile($token, $category = 'application')
+	{
+		self::getLogger()->log($token, Logger::LEVEL_PROFILE_BEGIN, $category);
+	}
+
+	/**
+	 * Marks the end of a code block for profiling.
+	 * This has to be matched with a previous call to [[beginProfile]] with the same category name.
+	 * @param string $token token for the code block
+	 * @param string $category the category of this log message
+	 * @see beginProfile
+	 */
+	public static function endProfile($token, $category = 'application')
+	{
+		self::getLogger()->log($token, Logger::LEVEL_PROFILE_END, $category);
+	}
+
+	/**
+	 * Returns the message logger object.
+	 * @return \yii\logging\Logger message logger
+	 */
+	public static function getLogger()
+	{
+		if (self::$_logger !== null) {
+			return self::$_logger;
+		} else {
+			return self::$_logger = new Logger;
+		}
+	}
+
+	/**
+	 * Sets the logger object.
+	 * @param Logger $logger the logger object.
+	 */
+	public static function setLogger($logger)
+	{
+		self::$_logger = $logger;
+	}
+
+	/**
+	 * Returns an HTML hyperlink that can be displayed on your Web page showing Powered by Yii" information.
+	 * @return string an HTML hyperlink that can be displayed on your Web page showing Powered by Yii" information
+	 */
+	public static function powered()
+	{
+		return 'Powered by <a href="http://www.yiiframework.com/" rel="external">Yii Framework</a>.';
+	}
+
+	/**
+	 * Translates a message to the specified language.
+	 *
+	 * The translation will be conducted according to the message category and the target language.
+	 * To specify the category of the message, prefix the message with the category name and separate it
+	 * with "|". For example, "app|hello world". If the category is not specified, the default category "app"
+	 * will be used. The actual message translation is done by a [[\yii\i18n\MessageSource|message source]].
+	 *
+	 * In case when a translated message has different plural forms (separated by "|"), this method
+	 * will also attempt to choose an appropriate one according to a given numeric value which is
+	 * specified as the first parameter (indexed by 0) in `$params`.
+	 *
+	 * For example, if a translated message is "I have an apple.|I have {n} apples.", and the first
+	 * parameter is 2, the message returned will be "I have 2 apples.". Note that the placeholder "{n}"
+	 * will be replaced with the given number.
+	 *
+	 * For more details on how plural rules are applied, please refer to:
+	 * [[http://www.unicode.org/cldr/charts/supplemental/language_plural_rules.html]]
+	 *
+	 * @param string $message the message to be translated.
+	 * @param array $params the parameters that will be used to replace the corresponding placeholders in the message.
+	 * @param string $language the language code (e.g. `en_US`, `en`). If this is null, the current
+	 * [[\yii\base\Application::language|application language]] will be used.
+	 * @return string the translated message.
+	 */
+	public static function t($message, $params = array(), $language = null)
+	{
+		if (self::$app !== null) {
+			return self::$app->getI18N()->translate($message, $params, $language);
+		} else {
+			if (strpos($message, '|') !== false && preg_match('/^([\w\-\\/\.\\\\]+)\|(.*)/', $message, $matches)) {
+				$message = $matches[2];
+			}
+			return is_array($params) ? strtr($message, $params) : $message;
+		}
+	}
+}
diff --git a/yii/assets.php b/yii/assets.php
new file mode 100644
index 0000000..7ee177d
--- /dev/null
+++ b/yii/assets.php
@@ -0,0 +1,45 @@
+<?php
+
+return array(
+	'jquery' => array(
+		'sourcePath' => __DIR__ . '/assets',
+		'js' => array(
+			'jquery.min.js',
+		),
+	),
+	'yii' => array(
+		'sourcePath' => __DIR__ . '/assets',
+		'js' => array(
+			'yii.js',
+		),
+		'depends' => array('jquery'),
+	),
+	'yii/validation' => array(
+		'sourcePath' => __DIR__ . '/assets',
+		'js' => array(
+			'yii.validation.js',
+		),
+		'depends' => array('yii'),
+	),
+	'yii/form' => array(
+		'sourcePath' => __DIR__ . '/assets',
+		'js' => array(
+			'yii.activeForm.js',
+		),
+		'depends' => array('yii', 'yii/validation'),
+	),
+	'yii/captcha' => array(
+		'sourcePath' => __DIR__ . '/assets',
+		'js' => array(
+			'yii.captcha.js',
+		),
+		'depends' => array('yii'),
+	),
+	'yii/debug' => array(
+		'sourcePath' => __DIR__ . '/assets',
+		'js' => array(
+			'yii.debug.js',
+		),
+		'depends' => array('yii'),
+	),
+);
diff --git a/yii/assets/jquery.min.js b/yii/assets/jquery.min.js
new file mode 100644
index 0000000..006e953
--- /dev/null
+++ b/yii/assets/jquery.min.js
@@ -0,0 +1,5 @@
+/*! jQuery v1.9.1 | (c) 2005, 2012 jQuery Foundation, Inc. | jquery.org/license
+//@ sourceMappingURL=jquery.min.map
+*/(function(e,t){var n,r,i=typeof t,o=e.document,a=e.location,s=e.jQuery,u=e.$,l={},c=[],p="1.9.1",f=c.concat,d=c.push,h=c.slice,g=c.indexOf,m=l.toString,y=l.hasOwnProperty,v=p.trim,b=function(e,t){return new b.fn.init(e,t,r)},x=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,w=/\S+/g,T=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,k=/^[\],:{}\s]*$/,E=/(?:^|:|,)(?:\s*\[)+/g,S=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,A=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,j=/^-ms-/,D=/-([\da-z])/gi,L=function(e,t){return t.toUpperCase()},H=function(e){(o.addEventListener||"load"===e.type||"complete"===o.readyState)&&(q(),b.ready())},q=function(){o.addEventListener?(o.removeEventListener("DOMContentLoaded",H,!1),e.removeEventListener("load",H,!1)):(o.detachEvent("onreadystatechange",H),e.detachEvent("onload",H))};b.fn=b.prototype={jquery:p,constructor:b,init:function(e,n,r){var i,a;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof b?n[0]:n,b.merge(this,b.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:o,!0)),C.test(i[1])&&b.isPlainObject(n))for(i in n)b.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(a=o.getElementById(i[2]),a&&a.parentNode){if(a.id!==i[2])return r.find(e);this.length=1,this[0]=a}return this.context=o,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):b.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),b.makeArray(e,this))},selector:"",length:0,size:function(){return this.length},toArray:function(){return h.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=b.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return b.each(this,e,t)},ready:function(e){return b.ready.promise().done(e),this},slice:function(){return this.pushStack(h.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(b.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:d,sort:[].sort,splice:[].splice},b.fn.init.prototype=b.fn,b.extend=b.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},u=1,l=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},u=2),"object"==typeof s||b.isFunction(s)||(s={}),l===u&&(s=this,--u);l>u;u++)if(null!=(o=arguments[u]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(b.isPlainObject(r)||(n=b.isArray(r)))?(n?(n=!1,a=e&&b.isArray(e)?e:[]):a=e&&b.isPlainObject(e)?e:{},s[i]=b.extend(c,a,r)):r!==t&&(s[i]=r));return s},b.extend({noConflict:function(t){return e.$===b&&(e.$=u),t&&e.jQuery===b&&(e.jQuery=s),b},isReady:!1,readyWait:1,holdReady:function(e){e?b.readyWait++:b.ready(!0)},ready:function(e){if(e===!0?!--b.readyWait:!b.isReady){if(!o.body)return setTimeout(b.ready);b.isReady=!0,e!==!0&&--b.readyWait>0||(n.resolveWith(o,[b]),b.fn.trigger&&b(o).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===b.type(e)},isArray:Array.isArray||function(e){return"array"===b.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[m.call(e)]||"object":typeof e},isPlainObject:function(e){if(!e||"object"!==b.type(e)||e.nodeType||b.isWindow(e))return!1;try{if(e.constructor&&!y.call(e,"constructor")&&!y.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||y.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||o;var r=C.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=b.buildFragment([e],t,i),i&&b(i).remove(),b.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=b.trim(n),n&&k.test(n.replace(S,"@").replace(A,"]").replace(E,"")))?Function("return "+n)():(b.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||b.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&b.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(j,"ms-").replace(D,L)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:v&&!v.call("\ufeff\u00a0")?function(e){return null==e?"":v.call(e)}:function(e){return null==e?"":(e+"").replace(T,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?b.merge(n,"string"==typeof e?[e]:e):d.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(g)return g.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return f.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),b.isFunction(e)?(r=h.call(arguments,2),i=function(){return e.apply(n||this,r.concat(h.call(arguments)))},i.guid=e.guid=e.guid||b.guid++,i):t},access:function(e,n,r,i,o,a,s){var u=0,l=e.length,c=null==r;if("object"===b.type(r)){o=!0;for(u in r)b.access(e,n,u,r[u],!0,a,s)}else if(i!==t&&(o=!0,b.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(b(e),n)})),n))for(;l>u;u++)n(e[u],r,s?i:i.call(e[u],u,n(e[u],r)));return o?e:c?n.call(e):l?n(e[0],r):a},now:function(){return(new Date).getTime()}}),b.ready.promise=function(t){if(!n)if(n=b.Deferred(),"complete"===o.readyState)setTimeout(b.ready);else if(o.addEventListener)o.addEventListener("DOMContentLoaded",H,!1),e.addEventListener("load",H,!1);else{o.attachEvent("onreadystatechange",H),e.attachEvent("onload",H);var r=!1;try{r=null==e.frameElement&&o.documentElement}catch(i){}r&&r.doScroll&&function a(){if(!b.isReady){try{r.doScroll("left")}catch(e){return setTimeout(a,50)}q(),b.ready()}}()}return n.promise(t)},b.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){l["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=b.type(e);return b.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=b(o);var _={};function F(e){var t=_[e]={};return b.each(e.match(w)||[],function(e,n){t[n]=!0}),t}b.Callbacks=function(e){e="string"==typeof e?_[e]||F(e):b.extend({},e);var n,r,i,o,a,s,u=[],l=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=u.length,n=!0;u&&o>a;a++)if(u[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,u&&(l?l.length&&c(l.shift()):r?u=[]:p.disable())},p={add:function(){if(u){var t=u.length;(function i(t){b.each(t,function(t,n){var r=b.type(n);"function"===r?e.unique&&p.has(n)||u.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=u.length:r&&(s=t,c(r))}return this},remove:function(){return u&&b.each(arguments,function(e,t){var r;while((r=b.inArray(t,u,r))>-1)u.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?b.inArray(e,u)>-1:!(!u||!u.length)},empty:function(){return u=[],this},disable:function(){return u=l=r=t,this},disabled:function(){return!u},lock:function(){return l=t,r||p.disable(),this},locked:function(){return!l},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],!u||i&&!l||(n?l.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},b.extend({Deferred:function(e){var t=[["resolve","done",b.Callbacks("once memory"),"resolved"],["reject","fail",b.Callbacks("once memory"),"rejected"],["notify","progress",b.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return b.Deferred(function(n){b.each(t,function(t,o){var a=o[0],s=b.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&b.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?b.extend(e,r):r}},i={};return r.pipe=r.then,b.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=h.call(arguments),r=n.length,i=1!==r||e&&b.isFunction(e.promise)?r:0,o=1===i?e:b.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?h.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,u,l;if(r>1)for(s=Array(r),u=Array(r),l=Array(r);r>t;t++)n[t]&&b.isFunction(n[t].promise)?n[t].promise().done(a(t,l,n)).fail(o.reject).progress(a(t,u,s)):--i;return i||o.resolveWith(l,n),o.promise()}}),b.support=function(){var t,n,r,a,s,u,l,c,p,f,d=o.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=d.getElementsByTagName("*"),r=d.getElementsByTagName("a")[0],!n||!r||!n.length)return{};s=o.createElement("select"),l=s.appendChild(o.createElement("option")),a=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t={getSetAttribute:"t"!==d.className,leadingWhitespace:3===d.firstChild.nodeType,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/top/.test(r.getAttribute("style")),hrefNormalized:"/a"===r.getAttribute("href"),opacity:/^0.5/.test(r.style.opacity),cssFloat:!!r.style.cssFloat,checkOn:!!a.value,optSelected:l.selected,enctype:!!o.createElement("form").enctype,html5Clone:"<:nav></:nav>"!==o.createElement("nav").cloneNode(!0).outerHTML,boxModel:"CSS1Compat"===o.compatMode,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},a.checked=!0,t.noCloneChecked=a.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!l.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}a=o.createElement("input"),a.setAttribute("value",""),t.input=""===a.getAttribute("value"),a.value="t",a.setAttribute("type","radio"),t.radioValue="t"===a.value,a.setAttribute("checked","t"),a.setAttribute("name","t"),u=o.createDocumentFragment(),u.appendChild(a),t.appendChecked=a.checked,t.checkClone=u.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;return d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip,b(function(){var n,r,a,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",u=o.getElementsByTagName("body")[0];u&&(n=o.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",u.appendChild(n).appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",a=d.getElementsByTagName("td"),a[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===a[0].offsetHeight,a[0].style.display="",a[1].style.display="none",t.reliableHiddenOffsets=p&&0===a[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",t.boxSizing=4===d.offsetWidth,t.doesNotIncludeMarginInBodyOffset=1!==u.offsetTop,e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(o.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="<div></div>",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(u.style.zoom=1)),u.removeChild(n),n=d=a=r=null)}),n=s=u=l=r=a=null,t}();var O=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,B=/([A-Z])/g;function P(e,n,r,i){if(b.acceptData(e)){var o,a,s=b.expando,u="string"==typeof n,l=e.nodeType,p=l?b.cache:e,f=l?e[s]:e[s]&&s;if(f&&p[f]&&(i||p[f].data)||!u||r!==t)return f||(l?e[s]=f=c.pop()||b.guid++:f=s),p[f]||(p[f]={},l||(p[f].toJSON=b.noop)),("object"==typeof n||"function"==typeof n)&&(i?p[f]=b.extend(p[f],n):p[f].data=b.extend(p[f].data,n)),o=p[f],i||(o.data||(o.data={}),o=o.data),r!==t&&(o[b.camelCase(n)]=r),u?(a=o[n],null==a&&(a=o[b.camelCase(n)])):a=o,a}}function R(e,t,n){if(b.acceptData(e)){var r,i,o,a=e.nodeType,s=a?b.cache:e,u=a?e[b.expando]:b.expando;if(s[u]){if(t&&(o=n?s[u]:s[u].data)){b.isArray(t)?t=t.concat(b.map(t,b.camelCase)):t in o?t=[t]:(t=b.camelCase(t),t=t in o?[t]:t.split(" "));for(r=0,i=t.length;i>r;r++)delete o[t[r]];if(!(n?$:b.isEmptyObject)(o))return}(n||(delete s[u].data,$(s[u])))&&(a?b.cleanData([e],!0):b.support.deleteExpando||s!=s.window?delete s[u]:s[u]=null)}}}b.extend({cache:{},expando:"jQuery"+(p+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?b.cache[e[b.expando]]:e[b.expando],!!e&&!$(e)},data:function(e,t,n){return P(e,t,n)},removeData:function(e,t){return R(e,t)},_data:function(e,t,n){return P(e,t,n,!0)},_removeData:function(e,t){return R(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&b.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),b.fn.extend({data:function(e,n){var r,i,o=this[0],a=0,s=null;if(e===t){if(this.length&&(s=b.data(o),1===o.nodeType&&!b._data(o,"parsedAttrs"))){for(r=o.attributes;r.length>a;a++)i=r[a].name,i.indexOf("data-")||(i=b.camelCase(i.slice(5)),W(o,i,s[i]));b._data(o,"parsedAttrs",!0)}return s}return"object"==typeof e?this.each(function(){b.data(this,e)}):b.access(this,function(n){return n===t?o?W(o,e,b.data(o,e)):null:(this.each(function(){b.data(this,e,n)}),t)},null,n,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){b.removeData(this,e)})}});function W(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(B,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:O.test(r)?b.parseJSON(r):r}catch(o){}b.data(e,n,r)}else r=t}return r}function $(e){var t;for(t in e)if(("data"!==t||!b.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}b.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=b._data(e,n),r&&(!i||b.isArray(r)?i=b._data(e,n,b.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=b.queue(e,t),r=n.length,i=n.shift(),o=b._queueHooks(e,t),a=function(){b.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),o.cur=i,i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return b._data(e,n)||b._data(e,n,{empty:b.Callbacks("once memory").add(function(){b._removeData(e,t+"queue"),b._removeData(e,n)})})}}),b.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?b.queue(this[0],e):n===t?this:this.each(function(){var t=b.queue(this,e,n);b._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&b.dequeue(this,e)})},dequeue:function(e){return this.each(function(){b.dequeue(this,e)})},delay:function(e,t){return e=b.fx?b.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=b.Deferred(),a=this,s=this.length,u=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=b._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(u));return u(),o.promise(n)}});var I,z,X=/[\t\r\n]/g,U=/\r/g,V=/^(?:input|select|textarea|button|object)$/i,Y=/^(?:a|area)$/i,J=/^(?:checked|selected|autofocus|autoplay|async|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped)$/i,G=/^(?:checked|selected)$/i,Q=b.support.getSetAttribute,K=b.support.input;b.fn.extend({attr:function(e,t){return b.access(this,b.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){b.removeAttr(this,e)})},prop:function(e,t){return b.access(this,b.prop,e,t,arguments.length>1)},removeProp:function(e){return e=b.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,u="string"==typeof e&&e;if(b.isFunction(e))return this.each(function(t){b(this).addClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(X," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=b.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,u=0===arguments.length||"string"==typeof e&&e;if(b.isFunction(e))return this.each(function(t){b(this).removeClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(X," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?b.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e,r="boolean"==typeof t;return b.isFunction(e)?this.each(function(n){b(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var o,a=0,s=b(this),u=t,l=e.match(w)||[];while(o=l[a++])u=r?u:!s.hasClass(o),s[u?"addClass":"removeClass"](o)}else(n===i||"boolean"===n)&&(this.className&&b._data(this,"__className__",this.className),this.className=this.className||e===!1?"":b._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(X," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=b.isFunction(e),this.each(function(n){var o,a=b(this);1===this.nodeType&&(o=i?e.call(this,n,a.val()):e,null==o?o="":"number"==typeof o?o+="":b.isArray(o)&&(o=b.map(o,function(e){return null==e?"":e+""})),r=b.valHooks[this.type]||b.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=b.valHooks[o.type]||b.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(U,""):null==n?"":n)}}}),b.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,u=0>i?s:o?i:0;for(;s>u;u++)if(n=r[u],!(!n.selected&&u!==i||(b.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&b.nodeName(n.parentNode,"optgroup"))){if(t=b(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n=b.makeArray(t);return b(e).find("option").each(function(){this.selected=b.inArray(b(this).val(),n)>=0}),n.length||(e.selectedIndex=-1),n}}},attr:function(e,n,r){var o,a,s,u=e.nodeType;if(e&&3!==u&&8!==u&&2!==u)return typeof e.getAttribute===i?b.prop(e,n,r):(a=1!==u||!b.isXMLDoc(e),a&&(n=n.toLowerCase(),o=b.attrHooks[n]||(J.test(n)?z:I)),r===t?o&&a&&"get"in o&&null!==(s=o.get(e,n))?s:(typeof e.getAttribute!==i&&(s=e.getAttribute(n)),null==s?t:s):null!==r?o&&a&&"set"in o&&(s=o.set(e,r,n))!==t?s:(e.setAttribute(n,r+""),r):(b.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(w);if(o&&1===e.nodeType)while(n=o[i++])r=b.propFix[n]||n,J.test(n)?!Q&&G.test(n)?e[b.camelCase("default-"+n)]=e[r]=!1:e[r]=!1:b.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!b.support.radioValue&&"radio"===t&&b.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!b.isXMLDoc(e),a&&(n=b.propFix[n]||n,o=b.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var n=e.getAttributeNode("tabindex");return n&&n.specified?parseInt(n.value,10):V.test(e.nodeName)||Y.test(e.nodeName)&&e.href?0:t}}}}),z={get:function(e,n){var r=b.prop(e,n),i="boolean"==typeof r&&e.getAttribute(n),o="boolean"==typeof r?K&&Q?null!=i:G.test(n)?e[b.camelCase("default-"+n)]:!!i:e.getAttributeNode(n);return o&&o.value!==!1?n.toLowerCase():t},set:function(e,t,n){return t===!1?b.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&b.propFix[n]||n,n):e[b.camelCase("default-"+n)]=e[n]=!0,n}},K&&Q||(b.attrHooks.value={get:function(e,n){var r=e.getAttributeNode(n);return b.nodeName(e,"input")?e.defaultValue:r&&r.specified?r.value:t},set:function(e,n,r){return b.nodeName(e,"input")?(e.defaultValue=n,t):I&&I.set(e,n,r)}}),Q||(I=b.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&("id"===n||"name"===n||"coords"===n?""!==r.value:r.specified)?r.value:t},set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},b.attrHooks.contenteditable={get:I.get,set:function(e,t,n){I.set(e,""===t?!1:t,n)}},b.each(["width","height"],function(e,n){b.attrHooks[n]=b.extend(b.attrHooks[n],{set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}})})),b.support.hrefNormalized||(b.each(["href","src","width","height"],function(e,n){b.attrHooks[n]=b.extend(b.attrHooks[n],{get:function(e){var r=e.getAttribute(n,2);return null==r?t:r}})}),b.each(["href","src"],function(e,t){b.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}})),b.support.style||(b.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),b.support.optSelected||(b.propHooks.selected=b.extend(b.propHooks.selected,{get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}})),b.support.enctype||(b.propFix.enctype="encoding"),b.support.checkOn||b.each(["radio","checkbox"],function(){b.valHooks[this]={get:function(e){return null===e.getAttribute("value")?"on":e.value}}}),b.each(["radio","checkbox"],function(){b.valHooks[this]=b.extend(b.valHooks[this],{set:function(e,n){return b.isArray(n)?e.checked=b.inArray(b(e).val(),n)>=0:t}})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}b.event={global:{},add:function(e,n,r,o,a){var s,u,l,c,p,f,d,h,g,m,y,v=b._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=b.guid++),(u=v.events)||(u=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof b===i||e&&b.event.triggered===e.type?t:b.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(w)||[""],l=n.length;while(l--)s=rt.exec(n[l])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),p=b.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=b.event.special[g]||{},d=b.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&b.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=u[g])||(h=u[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),b.event.global[g]=!0;e=null}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,p,f,d,h,g,m=b.hasData(e)&&b._data(e);if(m&&(c=m.events)){t=(t||"").match(w)||[""],l=t.length;while(l--)if(s=rt.exec(t[l])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=b.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),u=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));u&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||b.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)b.event.remove(e,d+t[l],n,r,!0);b.isEmptyObject(c)&&(delete m.handle,b._removeData(e,"events"))}},trigger:function(n,r,i,a){var s,u,l,c,p,f,d,h=[i||o],g=y.call(n,"type")?n.type:n,m=y.call(n,"namespace")?n.namespace.split("."):[];if(l=f=i=i||o,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+b.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),u=0>g.indexOf(":")&&"on"+g,n=n[b.expando]?n:new b.Event(g,"object"==typeof n&&n),n.isTrigger=!0,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:b.makeArray(r,[n]),p=b.event.special[g]||{},a||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!a&&!p.noBubble&&!b.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(l=l.parentNode);l;l=l.parentNode)h.push(l),f=l;f===(i.ownerDocument||o)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((l=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(b._data(l,"events")||{})[n.type]&&b._data(l,"handle"),s&&s.apply(l,r),s=u&&l[u],s&&b.acceptData(l)&&s.apply&&s.apply(l,r)===!1&&n.preventDefault();if(n.type=g,!(a||n.isDefaultPrevented()||p._default&&p._default.apply(i.ownerDocument,r)!==!1||"click"===g&&b.nodeName(i,"a")||!b.acceptData(i)||!u||!i[g]||b.isWindow(i))){f=i[u],f&&(i[u]=null),b.event.triggered=g;try{i[g]()}catch(v){}b.event.triggered=t,f&&(i[u]=f)}return n.result}},dispatch:function(e){e=b.event.fix(e);var n,r,i,o,a,s=[],u=h.call(arguments),l=(b._data(this,"events")||{})[e.type]||[],c=b.event.special[e.type]||{};if(u[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=b.event.handlers.call(this,e,l),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((b.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,u),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],u=n.delegateCount,l=e.target;if(u&&l.nodeType&&(!e.button||"click"!==e.type))for(;l!=this;l=l.parentNode||this)if(1===l.nodeType&&(l.disabled!==!0||"click"!==e.type)){for(o=[],a=0;u>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?b(r,this).index(l)>=0:b.find(r,this,null,[l]).length),o[r]&&o.push(i);o.length&&s.push({elem:l,handlers:o})}return n.length>u&&s.push({elem:this,handlers:n.slice(u)}),s},fix:function(e){if(e[b.expando])return e;var t,n,r,i=e.type,a=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new b.Event(a),t=r.length;while(t--)n=r[t],e[n]=a[n];return e.target||(e.target=a.srcElement||o),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,a):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,a,s=n.button,u=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||o,a=i.documentElement,r=i.body,e.pageX=n.clientX+(a&&a.scrollLeft||r&&r.scrollLeft||0)-(a&&a.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(a&&a.scrollTop||r&&r.scrollTop||0)-(a&&a.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&u&&(e.relatedTarget=u===e.target?n.toElement:u),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},click:{trigger:function(){return b.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t}},focus:{trigger:function(){if(this!==o.activeElement&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===o.activeElement&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=b.extend(new b.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?b.event.trigger(i,null,t):b.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},b.removeEvent=o.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},b.Event=function(e,n){return this instanceof b.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&b.extend(this,n),this.timeStamp=e&&e.timeStamp||b.now(),this[b.expando]=!0,t):new b.Event(e,n)},b.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},b.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){b.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;
+return(!i||i!==r&&!b.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),b.support.submitBubbles||(b.event.special.submit={setup:function(){return b.nodeName(this,"form")?!1:(b.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=b.nodeName(n,"input")||b.nodeName(n,"button")?n.form:t;r&&!b._data(r,"submitBubbles")&&(b.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),b._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&b.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return b.nodeName(this,"form")?!1:(b.event.remove(this,"._submit"),t)}}),b.support.changeBubbles||(b.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(b.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),b.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),b.event.simulate("change",this,e,!0)})),!1):(b.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!b._data(t,"changeBubbles")&&(b.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||b.event.simulate("change",this.parentNode,e,!0)}),b._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return b.event.remove(this,"._change"),!Z.test(this.nodeName)}}),b.support.focusinBubbles||b.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){b.event.simulate(t,e.target,b.event.fix(e),!0)};b.event.special[t]={setup:function(){0===n++&&o.addEventListener(e,r,!0)},teardown:function(){0===--n&&o.removeEventListener(e,r,!0)}}}),b.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return b().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=b.guid++)),this.each(function(){b.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,b(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){b.event.remove(this,e,r,n)})},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},trigger:function(e,t){return this.each(function(){b.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?b.event.trigger(e,n,r,!0):t}}),function(e,t){var n,r,i,o,a,s,u,l,c,p,f,d,h,g,m,y,v,x="sizzle"+-new Date,w=e.document,T={},N=0,C=0,k=it(),E=it(),S=it(),A=typeof t,j=1<<31,D=[],L=D.pop,H=D.push,q=D.slice,M=D.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},_="[\\x20\\t\\r\\n\\f]",F="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=F.replace("w","w#"),B="([*^$|!~]?=)",P="\\["+_+"*("+F+")"+_+"*(?:"+B+_+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+O+")|)|)"+_+"*\\]",R=":("+F+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+P.replace(3,8)+")*)|.*)\\)|)",W=RegExp("^"+_+"+|((?:^|[^\\\\])(?:\\\\.)*)"+_+"+$","g"),$=RegExp("^"+_+"*,"+_+"*"),I=RegExp("^"+_+"*([\\x20\\t\\r\\n\\f>+~])"+_+"*"),z=RegExp(R),X=RegExp("^"+O+"$"),U={ID:RegExp("^#("+F+")"),CLASS:RegExp("^\\.("+F+")"),NAME:RegExp("^\\[name=['\"]?("+F+")['\"]?\\]"),TAG:RegExp("^("+F.replace("w","w*")+")"),ATTR:RegExp("^"+P),PSEUDO:RegExp("^"+R),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+_+"*(even|odd|(([+-]|)(\\d*)n|)"+_+"*(?:([+-]|)"+_+"*(\\d+)|))"+_+"*\\)|)","i"),needsContext:RegExp("^"+_+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+_+"*((?:-\\d)?\\d*)"+_+"*\\)|)(?=[^-]|$)","i")},V=/[\x20\t\r\n\f]*[+~]/,Y=/^[^{]+\{\s*\[native code/,J=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,G=/^(?:input|select|textarea|button)$/i,Q=/^h\d$/i,K=/'|\\/g,Z=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,et=/\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?|.)/g,tt=function(e,t){var n="0x"+t-65536;return n!==n?t:0>n?String.fromCharCode(n+65536):String.fromCharCode(55296|n>>10,56320|1023&n)};try{q.call(w.documentElement.childNodes,0)[0].nodeType}catch(nt){q=function(e){var t,n=[];while(t=this[e++])n.push(t);return n}}function rt(e){return Y.test(e+"")}function it(){var e,t=[];return e=function(n,r){return t.push(n+=" ")>i.cacheLength&&delete e[t.shift()],e[n]=r}}function ot(e){return e[x]=!0,e}function at(e){var t=p.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}}function st(e,t,n,r){var i,o,a,s,u,l,f,g,m,v;if((t?t.ownerDocument||t:w)!==p&&c(t),t=t||p,n=n||[],!e||"string"!=typeof e)return n;if(1!==(s=t.nodeType)&&9!==s)return[];if(!d&&!r){if(i=J.exec(e))if(a=i[1]){if(9===s){if(o=t.getElementById(a),!o||!o.parentNode)return n;if(o.id===a)return n.push(o),n}else if(t.ownerDocument&&(o=t.ownerDocument.getElementById(a))&&y(t,o)&&o.id===a)return n.push(o),n}else{if(i[2])return H.apply(n,q.call(t.getElementsByTagName(e),0)),n;if((a=i[3])&&T.getByClassName&&t.getElementsByClassName)return H.apply(n,q.call(t.getElementsByClassName(a),0)),n}if(T.qsa&&!h.test(e)){if(f=!0,g=x,m=t,v=9===s&&e,1===s&&"object"!==t.nodeName.toLowerCase()){l=ft(e),(f=t.getAttribute("id"))?g=f.replace(K,"\\$&"):t.setAttribute("id",g),g="[id='"+g+"'] ",u=l.length;while(u--)l[u]=g+dt(l[u]);m=V.test(e)&&t.parentNode||t,v=l.join(",")}if(v)try{return H.apply(n,q.call(m.querySelectorAll(v),0)),n}catch(b){}finally{f||t.removeAttribute("id")}}}return wt(e.replace(W,"$1"),t,n,r)}a=st.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},c=st.setDocument=function(e){var n=e?e.ownerDocument||e:w;return n!==p&&9===n.nodeType&&n.documentElement?(p=n,f=n.documentElement,d=a(n),T.tagNameNoComments=at(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),T.attributes=at(function(e){e.innerHTML="<select></select>";var t=typeof e.lastChild.getAttribute("multiple");return"boolean"!==t&&"string"!==t}),T.getByClassName=at(function(e){return e.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",e.getElementsByClassName&&e.getElementsByClassName("e").length?(e.lastChild.className="e",2===e.getElementsByClassName("e").length):!1}),T.getByName=at(function(e){e.id=x+0,e.innerHTML="<a name='"+x+"'></a><div name='"+x+"'></div>",f.insertBefore(e,f.firstChild);var t=n.getElementsByName&&n.getElementsByName(x).length===2+n.getElementsByName(x+0).length;return T.getIdNotName=!n.getElementById(x),f.removeChild(e),t}),i.attrHandle=at(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild&&typeof e.firstChild.getAttribute!==A&&"#"===e.firstChild.getAttribute("href")})?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},T.getIdNotName?(i.find.ID=function(e,t){if(typeof t.getElementById!==A&&!d){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},i.filter.ID=function(e){var t=e.replace(et,tt);return function(e){return e.getAttribute("id")===t}}):(i.find.ID=function(e,n){if(typeof n.getElementById!==A&&!d){var r=n.getElementById(e);return r?r.id===e||typeof r.getAttributeNode!==A&&r.getAttributeNode("id").value===e?[r]:t:[]}},i.filter.ID=function(e){var t=e.replace(et,tt);return function(e){var n=typeof e.getAttributeNode!==A&&e.getAttributeNode("id");return n&&n.value===t}}),i.find.TAG=T.tagNameNoComments?function(e,n){return typeof n.getElementsByTagName!==A?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},i.find.NAME=T.getByName&&function(e,n){return typeof n.getElementsByName!==A?n.getElementsByName(name):t},i.find.CLASS=T.getByClassName&&function(e,n){return typeof n.getElementsByClassName===A||d?t:n.getElementsByClassName(e)},g=[],h=[":focus"],(T.qsa=rt(n.querySelectorAll))&&(at(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||h.push("\\["+_+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||h.push(":checked")}),at(function(e){e.innerHTML="<input type='hidden' i=''/>",e.querySelectorAll("[i^='']").length&&h.push("[*^$]="+_+"*(?:\"\"|'')"),e.querySelectorAll(":enabled").length||h.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),h.push(",.*:")})),(T.matchesSelector=rt(m=f.matchesSelector||f.mozMatchesSelector||f.webkitMatchesSelector||f.oMatchesSelector||f.msMatchesSelector))&&at(function(e){T.disconnectedMatch=m.call(e,"div"),m.call(e,"[s!='']:x"),g.push("!=",R)}),h=RegExp(h.join("|")),g=RegExp(g.join("|")),y=rt(f.contains)||f.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},v=f.compareDocumentPosition?function(e,t){var r;return e===t?(u=!0,0):(r=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t))?1&r||e.parentNode&&11===e.parentNode.nodeType?e===n||y(w,e)?-1:t===n||y(w,t)?1:0:4&r?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return u=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:0;if(o===a)return ut(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?ut(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},u=!1,[0,0].sort(v),T.detectDuplicates=u,p):p},st.matches=function(e,t){return st(e,null,null,t)},st.matchesSelector=function(e,t){if((e.ownerDocument||e)!==p&&c(e),t=t.replace(Z,"='$1']"),!(!T.matchesSelector||d||g&&g.test(t)||h.test(t)))try{var n=m.call(e,t);if(n||T.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(r){}return st(t,p,null,[e]).length>0},st.contains=function(e,t){return(e.ownerDocument||e)!==p&&c(e),y(e,t)},st.attr=function(e,t){var n;return(e.ownerDocument||e)!==p&&c(e),d||(t=t.toLowerCase()),(n=i.attrHandle[t])?n(e):d||T.attributes?e.getAttribute(t):((n=e.getAttributeNode(t))||e.getAttribute(t))&&e[t]===!0?t:n&&n.specified?n.value:null},st.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},st.uniqueSort=function(e){var t,n=[],r=1,i=0;if(u=!T.detectDuplicates,e.sort(v),u){for(;t=e[r];r++)t===e[r-1]&&(i=n.push(r));while(i--)e.splice(n[i],1)}return e};function ut(e,t){var n=t&&e,r=n&&(~t.sourceIndex||j)-(~e.sourceIndex||j);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function lt(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function ct(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function pt(e){return ot(function(t){return t=+t,ot(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}o=st.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=o(t);return n},i=st.selectors={cacheLength:50,createPseudo:ot,match:U,find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(et,tt),e[3]=(e[4]||e[5]||"").replace(et,tt),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||st.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&st.error(e[0]),e},PSEUDO:function(e){var t,n=!e[5]&&e[2];return U.CHILD.test(e[0])?null:(e[4]?e[2]=e[4]:n&&z.test(n)&&(t=ft(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){return"*"===e?function(){return!0}:(e=e.replace(et,tt).toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=k[e+" "];return t||(t=RegExp("(^|"+_+")"+e+"("+_+"|$)"))&&k(e,function(e){return t.test(e.className||typeof e.getAttribute!==A&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=st.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!u&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[x]||(m[x]={}),l=c[e]||[],d=l[0]===N&&l[1],f=l[0]===N&&l[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[N,d,f];break}}else if(v&&(l=(t[x]||(t[x]={}))[e])&&l[0]===N)f=l[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[x]||(p[x]={}))[e]=[N,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||st.error("unsupported pseudo: "+e);return r[x]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?ot(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=M.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:ot(function(e){var t=[],n=[],r=s(e.replace(W,"$1"));return r[x]?ot(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:ot(function(e){return function(t){return st(e,t).length>0}}),contains:ot(function(e){return function(t){return(t.textContent||t.innerText||o(t)).indexOf(e)>-1}}),lang:ot(function(e){return X.test(e||"")||st.error("unsupported lang: "+e),e=e.replace(et,tt).toLowerCase(),function(t){var n;do if(n=d?t.getAttribute("xml:lang")||t.getAttribute("lang"):t.lang)return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===f},focus:function(e){return e===p.activeElement&&(!p.hasFocus||p.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!i.pseudos.empty(e)},header:function(e){return Q.test(e.nodeName)},input:function(e){return G.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:pt(function(){return[0]}),last:pt(function(e,t){return[t-1]}),eq:pt(function(e,t,n){return[0>n?n+t:n]}),even:pt(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:pt(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:pt(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:pt(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}};for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})i.pseudos[n]=lt(n);for(n in{submit:!0,reset:!0})i.pseudos[n]=ct(n);function ft(e,t){var n,r,o,a,s,u,l,c=E[e+" "];if(c)return t?0:c.slice(0);s=e,u=[],l=i.preFilter;while(s){(!n||(r=$.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),u.push(o=[])),n=!1,(r=I.exec(s))&&(n=r.shift(),o.push({value:n,type:r[0].replace(W," ")}),s=s.slice(n.length));for(a in i.filter)!(r=U[a].exec(s))||l[a]&&!(r=l[a](r))||(n=r.shift(),o.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?st.error(e):E(e,u).slice(0)}function dt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function ht(e,t,n){var i=t.dir,o=n&&"parentNode"===i,a=C++;return t.first?function(t,n,r){while(t=t[i])if(1===t.nodeType||o)return e(t,n,r)}:function(t,n,s){var u,l,c,p=N+" "+a;if(s){while(t=t[i])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[i])if(1===t.nodeType||o)if(c=t[x]||(t[x]={}),(l=c[i])&&l[0]===p){if((u=l[1])===!0||u===r)return u===!0}else if(l=c[i]=[p],l[1]=e(t,n,s)||r,l[1]===!0)return!0}}function gt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function mt(e,t,n,r,i){var o,a=[],s=0,u=e.length,l=null!=t;for(;u>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),l&&t.push(s));return a}function yt(e,t,n,r,i,o){return r&&!r[x]&&(r=yt(r)),i&&!i[x]&&(i=yt(i,o)),ot(function(o,a,s,u){var l,c,p,f=[],d=[],h=a.length,g=o||xt(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:mt(g,f,e,s,u),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,u),r){l=mt(y,d),r(l,[],s,u),c=l.length;while(c--)(p=l[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){l=[],c=y.length;while(c--)(p=y[c])&&l.push(m[c]=p);i(null,y=[],l,u)}c=y.length;while(c--)(p=y[c])&&(l=i?M.call(o,p):f[c])>-1&&(o[l]=!(a[l]=p))}}else y=mt(y===a?y.splice(h,y.length):y),i?i(null,a,y,u):H.apply(a,y)})}function vt(e){var t,n,r,o=e.length,a=i.relative[e[0].type],s=a||i.relative[" "],u=a?1:0,c=ht(function(e){return e===t},s,!0),p=ht(function(e){return M.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==l)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;o>u;u++)if(n=i.relative[e[u].type])f=[ht(gt(f),n)];else{if(n=i.filter[e[u].type].apply(null,e[u].matches),n[x]){for(r=++u;o>r;r++)if(i.relative[e[r].type])break;return yt(u>1&&gt(f),u>1&&dt(e.slice(0,u-1)).replace(W,"$1"),n,r>u&&vt(e.slice(u,r)),o>r&&vt(e=e.slice(r)),o>r&&dt(e))}f.push(n)}return gt(f)}function bt(e,t){var n=0,o=t.length>0,a=e.length>0,s=function(s,u,c,f,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,T=l,C=s||a&&i.find.TAG("*",d&&u.parentNode||u),k=N+=null==T?1:Math.random()||.1;for(w&&(l=u!==p&&u,r=n);null!=(h=C[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,u,c)){f.push(h);break}w&&(N=k,r=++n)}o&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,o&&b!==v){g=0;while(m=t[g++])m(x,y,u,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=L.call(f));y=mt(y)}H.apply(f,y),w&&!s&&y.length>0&&v+t.length>1&&st.uniqueSort(f)}return w&&(N=k,l=T),x};return o?ot(s):s}s=st.compile=function(e,t){var n,r=[],i=[],o=S[e+" "];if(!o){t||(t=ft(e)),n=t.length;while(n--)o=vt(t[n]),o[x]?r.push(o):i.push(o);o=S(e,bt(i,r))}return o};function xt(e,t,n){var r=0,i=t.length;for(;i>r;r++)st(e,t[r],n);return n}function wt(e,t,n,r){var o,a,u,l,c,p=ft(e);if(!r&&1===p.length){if(a=p[0]=p[0].slice(0),a.length>2&&"ID"===(u=a[0]).type&&9===t.nodeType&&!d&&i.relative[a[1].type]){if(t=i.find.ID(u.matches[0].replace(et,tt),t)[0],!t)return n;e=e.slice(a.shift().value.length)}o=U.needsContext.test(e)?0:a.length;while(o--){if(u=a[o],i.relative[l=u.type])break;if((c=i.find[l])&&(r=c(u.matches[0].replace(et,tt),V.test(a[0].type)&&t.parentNode||t))){if(a.splice(o,1),e=r.length&&dt(a),!e)return H.apply(n,q.call(r,0)),n;break}}}return s(e,p)(r,t,d,n,V.test(e)),n}i.pseudos.nth=i.pseudos.eq;function Tt(){}i.filters=Tt.prototype=i.pseudos,i.setFilters=new Tt,c(),st.attr=b.attr,b.find=st,b.expr=st.selectors,b.expr[":"]=b.expr.pseudos,b.unique=st.uniqueSort,b.text=st.getText,b.isXMLDoc=st.isXML,b.contains=st.contains}(e);var at=/Until$/,st=/^(?:parents|prev(?:Until|All))/,ut=/^.[^:#\[\.,]*$/,lt=b.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};b.fn.extend({find:function(e){var t,n,r,i=this.length;if("string"!=typeof e)return r=this,this.pushStack(b(e).filter(function(){for(t=0;i>t;t++)if(b.contains(r[t],this))return!0}));for(n=[],t=0;i>t;t++)b.find(e,this[t],n);return n=this.pushStack(i>1?b.unique(n):n),n.selector=(this.selector?this.selector+" ":"")+e,n},has:function(e){var t,n=b(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(b.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e,!1))},filter:function(e){return this.pushStack(ft(this,e,!0))},is:function(e){return!!e&&("string"==typeof e?lt.test(e)?b(e,this.context).index(this[0])>=0:b.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){var n,r=0,i=this.length,o=[],a=lt.test(e)||"string"!=typeof e?b(e,t||this.context):0;for(;i>r;r++){n=this[r];while(n&&n.ownerDocument&&n!==t&&11!==n.nodeType){if(a?a.index(n)>-1:b.find.matchesSelector(n,e)){o.push(n);break}n=n.parentNode}}return this.pushStack(o.length>1?b.unique(o):o)},index:function(e){return e?"string"==typeof e?b.inArray(this[0],b(e)):b.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?b(e,t):b.makeArray(e&&e.nodeType?[e]:e),r=b.merge(this.get(),n);return this.pushStack(b.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),b.fn.andSelf=b.fn.addBack;function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}b.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return b.dir(e,"parentNode")},parentsUntil:function(e,t,n){return b.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return b.dir(e,"nextSibling")},prevAll:function(e){return b.dir(e,"previousSibling")},nextUntil:function(e,t,n){return b.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return b.dir(e,"previousSibling",n)},siblings:function(e){return b.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return b.sibling(e.firstChild)},contents:function(e){return b.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:b.merge([],e.childNodes)}},function(e,t){b.fn[e]=function(n,r){var i=b.map(this,t,n);return at.test(e)||(r=n),r&&"string"==typeof r&&(i=b.filter(r,i)),i=this.length>1&&!ct[e]?b.unique(i):i,this.length>1&&st.test(e)&&(i=i.reverse()),this.pushStack(i)}}),b.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),1===t.length?b.find.matchesSelector(t[0],e)?[t[0]]:[]:b.find.matches(e,t)},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!b(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(t=t||0,b.isFunction(t))return b.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return b.grep(e,function(e){return e===t===n});if("string"==typeof t){var r=b.grep(e,function(e){return 1===e.nodeType});if(ut.test(t))return b.filter(t,r,!n);t=b.filter(t,r)}return b.grep(e,function(e){return b.inArray(e,t)>=0===n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/<tbody/i,wt=/<|&#?\w+;/,Tt=/<(?:script|style|link)/i,Nt=/^(?:checkbox|radio)$/i,Ct=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^$|\/(?:java|ecma)script/i,Et=/^true\/(.*)/,St=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,At={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:b.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},jt=dt(o),Dt=jt.appendChild(o.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,b.fn.extend({text:function(e){return b.access(this,function(e){return e===t?b.text(this):this.empty().append((this[0]&&this[0].ownerDocument||o).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(b.isFunction(e))return this.each(function(t){b(this).wrapAll(e.call(this,t))});if(this[0]){var t=b(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return b.isFunction(e)?this.each(function(t){b(this).wrapInner(e.call(this,t))}):this.each(function(){var t=b(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=b.isFunction(e);return this.each(function(n){b(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){b.nodeName(this,"body")||b(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.insertBefore(e,this.firstChild)})},before:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=0;for(;null!=(n=this[r]);r++)(!e||b.filter(e,[n]).length>0)&&(t||1!==n.nodeType||b.cleanData(Ot(n)),n.parentNode&&(t&&b.contains(n.ownerDocument,n)&&Mt(Ot(n,"script")),n.parentNode.removeChild(n)));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&b.cleanData(Ot(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&b.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return b.clone(this,e,t)})},html:function(e){return b.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!b.support.htmlSerialize&&mt.test(e)||!b.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(b.cleanData(Ot(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(e){var t=b.isFunction(e);return t||"string"==typeof e||(e=b(e).not(this).detach()),this.domManip([e],!0,function(e){var t=this.nextSibling,n=this.parentNode;n&&(b(this).remove(),n.insertBefore(e,t))})},detach:function(e){return this.remove(e,!0)},domManip:function(e,n,r){e=f.apply([],e);var i,o,a,s,u,l,c=0,p=this.length,d=this,h=p-1,g=e[0],m=b.isFunction(g);if(m||!(1>=p||"string"!=typeof g||b.support.checkClone)&&Ct.test(g))return this.each(function(i){var o=d.eq(i);m&&(e[0]=g.call(this,i,n?o.html():t)),o.domManip(e,n,r)});if(p&&(l=b.buildFragment(e,this[0].ownerDocument,!1,this),i=l.firstChild,1===l.childNodes.length&&(l=i),i)){for(n=n&&b.nodeName(i,"tr"),s=b.map(Ot(l,"script"),Ht),a=s.length;p>c;c++)o=l,c!==h&&(o=b.clone(o,!0,!0),a&&b.merge(s,Ot(o,"script"))),r.call(n&&b.nodeName(this[c],"table")?Lt(this[c],"tbody"):this[c],o,c);if(a)for(u=s[s.length-1].ownerDocument,b.map(s,qt),c=0;a>c;c++)o=s[c],kt.test(o.type||"")&&!b._data(o,"globalEval")&&b.contains(u,o)&&(o.src?b.ajax({url:o.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):b.globalEval((o.text||o.textContent||o.innerHTML||"").replace(St,"")));l=i=null}return this}});function Lt(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function Ht(e){var t=e.getAttributeNode("type");return e.type=(t&&t.specified)+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function Mt(e,t){var n,r=0;for(;null!=(n=e[r]);r++)b._data(n,"globalEval",!t||b._data(t[r],"globalEval"))}function _t(e,t){if(1===t.nodeType&&b.hasData(e)){var n,r,i,o=b._data(e),a=b._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)b.event.add(t,n,s[n][r])}a.data&&(a.data=b.extend({},a.data))}}function Ft(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!b.support.noCloneEvent&&t[b.expando]){i=b._data(t);for(r in i.events)b.removeEvent(t,r,i.handle);t.removeAttribute(b.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),b.support.html5Clone&&e.innerHTML&&!b.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Nt.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}b.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){b.fn[e]=function(e){var n,r=0,i=[],o=b(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),b(o[r])[t](n),d.apply(i,n.get());return this.pushStack(i)}});function Ot(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||b.nodeName(o,n)?s.push(o):b.merge(s,Ot(o,n));return n===t||n&&b.nodeName(e,n)?b.merge([e],s):s}function Bt(e){Nt.test(e.type)&&(e.defaultChecked=e.checked)}b.extend({clone:function(e,t,n){var r,i,o,a,s,u=b.contains(e.ownerDocument,e);if(b.support.html5Clone||b.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(b.support.noCloneEvent&&b.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||b.isXMLDoc(e)))for(r=Ot(o),s=Ot(e),a=0;null!=(i=s[a]);++a)r[a]&&Ft(i,r[a]);if(t)if(n)for(s=s||Ot(e),r=r||Ot(o),a=0;null!=(i=s[a]);a++)_t(i,r[a]);else _t(e,o);return r=Ot(o,"script"),r.length>0&&Mt(r,!u&&Ot(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,u,l,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===b.type(o))b.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),u=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[u]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1></$2>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!b.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!b.support.tbody){o="table"!==u||xt.test(o)?"<table>"!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)b.nodeName(l=o.childNodes[i],"tbody")&&!l.childNodes.length&&o.removeChild(l)
+}b.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),b.support.appendChecked||b.grep(Ot(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===b.inArray(o,r))&&(a=b.contains(o.ownerDocument,o),s=Ot(f.appendChild(o),"script"),a&&Mt(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,u=b.expando,l=b.cache,p=b.support.deleteExpando,f=b.event.special;for(;null!=(n=e[s]);s++)if((t||b.acceptData(n))&&(o=n[u],a=o&&l[o])){if(a.events)for(r in a.events)f[r]?b.event.remove(n,r):b.removeEvent(n,r,a.handle);l[o]&&(delete l[o],p?delete n[u]:typeof n.removeAttribute!==i?n.removeAttribute(u):n[u]=null,c.push(o))}}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+x+")(.*)$","i"),Yt=RegExp("^("+x+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+x+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===b.css(e,"display")||!b.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=b._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=b._data(r,"olddisplay",un(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&b._data(r,"olddisplay",i?n:b.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}b.fn.extend({css:function(e,n){return b.access(this,function(e,n,r){var i,o,a={},s=0;if(b.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=b.css(e,n[s],!1,o);return a}return r!==t?b.style(e,n,r):b.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){var t="boolean"==typeof e;return this.each(function(){(t?e:nn(this))?b(this).show():b(this).hide()})}}),b.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":b.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,u=b.camelCase(n),l=e.style;if(n=b.cssProps[u]||(b.cssProps[u]=tn(l,u)),s=b.cssHooks[n]||b.cssHooks[u],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:l[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(b.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||b.cssNumber[u]||(r+="px"),b.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(l[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{l[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,u=b.camelCase(n);return n=b.cssProps[u]||(b.cssProps[u]=tn(e.style,u)),s=b.cssHooks[n]||b.cssHooks[u],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||b.isNumeric(o)?o||0:a):a},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),u=s?s.getPropertyValue(n)||s[n]:t,l=e.style;return s&&(""!==u||b.contains(e.ownerDocument,e)||(u=b.style(e,n)),Yt.test(u)&&Ut.test(n)&&(i=l.width,o=l.minWidth,a=l.maxWidth,l.minWidth=l.maxWidth=l.width=u,u=s.width,l.width=i,l.minWidth=o,l.maxWidth=a)),u}):o.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),u=s?s[n]:t,l=e.style;return null==u&&l&&l[n]&&(u=l[n]),Yt.test(u)&&!zt.test(n)&&(i=l.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),l.left="fontSize"===n?"1em":u,u=l.pixelLeft+"px",l.left=i,a&&(o.left=a)),""===u?"auto":u});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=b.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=b.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=b.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=b.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=b.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=b.support.boxSizing&&"border-box"===b.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(b.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function un(e){var t=o,n=Gt[e];return n||(n=ln(e,t),"none"!==n&&n||(Pt=(Pt||b("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(Pt[0].contentWindow||Pt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=ln(e,t),Pt.detach()),Gt[e]=n),n}function ln(e,t){var n=b(t.createElement(e)).appendTo(t.body),r=b.css(n[0],"display");return n.remove(),r}b.each(["height","width"],function(e,n){b.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&Xt.test(b.css(e,"display"))?b.swap(e,Qt,function(){return sn(e,n,i)}):sn(e,n,i):t},set:function(e,t,r){var i=r&&Rt(e);return on(e,t,r?an(e,n,r,b.support.boxSizing&&"border-box"===b.css(e,"boxSizing",!1,i),i):0)}}}),b.support.opacity||(b.cssHooks.opacity={get:function(e,t){return It.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=b.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===b.trim(o.replace($t,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=$t.test(o)?o.replace($t,i):o+" "+i)}}),b(function(){b.support.reliableMarginRight||(b.cssHooks.marginRight={get:function(e,n){return n?b.swap(e,{display:"inline-block"},Wt,[e,"marginRight"]):t}}),!b.support.pixelPosition&&b.fn.position&&b.each(["top","left"],function(e,n){b.cssHooks[n]={get:function(e,r){return r?(r=Wt(e,n),Yt.test(r)?b(e).position()[n]+"px":r):t}}})}),b.expr&&b.expr.filters&&(b.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight||!b.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||b.css(e,"display"))},b.expr.filters.visible=function(e){return!b.expr.filters.hidden(e)}),b.each({margin:"",padding:"",border:"Width"},function(e,t){b.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+Zt[r]+t]=o[r]||o[r-2]||o[0];return i}},Ut.test(e)||(b.cssHooks[e+t].set=on)});var cn=/%20/g,pn=/\[\]$/,fn=/\r?\n/g,dn=/^(?:submit|button|image|reset|file)$/i,hn=/^(?:input|select|textarea|keygen)/i;b.fn.extend({serialize:function(){return b.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=b.prop(this,"elements");return e?b.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!b(this).is(":disabled")&&hn.test(this.nodeName)&&!dn.test(e)&&(this.checked||!Nt.test(e))}).map(function(e,t){var n=b(this).val();return null==n?null:b.isArray(n)?b.map(n,function(e){return{name:t.name,value:e.replace(fn,"\r\n")}}):{name:t.name,value:n.replace(fn,"\r\n")}}).get()}}),b.param=function(e,n){var r,i=[],o=function(e,t){t=b.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=b.ajaxSettings&&b.ajaxSettings.traditional),b.isArray(e)||e.jquery&&!b.isPlainObject(e))b.each(e,function(){o(this.name,this.value)});else for(r in e)gn(r,e[r],n,o);return i.join("&").replace(cn,"+")};function gn(e,t,n,r){var i;if(b.isArray(t))b.each(t,function(t,i){n||pn.test(e)?r(e,i):gn(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==b.type(t))r(e,t);else for(i in t)gn(e+"["+i+"]",t[i],n,r)}b.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){b.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),b.fn.hover=function(e,t){return this.mouseenter(e).mouseleave(t||e)};var mn,yn,vn=b.now(),bn=/\?/,xn=/#.*$/,wn=/([?&])_=[^&]*/,Tn=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Nn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Cn=/^(?:GET|HEAD)$/,kn=/^\/\//,En=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Sn=b.fn.load,An={},jn={},Dn="*/".concat("*");try{yn=a.href}catch(Ln){yn=o.createElement("a"),yn.href="",yn=yn.href}mn=En.exec(yn.toLowerCase())||[];function Hn(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(w)||[];if(b.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function qn(e,n,r,i){var o={},a=e===jn;function s(u){var l;return o[u]=!0,b.each(e[u]||[],function(e,u){var c=u(n,r,i);return"string"!=typeof c||a||o[c]?a?!(l=c):t:(n.dataTypes.unshift(c),s(c),!1)}),l}return s(n.dataTypes[0])||!o["*"]&&s("*")}function Mn(e,n){var r,i,o=b.ajaxSettings.flatOptions||{};for(i in n)n[i]!==t&&((o[i]?e:r||(r={}))[i]=n[i]);return r&&b.extend(!0,e,r),e}b.fn.load=function(e,n,r){if("string"!=typeof e&&Sn)return Sn.apply(this,arguments);var i,o,a,s=this,u=e.indexOf(" ");return u>=0&&(i=e.slice(u,e.length),e=e.slice(0,u)),b.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(a="POST"),s.length>0&&b.ajax({url:e,type:a,dataType:"html",data:n}).done(function(e){o=arguments,s.html(i?b("<div>").append(b.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},b.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){b.fn[t]=function(e){return this.on(t,e)}}),b.each(["get","post"],function(e,n){b[n]=function(e,r,i,o){return b.isFunction(r)&&(o=o||i,i=r,r=t),b.ajax({url:e,type:n,dataType:o,data:r,success:i})}}),b.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Nn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":b.parseJSON,"text xml":b.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Mn(Mn(e,b.ajaxSettings),t):Mn(b.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,u,l,c,p=b.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?b(f):b.event,h=b.Deferred(),g=b.Callbacks("once memory"),m=p.statusCode||{},y={},v={},x=0,T="canceled",N={readyState:0,getResponseHeader:function(e){var t;if(2===x){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===x?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return x||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return x||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>x)for(t in e)m[t]=[m[t],e[t]];else N.always(e[N.status]);return this},abort:function(e){var t=e||T;return l&&l.abort(t),k(0,t),this}};if(h.promise(N).complete=g.add,N.success=N.done,N.error=N.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=b.trim(p.dataType||"*").toLowerCase().match(w)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?80:443))==(mn[3]||("http:"===mn[1]?80:443)))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=b.param(p.data,p.traditional)),qn(An,p,n,N),2===x)return N;u=p.global,u&&0===b.active++&&b.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Cn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(b.lastModified[o]&&N.setRequestHeader("If-Modified-Since",b.lastModified[o]),b.etag[o]&&N.setRequestHeader("If-None-Match",b.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&N.setRequestHeader("Content-Type",p.contentType),N.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)N.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,N,p)===!1||2===x))return N.abort();T="abort";for(i in{success:1,error:1,complete:1})N[i](p[i]);if(l=qn(jn,p,n,N)){N.readyState=1,u&&d.trigger("ajaxSend",[N,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){N.abort("timeout")},p.timeout));try{x=1,l.send(y,k)}catch(C){if(!(2>x))throw C;k(-1,C)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,C=n;2!==x&&(x=2,s&&clearTimeout(s),l=t,a=i||"",N.readyState=e>0?4:0,r&&(w=_n(p,N,r)),e>=200&&300>e||304===e?(p.ifModified&&(T=N.getResponseHeader("Last-Modified"),T&&(b.lastModified[o]=T),T=N.getResponseHeader("etag"),T&&(b.etag[o]=T)),204===e?(c=!0,C="nocontent"):304===e?(c=!0,C="notmodified"):(c=Fn(p,w),C=c.state,y=c.data,v=c.error,c=!v)):(v=C,(e||!C)&&(C="error",0>e&&(e=0))),N.status=e,N.statusText=(n||C)+"",c?h.resolveWith(f,[y,C,N]):h.rejectWith(f,[N,C,v]),N.statusCode(m),m=t,u&&d.trigger(c?"ajaxSuccess":"ajaxError",[N,p,c?y:v]),g.fireWith(f,[N,C]),u&&(d.trigger("ajaxComplete",[N,p]),--b.active||b.event.trigger("ajaxStop")))}return N},getScript:function(e,n){return b.get(e,t,n,"script")},getJSON:function(e,t,n){return b.get(e,t,n,"json")}});function _n(e,n,r){var i,o,a,s,u=e.contents,l=e.dataTypes,c=e.responseFields;for(s in c)s in r&&(n[c[s]]=r[s]);while("*"===l[0])l.shift(),o===t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in u)if(u[s]&&u[s].test(o)){l.unshift(s);break}if(l[0]in r)a=l[0];else{for(s in r){if(!l[0]||e.converters[s+" "+l[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==l[0]&&l.unshift(a),r[a]):t}function Fn(e,t){var n,r,i,o,a={},s=0,u=e.dataTypes.slice(),l=u[0];if(e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u[1])for(i in e.converters)a[i.toLowerCase()]=e.converters[i];for(;r=u[++s];)if("*"!==r){if("*"!==l&&l!==r){if(i=a[l+" "+r]||a["* "+r],!i)for(n in a)if(o=n.split(" "),o[1]===r&&(i=a[l+" "+o[0]]||a["* "+o[0]])){i===!0?i=a[n]:a[n]!==!0&&(r=o[0],u.splice(s--,0,r));break}if(i!==!0)if(i&&e["throws"])t=i(t);else try{t=i(t)}catch(c){return{state:"parsererror",error:i?c:"No conversion from "+l+" to "+r}}}l=r}return{state:"success",data:t}}b.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return b.globalEval(e),e}}}),b.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),b.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=o.head||b("head")[0]||o.documentElement;return{send:function(t,i){n=o.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var On=[],Bn=/(=)\?(?=&|$)|\?\?/;b.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=On.pop()||b.expando+"_"+vn++;return this[e]=!0,e}}),b.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,u=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return u||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=b.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,u?n[u]=n[u].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||b.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,On.push(o)),s&&b.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}b.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=b.ajaxSettings.xhr(),b.support.cors=!!Rn&&"withCredentials"in Rn,Rn=b.support.ajax=!!Rn,Rn&&b.ajaxTransport(function(n){if(!n.crossDomain||b.support.cors){var r;return{send:function(i,o){var a,s,u=n.xhr();if(n.username?u.open(n.type,n.url,n.async,n.username,n.password):u.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)u[s]=n.xhrFields[s];n.mimeType&&u.overrideMimeType&&u.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)u.setRequestHeader(s,i[s])}catch(l){}u.send(n.hasContent&&n.data||null),r=function(e,i){var s,l,c,p;try{if(r&&(i||4===u.readyState))if(r=t,a&&(u.onreadystatechange=b.noop,$n&&delete Pn[a]),i)4!==u.readyState&&u.abort();else{p={},s=u.status,l=u.getAllResponseHeaders(),"string"==typeof u.responseText&&(p.text=u.responseText);try{c=u.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,l)},n.async?4===u.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},b(e).unload($n)),Pn[a]=r),u.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+x+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n,r,i=this.createTween(e,t),o=Yn.exec(t),a=i.cur(),s=+a||0,u=1,l=20;if(o){if(n=+o[2],r=o[3]||(b.cssNumber[e]?"":"px"),"px"!==r&&s){s=b.css(i.elem,e,!0)||n||1;do u=u||".5",s/=u,b.style(i.elem,e,s+r);while(u!==(u=i.cur()/a)&&1!==u&&--l)}i.unit=r,i.start=s,i.end=o[1]?s+(o[1]+1)*n:n}return i}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=b.now()}function Zn(e,t){b.each(t,function(t,n){var r=(Qn[t]||[]).concat(Qn["*"]),i=0,o=r.length;for(;o>i;i++)if(r[i].call(e,t,n))return})}function er(e,t,n){var r,i,o=0,a=Gn.length,s=b.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,a=0,u=l.tweens.length;for(;u>a;a++)l.tweens[a].run(o);return s.notifyWith(e,[l,o,n]),1>o&&u?n:(s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:b.extend({},t),opts:b.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=b.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)l.tweens[n].run(1);return t?s.resolveWith(e,[l,t]):s.rejectWith(e,[l,t]),this}}),c=l.props;for(tr(c,l.opts.specialEasing);a>o;o++)if(r=Gn[o].call(l,e,c,l.opts))return r;return Zn(l,c),b.isFunction(l.opts.start)&&l.opts.start.call(e,l),b.fx.timer(b.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function tr(e,t){var n,r,i,o,a;for(i in e)if(r=b.camelCase(i),o=t[r],n=e[i],b.isArray(n)&&(o=n[1],n=e[i]=n[0]),i!==r&&(e[r]=n,delete e[i]),a=b.cssHooks[r],a&&"expand"in a){n=a.expand(n),delete e[r];for(i in n)i in e||(e[i]=n[i],t[i]=o)}else t[r]=o}b.Animation=b.extend(er,{tweener:function(e,t){b.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,u,l,c,p,f=this,d=e.style,h={},g=[],m=e.nodeType&&nn(e);n.queue||(c=b._queueHooks(e,"fx"),null==c.unqueued&&(c.unqueued=0,p=c.empty.fire,c.empty.fire=function(){c.unqueued||p()}),c.unqueued++,f.always(function(){f.always(function(){c.unqueued--,b.queue(e,"fx").length||c.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[d.overflow,d.overflowX,d.overflowY],"inline"===b.css(e,"display")&&"none"===b.css(e,"float")&&(b.support.inlineBlockNeedsLayout&&"inline"!==un(e.nodeName)?d.zoom=1:d.display="inline-block")),n.overflow&&(d.overflow="hidden",b.support.shrinkWrapBlocks||f.always(function(){d.overflow=n.overflow[0],d.overflowX=n.overflow[1],d.overflowY=n.overflow[2]}));for(i in t)if(a=t[i],Vn.exec(a)){if(delete t[i],u=u||"toggle"===a,a===(m?"hide":"show"))continue;g.push(i)}if(o=g.length){s=b._data(e,"fxshow")||b._data(e,"fxshow",{}),"hidden"in s&&(m=s.hidden),u&&(s.hidden=!m),m?b(e).show():f.done(function(){b(e).hide()}),f.done(function(){var t;b._removeData(e,"fxshow");for(t in h)b.style(e,t,h[t])});for(i=0;o>i;i++)r=g[i],l=f.createTween(r,m?s[r]:0),h[r]=s[r]||b.style(e,r),r in s||(s[r]=l.start,m&&(l.end=l.start,l.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}b.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(b.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?b.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=b.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){b.fx.step[e.prop]?b.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[b.cssProps[e.prop]]||b.cssHooks[e.prop])?b.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scrollTop=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},b.each(["toggle","show","hide"],function(e,t){var n=b.fn[t];b.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),b.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=b.isEmptyObject(e),o=b.speed(t,n,r),a=function(){var t=er(this,b.extend({},e),o);a.finish=function(){t.stop(!0)},(i||b._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=b.timers,a=b._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&b.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=b._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=b.timers,a=r?r.length:0;for(n.finish=!0,b.queue(this,e,[]),i&&i.cur&&i.cur.finish&&i.cur.finish.call(this),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}b.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){b.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),b.speed=function(e,t,n){var r=e&&"object"==typeof e?b.extend({},e):{complete:n||!n&&t||b.isFunction(e)&&e,duration:e,easing:n&&t||t&&!b.isFunction(t)&&t};return r.duration=b.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in b.fx.speeds?b.fx.speeds[r.duration]:b.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){b.isFunction(r.old)&&r.old.call(this),r.queue&&b.dequeue(this,r.queue)},r},b.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},b.timers=[],b.fx=rr.prototype.init,b.fx.tick=function(){var e,n=b.timers,r=0;for(Xn=b.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||b.fx.stop(),Xn=t},b.fx.timer=function(e){e()&&b.timers.push(e)&&b.fx.start()},b.fx.interval=13,b.fx.start=function(){Un||(Un=setInterval(b.fx.tick,b.fx.interval))},b.fx.stop=function(){clearInterval(Un),Un=null},b.fx.speeds={slow:600,fast:200,_default:400},b.fx.step={},b.expr&&b.expr.filters&&(b.expr.filters.animated=function(e){return b.grep(b.timers,function(t){return e===t.elem}).length}),b.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){b.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,b.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},b.offset={setOffset:function(e,t,n){var r=b.css(e,"position");"static"===r&&(e.style.position="relative");var i=b(e),o=i.offset(),a=b.css(e,"top"),s=b.css(e,"left"),u=("absolute"===r||"fixed"===r)&&b.inArray("auto",[a,s])>-1,l={},c={},p,f;u?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),b.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(l.top=t.top-o.top+p),null!=t.left&&(l.left=t.left-o.left+f),"using"in t?t.using.call(e,l):i.css(l)}},b.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===b.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),b.nodeName(e[0],"html")||(n=e.offset()),n.top+=b.css(e[0],"borderTopWidth",!0),n.left+=b.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-b.css(r,"marginTop",!0),left:t.left-n.left-b.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||o.documentElement;while(e&&!b.nodeName(e,"html")&&"static"===b.css(e,"position"))e=e.offsetParent;return e||o.documentElement})}}),b.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);b.fn[e]=function(i){return b.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?b(a).scrollLeft():o,r?o:b(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return b.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}b.each({Height:"height",Width:"width"},function(e,n){b.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){b.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return b.access(this,function(n,r,i){var o;return b.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?b.css(n,r,s):b.style(n,r,i,s)},n,a?i:t,a,null)}})}),e.jQuery=e.$=b,"function"==typeof define&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return b})})(window);
\ No newline at end of file
diff --git a/yii/assets/yii.activeForm.js b/yii/assets/yii.activeForm.js
new file mode 100644
index 0000000..d987879
--- /dev/null
+++ b/yii/assets/yii.activeForm.js
@@ -0,0 +1,387 @@
+/**
+ * Yii form widget.
+ *
+ * This is the JavaScript widget used by the yii\widgets\ActiveForm widget.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+(function ($) {
+	
+	$.fn.yiiActiveForm = function (method) {
+		if (methods[method]) {
+			return methods[method].apply(this, Array.prototype.slice.call(arguments, 1));
+		} else if (typeof method === 'object' || !method) {
+			return methods.init.apply(this, arguments);
+		} else {
+			$.error('Method ' + method + ' does not exist on jQuery.yiiActiveForm');
+			return false;
+		}
+	};
+
+	var defaults = {
+		// the jQuery selector for the error summary
+		errorSummary: undefined,
+		// whether to perform validation before submitting the form.
+		validateOnSubmit: true,
+		// the container CSS class representing the corresponding attribute has validation error
+		errorCssClass: 'error',
+		// the container CSS class representing the corresponding attribute passes validation
+		successCssClass: 'success',
+		// the container CSS class representing the corresponding attribute is being validated
+		validatingCssClass: 'validating',
+		// the URL for performing AJAX-based validation. If not set, it will use the the form's action
+		validationUrl: undefined,
+		// a callback that is called before submitting the form. The signature of the callback should be:
+		// function ($form) { ...return false to cancel submission...}
+		beforeSubmit: undefined,
+		// a callback that is called before validating each attribute. The signature of the callback should be:
+		// function ($form, attribute, messages) { ...return false to cancel the validation...}
+		beforeValidate: undefined,
+		// the GET parameter name indicating an AJAX-based validation
+		ajaxVar: 'ajax'
+	};
+
+	var attributeDefaults = {
+		// attribute name or expression (e.g. "[0]content" for tabular input)
+		name: undefined,
+		// the jQuery selector of the container of the input field
+		container: undefined,
+		// the jQuery selector of the input field
+		input: undefined,
+		// the jQuery selector of the error tag
+		error: undefined,
+		// whether to perform validation when a change is detected on the input
+		validateOnChange: false,
+		// whether to perform validation when the user is typing.
+   		validateOnType: false,
+		// number of milliseconds that the validation should be delayed when a user is typing in the input field.
+		validationDelay: 200,
+		// whether to enable AJAX-based validation.
+		enableAjaxValidation: false,
+		// function (attribute, value, messages), the client-side validation function.
+		validate: undefined,
+		// status of the input field, 0: empty, not entered before, 1: validated, 2: pending validation, 3: validating
+		status: 0,
+		// the value of the input
+		value: undefined
+	};
+
+	var methods = {
+		init: function (attributes, options) {
+			return this.each(function () {
+				var $form = $(this);
+				if ($form.data('yiiActiveForm')) {
+					return;
+				}
+
+				var settings = $.extend({}, defaults, options || {});
+				if (settings.validationUrl === undefined) {
+					settings.validationUrl = $form.attr('action');
+				}
+				$.each(attributes, function (i) {
+					attributes[i] = $.extend({value: getValue($form, this)}, attributeDefaults, this);
+				});
+				$form.data('yiiActiveForm', {
+					settings: settings,
+					attributes: attributes,
+					submitting: false,
+					validated: false
+				});
+
+				watchAttributes($form, attributes);
+
+				/**
+				 * Clean up error status when the form is reset.
+				 * Note that $form.on('reset', ...) does work because the "reset" event does not bubble on IE.
+				 */
+				$form.bind('reset.yiiActiveForm', methods.resetForm);
+
+				if (settings.validateOnSubmit) {
+					$form.on('mouseup.yiiActiveForm keyup.yiiActiveForm', ':submit', function () {
+						$form.data('yiiActiveForm').submitObject = $(this);
+					});
+					$form.on('submit', methods.submitForm);
+				}
+			});
+		},
+
+		destroy: function () {
+			return this.each(function () {
+				$(window).unbind('.yiiActiveForm');
+				$(this).removeData('yiiActiveForm');
+			});
+		},
+
+		data: function() {
+			return this.data('yiiActiveForm');
+		},
+
+		submitForm: function () {
+			var $form = $(this),
+				data = $form.data('yiiActiveForm');
+			if (data.validated) {
+				// continue submitting the form since validation passes
+				data.validated = false;
+				return true;
+			}
+
+			if (data.settings.timer !== undefined) {
+				clearTimeout(data.settings.timer);
+			}
+			data.submitting = true;
+			if (!data.settings.beforeSubmit || data.settings.beforeSubmit($form)) {
+				validate($form, function (messages) {
+					var hasError = false;
+					$.each(data.attributes, function () {
+						hasError = updateInput($form, this, messages) || hasError;
+					});
+					updateSummary($form, messages);
+					if (!hasError) {
+						data.validated = true;
+						var $button = data.submitObject || $form.find(':submit:first');
+						// TODO: if the submission is caused by "change" event, it will not work
+						if ($button.length) {
+							$button.click();
+						} else {
+							// no submit button in the form
+							$form.submit();
+						}
+						return;
+					}
+					data.submitting = false;
+				}, function () {
+					data.submitting = false;
+				});
+			} else {
+				data.submitting = false;
+			}
+			return false;
+		},
+
+		resetForm: function () {
+			var $form = $(this);
+			var data = $form.data('yiiActiveForm');
+			// Because we bind directly to a form reset event instead of a reset button (that may not exist),
+			// when this function is executed form input values have not been reset yet.
+			// Therefore we do the actual reset work through setTimeout.
+			setTimeout(function () {
+				$.each(data.attributes, function () {
+					// Without setTimeout() we would get the input values that are not reset yet.
+					this.value = getValue($form, this);
+					this.status = 0;
+					var $container = $form.find(this.container);
+					$container.removeClass(
+						data.settings.validatingCssClass + ' ' +
+							data.settings.errorCssClass + ' ' +
+							data.settings.successCssClass
+					);
+					$container.find(this.error).html('');
+				});
+				$form.find(data.settings.summary).hide().find('ul').html('');
+			}, 1);
+		}
+	};
+
+	var watchAttributes = function ($form, attributes) {
+		$.each(attributes, function (i, attribute) {
+			var $input = findInput($form, attribute);
+			if (attribute.validateOnChange) {
+				$input.on('change.yiiActiveForm', function () {
+					validateAttribute($form, attribute, false);
+				}).on('blur.yiiActiveForm', function () {
+					if (attribute.status == 0 || attribute.status == 1) {
+						validateAttribute($form, attribute, !attribute.status);
+					}
+				});
+			}
+			if (attribute.validateOnType) {
+				$input.on('keyup.yiiActiveForm', function () {
+					if (attribute.value !== getValue($form, attribute)) {
+						validateAttribute($form, attribute, false);
+					}
+				});
+			}
+		});
+	};
+
+	var validateAttribute = function ($form, attribute, forceValidate) {
+		var data = $form.data('yiiActiveForm');
+
+		if (forceValidate) {
+			attribute.status = 2;
+		}
+		$.each(data.attributes, function () {
+			if (this.value !== getValue($form, this)) {
+				this.status = 2;
+				forceValidate = true;
+			}
+		});
+		if (!forceValidate) {
+			return;
+		}
+
+		if (data.settings.timer !== undefined) {
+			clearTimeout(data.settings.timer);
+		}
+		data.settings.timer = setTimeout(function () {
+			if (data.submitting || $form.is(':hidden')) {
+				return;
+			}
+			$.each(data.attributes, function () {
+				if (this.status === 2) {
+					this.status = 3;
+					$form.find(this.container).addClass(data.settings.validatingCssClass);
+				}
+			});
+			validate($form, function (messages) {
+				var hasError = false;
+				$.each(data.attributes, function () {
+					if (this.status === 2 || this.status === 3) {
+						hasError = updateInput($form, this, messages) || hasError;
+					}
+				});
+			});
+		}, data.settings.validationDelay);
+	};
+	
+	/**
+	 * Performs validation.
+	 * @param $form jQuery the jquery representation of the form
+	 * @param successCallback function the function to be invoked if the validation completes
+	 * @param errorCallback function the function to be invoked if the ajax validation request fails
+	 */
+	var validate = function ($form, successCallback, errorCallback) {
+		var data = $form.data('yiiActiveForm'),
+			needAjaxValidation = false,
+			messages = {};
+
+		$.each(data.attributes, function () {
+			if (data.submitting || this.status === 2 || this.status === 3) {
+				var msg = [];
+				if (!data.settings.beforeValidate || data.settings.beforeValidate($form, this, msg)) {
+					if (this.validate) {
+						this.validate(this, getValue($form, this), msg);
+					}
+					if (msg.length) {
+						messages[this.name] = msg;
+					} else if (this.enableAjaxValidation) {
+						needAjaxValidation = true;
+					}
+				}
+			}
+		});
+
+		if (needAjaxValidation && (!data.submitting || $.isEmptyObject(messages))) {
+			// Perform ajax validation when at least one input needs it.
+			// If the validation is triggered by form submission, ajax validation
+			// should be done only when all inputs pass client validation
+			var $button = data.submitObject,
+				extData = '&' + data.settings.ajaxVar + '=' + $form.attr('id');
+			if ($button && $button.length && $button.attr('name')) {
+				extData += '&' + $button.attr('name') + '=' + $button.attr('value');
+			}
+			$.ajax({
+				url: data.settings.validationUrl,
+				type: $form.attr('method'),
+				data: $form.serialize() + extData,
+				dataType: 'json',
+				success: function (msgs) {
+					if (msgs !== null && typeof msgs === 'object') {
+						$.each(data.attributes, function () {
+							if (!this.enableAjaxValidation) {
+								delete msgs[this.name];
+							}
+						});
+						successCallback($.extend({}, messages, msgs));
+					} else {
+						successCallback(messages);
+					}
+				},
+				error: errorCallback
+			});
+		} else if (data.submitting) {
+			// delay callback so that the form can be submitted without problem
+			setTimeout(function () {
+				successCallback(messages);
+			}, 200);
+		} else {
+			successCallback(messages);
+		}
+	};
+
+	/**
+	 * Updates the error message and the input container for a particular attribute.
+	 * @param $form the form jQuery object
+	 * @param attribute object the configuration for a particular attribute.
+	 * @param messages array the validation error messages
+	 * @return boolean whether there is a validation error for the specified attribute
+	 */
+	var updateInput = function ($form, attribute, messages) {
+		var data = $form.data('yiiActiveForm'),
+			$input = findInput($form, attribute),
+			hasError = false;
+
+		attribute.status = 1;
+		if ($input.length) {
+			hasError = messages && $.isArray(messages[attribute.name]) && messages[attribute.name].length;
+			var $container = $form.find(attribute.container);
+			var $error = $container.find(attribute.error);
+			if (hasError) {
+				$error.html(messages[attribute.name][0]);
+				$container.removeClass(data.settings.validatingCssClass + ' ' + data.settings.successCssClass)
+					.addClass(data.settings.errorCssClass);
+			} else {
+				$error.html('');
+				$container.removeClass(data.settings.validatingCssClass + ' ' + data.settings.errorCssClass + ' ')
+					.addClass(data.settings.successCssClass);
+			}
+			attribute.value = getValue($form, attribute);
+		}
+		return hasError;
+	};
+
+	/**
+	 * Updates the error summary.
+	 * @param $form the form jQuery object
+	 * @param messages array the validation error messages
+	 */
+	var updateSummary = function ($form, messages) {
+		var data = $form.data('yiiActiveForm'),
+			$summary = $form.find(data.settings.errorSummary),
+			content = '';
+
+		if ($summary.length && messages) {
+			$.each(data.attributes, function () {
+				if ($.isArray(messages[this.name]) && messages[this.name].length) {
+					content += '<li>' + messages[this.name][0] + '</li>';
+				}
+			});
+			$summary.toggle(content !== '').find('ul').html(content);
+		}
+	};
+
+	var getValue = function ($form, attribute) {
+		var $input = findInput($form, attribute);
+		var type = $input.attr('type');
+		if (type === 'checkbox' || type === 'radio') {
+			return $input.filter(':checked').val();
+		} else {
+			return $input.val();
+		}
+	};
+
+	var findInput = function ($form, attribute) {
+		var $input = $form.find(attribute.input);
+		if ($input.length && $input[0].tagName.toLowerCase() === 'div') {
+			// checkbox list or radio list
+			return $input.find('input');
+		} else {
+			return $input;
+		}
+	};
+
+})(window.jQuery);
diff --git a/yii/assets/yii.captcha.js b/yii/assets/yii.captcha.js
new file mode 100644
index 0000000..9211edb
--- /dev/null
+++ b/yii/assets/yii.captcha.js
@@ -0,0 +1,72 @@
+/**
+ * Yii Captcha widget.
+ *
+ * This is the JavaScript widget used by the yii\widgets\Captcha widget.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+(function ($) {
+	$.fn.yiiCaptcha = function (method) {
+		if (methods[method]) {
+			return methods[method].apply(this, Array.prototype.slice.call(arguments, 1));
+		} else if (typeof method === 'object' || !method) {
+			return methods.init.apply(this, arguments);
+		} else {
+			$.error('Method ' + method + ' does not exist on jQuery.yiiCaptcha');
+			return false;
+		}
+	};
+
+	var defaults = {
+		refreshUrl: undefined,
+		hashKey: undefined
+	};
+
+	var methods = {
+		init: function (options) {
+			return this.each(function () {
+				var $e = $(this);
+				var settings = $.extend({}, defaults, options || {});
+				$e.data('yiiCaptcha', {
+					settings: settings
+				});
+
+				$e.on('click.yiiCaptcha', function() {
+					methods.refresh.apply($e);
+					return false;
+				});
+
+			});
+		},
+
+		refresh: function () {
+			var $e = this,
+				settings = this.data('yiiCaptcha').settings;
+			$.ajax({
+				url: $e.data('yiiCaptcha').settings.refreshUrl,
+				dataType: 'json',
+				cache: false,
+				success: function(data) {
+					$e.attr('src', data['url']);
+					$('body').data(settings.hashKey, [data['hash1'], data['hash2']]);
+				}
+			});
+		},
+
+		destroy: function () {
+			return this.each(function () {
+				$(window).unbind('.yiiCaptcha');
+				$(this).removeData('yiiCaptcha');
+			});
+		},
+
+		data: function() {
+			return this.data('yiiCaptcha');
+		}
+	};
+})(window.jQuery);
+
diff --git a/yii/assets/yii.debug.js b/yii/assets/yii.debug.js
new file mode 100644
index 0000000..4e32d89
--- /dev/null
+++ b/yii/assets/yii.debug.js
@@ -0,0 +1,26 @@
+/**
+ * Yii debug module.
+ *
+ * This JavaScript module provides the functions needed by the Yii debug toolbar.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+
+yii.debug = (function ($) {
+	return {
+		load: function (id, url) {
+			$.ajax({
+				url: url,
+				//dataType: 'json',
+				success: function(data) {
+					var $e = $('#' + id);
+					$e.html(data);
+				}
+			});
+		}
+	};
+})(jQuery);
diff --git a/yii/assets/yii.js b/yii/assets/yii.js
new file mode 100644
index 0000000..1e847c4
--- /dev/null
+++ b/yii/assets/yii.js
@@ -0,0 +1,65 @@
+/**
+ * Yii JavaScript module.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+
+/**
+ * yii is the root module for all Yii JavaScript modules.
+ * It implements a mechanism of organizing JavaScript code in modules through the function "yii.initModule()".
+ *
+ * Each module should be named as "x.y.z", where "x" stands for the root module (for the Yii core code, this is "yii").
+ *
+ * A module may be structured as follows:
+ *
+ * ~~~
+ * yii.sample = (function($) {
+ *     var pub = {
+ *         // whether this module is currently active. If false, init() will not be called for this module
+ *         // it will also not be called for all its child modules. If this property is undefined, it means true.
+ *         isActive: true,
+ *         init: function() {
+ *             // ... module initialization code go here ...
+ *         },
+ *
+ *         // ... other public functions and properties go here ...
+ *     };
+ *
+ *     // ... private functions and properties go here ...
+ *
+ *     return pub;
+ * });
+ * ~~~
+ *
+ * Using this structure, you can define public and private functions/properties for a module.
+ * Private functions/properties are only visible within the module, while public functions/properties
+ * may be accessed outside of the module. For example, you can access "yii.sample.init()".
+ *
+ * You must call "yii.initModule()" once for the root module of all your modules.
+ */
+yii = (function ($) {
+	var pub = {
+		version: '2.0',
+		initModule: function (module) {
+			if (module.isActive === undefined || module.isActive) {
+				if ($.isFunction(module.init)) {
+					module.init();
+				}
+				$.each(module, function () {
+					if ($.isPlainObject(this)) {
+						pub.initModule(this);
+					}
+				});
+			}
+		}
+	};
+	return pub;
+})(jQuery);
+
+jQuery(document).ready(function () {
+	yii.initModule(yii);
+});
diff --git a/yii/assets/yii.validation.js b/yii/assets/yii.validation.js
new file mode 100644
index 0000000..5fa8492
--- /dev/null
+++ b/yii/assets/yii.validation.js
@@ -0,0 +1,198 @@
+/**
+ * Yii validation module.
+ *
+ * This JavaScript module provides the validation methods for the built-in validators.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+
+yii.validation = (function ($) {
+	var isEmpty = function (value, trim) {
+		return value === null || value === undefined || value == []
+			|| value === '' || trim && $.trim(value) === '';
+	};
+
+	return {
+		required: function (value, messages, options) {
+			var valid = false;
+			if (options.requiredValue === undefined) {
+				if (options.strict && value !== undefined || !options.strict && !isEmpty(value, true)) {
+					valid = true;
+				}
+			} else if (!options.strict && value == options.requiredValue || options.strict && value === options.requiredValue) {
+				valid = true;
+			}
+
+			if (!valid) {
+				messages.push(options.message);
+			}
+		},
+
+		boolean: function (value, messages, options) {
+			if (options.skipOnEmpty && isEmpty(value)) {
+				return;
+			}
+			var valid = !options.strict && (value == options.trueValue || value == options.falseValue)
+				|| options.strict && (value === options.trueValue || value === options.falseValue);
+
+			if (!valid) {
+				messages.push(options.message);
+			}
+		},
+
+		string: function (value, messages, options) {
+			if (options.skipOnEmpty && isEmpty(value)) {
+				return;
+			}
+
+			if (typeof value !== 'string') {
+				messages.push(options.message);
+				return;
+			}
+
+			if (options.min !== undefined && value.length < options.min) {
+				messages.push(options.tooShort);
+			}
+			if (options.max !== undefined && value.length > options.max) {
+				messages.push(options.tooLong);
+			}
+			if (options.is !== undefined && value.length != options.is) {
+				messages.push(options.is);
+			}
+		},
+
+		number: function (value, messages, options) {
+			if (options.skipOnEmpty && isEmpty(value)) {
+				return;
+			}
+
+			if (typeof value === 'string' && !value.match(options.pattern)) {
+				messages.push(options.message);
+				return;
+			}
+
+			if (options.min !== undefined && value < options.min) {
+				messages.push(options.tooSmall);
+			}
+			if (options.max !== undefined && value > options.max) {
+				messages.push(options.tooBig);
+			}
+		},
+
+		range: function (value, messages, options) {
+			if (options.skipOnEmpty && isEmpty(value)) {
+				return;
+			}
+			var valid = !options.not && $.inArray(value, options.range)
+				|| options.not && !$.inArray(value, options.range);
+
+			if (!valid) {
+				messages.push(options.message);
+			}
+		},
+
+		regularExpression: function (value, messages, options) {
+			if (options.skipOnEmpty && isEmpty(value)) {
+				return;
+			}
+
+			if (!options.not && !value.match(options.pattern) || options.not && value.match(options.pattern)) {
+				messages.push(options.message)
+			}
+		},
+
+		email: function (value, messages, options) {
+			if (options.skipOnEmpty && isEmpty(value)) {
+				return;
+			}
+
+			var valid = value.match(options.pattern) && (!options.allowName || value.match(options.fullPattern));
+
+			if (!valid) {
+				messages.push(options.message);
+			}
+		},
+
+		url: function (value, messages, options) {
+			if (options.skipOnEmpty && isEmpty(value)) {
+				return;
+			}
+
+			if (options.defaultScheme && !value.match(/:\/\//)) {
+				value = options.defaultScheme + '://' + value;
+			}
+
+			if (!value.match(options.pattern)) {
+				messages.push(options.message);
+			}
+		},
+
+		captcha: function (value, messages, options) {
+			if (options.skipOnEmpty && isEmpty(value)) {
+				return;
+			}
+
+			// CAPTCHA may be updated via AJAX and the updated hash is stored in body data
+			var hash = $('body').data(options.hashKey);
+			if (hash == null) {
+				hash = options.hash;
+			} else {
+				hash = hash[options.caseSensitive ? 0 : 1];
+			}
+			var v = options.caseSensitive ? value : value.toLowerCase();
+			for (var i = v.length - 1, h = 0; i >= 0; --i) {
+				h += v.charCodeAt(i);
+			}
+			if (h != hash) {
+				messages.push(options.message);
+			}
+		},
+
+		compare: function (value, messages, options) {
+			if (options.skipOnEmpty && isEmpty(value)) {
+				return;
+			}
+
+			var compareValue, valid = true;
+			if (options.compareAttribute === undefined) {
+				compareValue = options.compareValue;
+			} else {
+				compareValue = $('#' + options.compareAttribute).val();
+			}
+			switch (options.operator) {
+				case '==':
+					valid = value == compareValue;
+					break;
+				case '===':
+					valid = value === compareValue;
+					break;
+				case '!=':
+					valid = value != compareValue;
+					break;
+				case '!==':
+					valid = value !== compareValue;
+					break;
+				case '>':
+					valid = value > compareValue;
+					break;
+				case '>=':
+					valid = value >= compareValue;
+					break;
+				case '<':
+					valid = value < compareValue;
+					break;
+				case '<=':
+					valid = value <= compareValue;
+					break;
+			}
+
+			if (!valid) {
+				messages.push(options.message);
+			}
+		}
+	};
+})(jQuery);
diff --git a/yii/base/Action.php b/yii/base/Action.php
new file mode 100644
index 0000000..7142539
--- /dev/null
+++ b/yii/base/Action.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+/**
+ * Action is the base class for all controller action classes.
+ *
+ * Action provides a way to divide a complex controller into
+ * smaller actions in separate class files.
+ *
+ * Derived classes must implement a method named `run()`. This method
+ * will be invoked by the controller when the action is requested.
+ * The `run()` method can have parameters which will be filled up
+ * with user input values automatically according to their names.
+ * For example, if the `run()` method is declared as follows:
+ *
+ * ~~~
+ * public function run($id, $type = 'book') { ... }
+ * ~~~
+ *
+ * And the parameters provided for the action are: `array('id' => 1)`.
+ * Then the `run()` method will be invoked as `run(1)` automatically.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Action extends Component
+{
+	/**
+	 * @var string ID of the action
+	 */
+	public $id;
+	/**
+	 * @var Controller the controller that owns this action
+	 */
+	public $controller;
+
+	/**
+	 * Constructor.
+	 * @param string $id the ID of this action
+	 * @param Controller $controller the controller that owns this action
+	 * @param array $config name-value pairs that will be used to initialize the object properties
+	 */
+	public function __construct($id, $controller, $config = array())
+	{
+		$this->id = $id;
+		$this->controller = $controller;
+		parent::__construct($config);
+	}
+
+	/**
+	 * Returns the unique ID of this action among the whole application.
+	 * @return string the unique ID of this action among the whole application.
+	 */
+	public function getUniqueId()
+	{
+		return $this->controller->getUniqueId() . '/' . $this->id;
+	}
+
+	/**
+	 * Runs this action with the specified parameters.
+	 * This method is mainly invoked by the controller.
+	 * @param array $params the parameters to be bound to the action's run() method.
+	 * @return integer the exit status (0 means normal, non-zero means abnormal).
+	 * @throws InvalidConfigException if the action class does not have a run() method
+	 */
+	public function runWithParams($params)
+	{
+		if (!method_exists($this, 'run')) {
+			throw new InvalidConfigException(get_class($this) . ' must define a "run()" method.');
+		}
+		$args = $this->controller->bindActionParams($this, $params);
+		return (int)call_user_func_array(array($this, 'run'), $args);
+	}
+}
diff --git a/yii/base/ActionEvent.php b/yii/base/ActionEvent.php
new file mode 100644
index 0000000..9507b12
--- /dev/null
+++ b/yii/base/ActionEvent.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+/**
+ * ActionEvent represents the event parameter used for an action event.
+ *
+ * By setting the [[isValid]] property, one may control whether to continue running the action.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class ActionEvent extends Event
+{
+	/**
+	 * @var Action the action currently being executed
+	 */
+	public $action;
+	/**
+	 * @var boolean whether to continue running the action. Event handlers of
+	 * [[Controller::EVENT_BEFORE_ACTION]] may set this property to decide whether
+	 * to continue running the current action.
+	 */
+	public $isValid = true;
+
+	/**
+	 * Constructor.
+	 * @param Action $action the action associated with this action event.
+	 * @param array $config name-value pairs that will be used to initialize the object properties
+	 */
+	public function __construct($action, $config = array())
+	{
+		$this->action = $action;
+		parent::__construct($config);
+	}
+}
diff --git a/yii/base/ActionFilter.php b/yii/base/ActionFilter.php
new file mode 100644
index 0000000..d69c0fe
--- /dev/null
+++ b/yii/base/ActionFilter.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class ActionFilter extends Behavior
+{
+	/**
+	 * @var array list of action IDs that this filter should apply to. If this property is not set,
+	 * then the filter applies to all actions, unless they are listed in [[except]].
+	 */
+	public $only;
+	/**
+	 * @var array list of action IDs that this filter should not apply to.
+	 */
+	public $except = array();
+
+	/**
+	 * Declares event handlers for the [[owner]]'s events.
+	 * @return array events (array keys) and the corresponding event handler methods (array values).
+	 */
+	public function events()
+	{
+		return array(
+			'beforeAction' => 'beforeFilter',
+			'afterAction' => 'afterFilter',
+		);
+	}
+
+	/**
+	 * @param ActionEvent $event
+	 * @return boolean
+	 */
+	public function beforeFilter($event)
+	{
+		if ($this->isActive($event->action)) {
+			$event->isValid = $this->beforeAction($event->action);
+		}
+		return $event->isValid;
+	}
+
+	/**
+	 * @param ActionEvent $event
+	 * @return boolean
+	 */
+	public function afterFilter($event)
+	{
+		if ($this->isActive($event->action)) {
+			$this->afterAction($event->action);
+		}
+	}
+
+	/**
+	 * This method is invoked right before an action is to be executed (after all possible filters.)
+	 * You may override this method to do last-minute preparation for the action.
+	 * @param Action $action the action to be executed.
+	 * @return boolean whether the action should continue to be executed.
+	 */
+	public function beforeAction($action)
+	{
+		return true;
+	}
+
+	/**
+	 * This method is invoked right after an action is executed.
+	 * You may override this method to do some postprocessing for the action.
+	 * @param Action $action the action just executed.
+	 */
+	public function afterAction($action)
+	{
+	}
+
+	/**
+	 * Returns a value indicating whether the filer is active for the given action.
+	 * @param Action $action the action being filtered
+	 * @return boolean whether the filer is active for the given action.
+	 */
+	protected function isActive($action)
+	{
+		return !in_array($action->id, $this->except, true) && (empty($this->only) || in_array($action->id, $this->only, true));
+	}
+}
diff --git a/yii/base/Application.php b/yii/base/Application.php
new file mode 100644
index 0000000..ac7cc6a
--- /dev/null
+++ b/yii/base/Application.php
@@ -0,0 +1,463 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+use Yii;
+
+/**
+ * Application is the base class for all application classes.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Application extends Module
+{
+	const EVENT_BEFORE_REQUEST = 'beforeRequest';
+	const EVENT_AFTER_REQUEST = 'afterRequest';
+	/**
+	 * @var string the application name.
+	 */
+	public $name = 'My Application';
+	/**
+	 * @var string the version of this application.
+	 */
+	public $version = '1.0';
+	/**
+	 * @var string the charset currently used for the application.
+	 */
+	public $charset = 'UTF-8';
+	/**
+	 * @var string the language that is meant to be used for end users.
+	 * @see sourceLanguage
+	 */
+	public $language = 'en_US';
+	/**
+	 * @var string the language that the application is written in. This mainly refers to
+	 * the language that the messages and view files are written in.
+	 * @see language
+	 */
+	public $sourceLanguage = 'en_US';
+	/**
+	 * @var array IDs of the components that need to be loaded when the application starts.
+	 */
+	public $preload = array();
+	/**
+	 * @var \yii\web\Controller|\yii\console\Controller the currently active controller instance
+	 */
+	public $controller;
+	/**
+	 * @var mixed the layout that should be applied for views in this application. Defaults to 'main'.
+	 * If this is false, layout will be disabled.
+	 */
+	public $layout = 'main';
+
+	private $_ended = false;
+
+	/**
+	 * @var string Used to reserve memory for fatal error handler.
+	 */
+	private $_memoryReserve;
+
+	/**
+	 * Constructor.
+	 * @param array $config name-value pairs that will be used to initialize the object properties.
+	 * Note that the configuration must contain both [[id]] and [[basePath]].
+	 * @throws InvalidConfigException if either [[id]] or [[basePath]] configuration is missing.
+	 */
+	public function __construct($config = array())
+	{
+		Yii::$app = $this;
+
+		if (!isset($config['id'])) {
+			throw new InvalidConfigException('The "id" configuration is required.');
+		}
+
+		if (isset($config['basePath'])) {
+			$this->setBasePath($config['basePath']);
+			Yii::setAlias('@app', $this->getBasePath());
+			unset($config['basePath']);
+		} else {
+			throw new InvalidConfigException('The "basePath" configuration is required.');
+		}
+
+		$this->registerErrorHandlers();
+		$this->registerCoreComponents();
+
+		Component::__construct($config);
+	}
+
+	/**
+	 * Registers error handlers.
+	 */
+	public function registerErrorHandlers()
+	{
+		if (YII_ENABLE_ERROR_HANDLER) {
+			ini_set('display_errors', 0);
+			set_exception_handler(array($this, 'handleException'));
+			set_error_handler(array($this, 'handleError'), error_reporting());
+		}
+	}
+
+	/**
+	 * Terminates the application.
+	 * This method replaces PHP's exit() function by calling [[afterRequest()]] before exiting.
+	 * @param integer $status exit status (value 0 means normal exit while other values mean abnormal exit).
+	 * @param boolean $exit whether to exit the current request.
+	 * It defaults to true, meaning the PHP's exit() function will be called at the end of this method.
+	 */
+	public function end($status = 0, $exit = true)
+	{
+		if (!$this->_ended) {
+			$this->_ended = true;
+			$this->afterRequest();
+		}
+
+		$this->handleFatalError();
+
+		if ($exit) {
+			exit($status);
+		}
+	}
+
+	/**
+	 * Runs the application.
+	 * This is the main entrance of an application.
+	 * @return integer the exit status (0 means normal, non-zero values mean abnormal)
+	 */
+	public function run()
+	{
+		$this->beforeRequest();
+		// Allocating twice more than required to display memory exhausted error
+		// in case of trying to allocate last 1 byte while all memory is taken.
+		$this->_memoryReserve = str_repeat('x', 1024 * 256);
+		register_shutdown_function(array($this, 'end'), 0, false);
+		$status = $this->processRequest();
+		$this->afterRequest();
+		return $status;
+	}
+
+	/**
+	 * Raises the [[EVENT_BEFORE_REQUEST]] event right BEFORE the application processes the request.
+	 */
+	public function beforeRequest()
+	{
+		$this->trigger(self::EVENT_BEFORE_REQUEST);
+	}
+
+	/**
+	 * Raises the [[EVENT_AFTER_REQUEST]] event right AFTER the application processes the request.
+	 */
+	public function afterRequest()
+	{
+		$this->trigger(self::EVENT_AFTER_REQUEST);
+	}
+
+	/**
+	 * Processes the request.
+	 * Child classes should override this method with actual request processing logic.
+	 * @return integer the exit status of the controller action (0 means normal, non-zero values mean abnormal)
+	 */
+	public function processRequest()
+	{
+		return 0;
+	}
+
+	private $_runtimePath;
+
+	/**
+	 * Returns the directory that stores runtime files.
+	 * @return string the directory that stores runtime files. Defaults to 'protected/runtime'.
+	 */
+	public function getRuntimePath()
+	{
+		if ($this->_runtimePath === null) {
+			$this->setRuntimePath($this->getBasePath() . DIRECTORY_SEPARATOR . 'runtime');
+		}
+		return $this->_runtimePath;
+	}
+
+	/**
+	 * Sets the directory that stores runtime files.
+	 * @param string $path the directory that stores runtime files.
+	 * @throws InvalidConfigException if the directory does not exist or is not writable
+	 */
+	public function setRuntimePath($path)
+	{
+		$path = Yii::getAlias($path);
+		if (is_dir($path) && is_writable($path)) {
+			$this->_runtimePath = $path;
+		} else {
+			throw new InvalidConfigException("Runtime path must be a directory writable by the Web server process: $path");
+		}
+	}
+
+	private $_vendorPath;
+
+	/**
+	 * Returns the directory that stores vendor files.
+	 * @return string the directory that stores vendor files. Defaults to 'protected/vendor'.
+	 */
+	public function getVendorPath()
+	{
+		if ($this->_vendorPath === null) {
+			$this->setVendorPath($this->getBasePath() . DIRECTORY_SEPARATOR . 'vendor');
+		}
+		return $this->_vendorPath;
+	}
+
+	/**
+	 * Sets the directory that stores vendor files.
+	 * @param string $path the directory that stores vendor files.
+	 */
+	public function setVendorPath($path)
+	{
+		$this->_vendorPath = Yii::getAlias($path);
+	}
+
+	/**
+	 * Returns the time zone used by this application.
+	 * This is a simple wrapper of PHP function date_default_timezone_get().
+	 * @return string the time zone used by this application.
+	 * @see http://php.net/manual/en/function.date-default-timezone-get.php
+	 */
+	public function getTimeZone()
+	{
+		return date_default_timezone_get();
+	}
+
+	/**
+	 * Sets the time zone used by this application.
+	 * This is a simple wrapper of PHP function date_default_timezone_set().
+	 * @param string $value the time zone used by this application.
+	 * @see http://php.net/manual/en/function.date-default-timezone-set.php
+	 */
+	public function setTimeZone($value)
+	{
+		date_default_timezone_set($value);
+	}
+
+	/**
+	 * Returns the database connection component.
+	 * @return \yii\db\Connection the database connection
+	 */
+	public function getDb()
+	{
+		return $this->getComponent('db');
+	}
+
+	/**
+	 * Returns the error handler component.
+	 * @return ErrorHandler the error handler application component.
+	 */
+	public function getErrorHandler()
+	{
+		return $this->getComponent('errorHandler');
+	}
+
+	/**
+	 * Returns the cache component.
+	 * @return \yii\caching\Cache the cache application component. Null if the component is not enabled.
+	 */
+	public function getCache()
+	{
+		return $this->getComponent('cache');
+	}
+
+	/**
+	 * Returns the request component.
+	 * @return \yii\web\Request|\yii\console\Request the request component
+	 */
+	public function getRequest()
+	{
+		return $this->getComponent('request');
+	}
+
+	/**
+	 * Returns the view object.
+	 * @return View the view object that is used to render various view files.
+	 */
+	public function getView()
+	{
+		return $this->getComponent('view');
+	}
+
+	/**
+	 * Returns the URL manager for this application.
+	 * @return \yii\web\UrlManager the URL manager for this application.
+	 */
+	public function getUrlManager()
+	{
+		return $this->getComponent('urlManager');
+	}
+
+	/**
+	 * Returns the internationalization (i18n) component
+	 * @return \yii\i18n\I18N the internationalization component
+	 */
+	public function getI18N()
+	{
+		return $this->getComponent('i18n');
+	}
+
+	/**
+	 * @return null|Component
+	 * @todo
+	 */
+	public function getAuthManager()
+	{
+		return $this->getComponent('auth');
+	}
+
+	/**
+	 * Registers the core application components.
+	 * @see setComponents
+	 */
+	public function registerCoreComponents()
+	{
+		$this->setComponents(array(
+			'errorHandler' => array(
+				'class' => 'yii\base\ErrorHandler',
+			),
+			'i18n' => array(
+				'class' => 'yii\i18n\I18N',
+			),
+			'urlManager' => array(
+				'class' => 'yii\web\UrlManager',
+			),
+			'view' => array(
+				'class' => 'yii\base\View',
+			),
+		));
+	}
+
+	/**
+	 * Handles uncaught PHP exceptions.
+	 *
+	 * This method is implemented as a PHP exception handler. It requires
+	 * that constant YII_ENABLE_ERROR_HANDLER be defined true.
+	 *
+	 * @param \Exception $exception exception that is not caught
+	 */
+	public function handleException($exception)
+	{
+		// disable error capturing to avoid recursive errors while handling exceptions
+		restore_error_handler();
+		restore_exception_handler();
+
+		try {
+			$this->logException($exception);
+
+			if (($handler = $this->getErrorHandler()) !== null) {
+				$handler->handle($exception);
+			} else {
+				$this->renderException($exception);
+			}
+
+			$this->end(1);
+
+		} catch (\Exception $e) {
+			// exception could be thrown in end() or ErrorHandler::handle()
+			$msg = (string)$e;
+			$msg .= "\nPrevious exception:\n";
+			$msg .= (string)$exception;
+			if (YII_DEBUG) {
+				echo $msg;
+			}
+			$msg .= "\n\$_SERVER = " . var_export($_SERVER, true);
+			error_log($msg);
+			exit(1);
+		}
+	}
+
+	/**
+	 * Handles PHP execution errors such as warnings, notices.
+	 *
+	 * This method is used as a PHP error handler. It will simply raise an `ErrorException`.
+	 *
+	 * @param integer $code the level of the error raised
+	 * @param string $message the error message
+	 * @param string $file the filename that the error was raised in
+	 * @param integer $line the line number the error was raised at
+	 *
+	 * @throws ErrorException
+	 */
+	public function handleError($code, $message, $file, $line)
+	{
+		if (error_reporting() !== 0) {
+			$exception = new ErrorException($message, $code, $code, $file, $line);
+
+			// in case error appeared in __toString method we can't throw any exception
+			$trace = debug_backtrace(false);
+			array_shift($trace);
+			foreach ($trace as $frame) {
+				if ($frame['function'] == '__toString') {
+					$this->handleException($exception);
+				}
+			}
+
+			throw $exception;
+		}
+	}
+
+	/**
+	 * Handles fatal PHP errors
+	 */
+	public function handleFatalError()
+	{
+		if (YII_ENABLE_ERROR_HANDLER) {
+			$error = error_get_last();
+
+			if (ErrorException::isFatalError($error)) {
+				unset($this->_memoryReserve);
+				$exception = new ErrorException($error['message'], $error['type'], $error['type'], $error['file'], $error['line']);
+				// use error_log because it's too late to use Yii log
+				error_log($exception);
+
+				if (($handler = $this->getErrorHandler()) !== null) {
+					$handler->handle($exception);
+				} else {
+					$this->renderException($exception);
+				}
+
+				exit(1);
+			}
+		}
+	}
+
+	/**
+	 * Renders an exception without using rich format.
+	 * @param \Exception $exception the exception to be rendered.
+	 */
+	public function renderException($exception)
+	{
+		if ($exception instanceof Exception && ($exception instanceof UserException || !YII_DEBUG)) {
+			$message = $exception->getName() . ': ' . $exception->getMessage();
+		} else {
+			$message = YII_DEBUG ? (string)$exception : 'Error: ' . $exception->getMessage();
+		}
+		if (PHP_SAPI) {
+			echo $message . "\n";
+		} else {
+			echo '<pre>' . htmlspecialchars($message, ENT_QUOTES, $this->charset) . '</pre>';
+		}
+	}
+
+	// todo: to be polished
+	protected function logException($exception)
+	{
+		$category = get_class($exception);
+		if ($exception instanceof HttpException) {
+			/** @var $exception HttpException */
+			$category .= '\\' . $exception->statusCode;
+		} elseif ($exception instanceof \ErrorException) {
+			/** @var $exception \ErrorException */
+			$category .= '\\' . $exception->getSeverity();
+		}
+		Yii::error((string)$exception, $category);
+	}
+}
diff --git a/yii/base/Behavior.php b/yii/base/Behavior.php
new file mode 100644
index 0000000..abe08bb
--- /dev/null
+++ b/yii/base/Behavior.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+/**
+ * Behavior is the base class for all behavior classes.
+ *
+ * A behavior can be used to enhance the functionality of an existing component without modifying its code.
+ * In particular, it can "inject" its own methods and properties into the component
+ * and make them directly accessible via the component. It can also respond to the events triggered in the component
+ * and thus intercept the normal code execution.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Behavior extends \yii\base\Object
+{
+	/**
+	 * @var Component the owner of this behavior
+	 */
+	public $owner;
+
+	/**
+	 * Declares event handlers for the [[owner]]'s events.
+	 *
+	 * Child classes may override this method to declare what PHP callbacks should
+	 * be attached to the events of the [[owner]] component.
+	 *
+	 * The callbacks will be attached to the [[owner]]'s events when the behavior is
+	 * attached to the owner; and they will be detached from the events when
+	 * the behavior is detached from the component.
+	 *
+	 * The callbacks can be any of the followings:
+	 *
+	 * - method in this behavior: `'handleClick'`, equivalent to `array($this, 'handleClick')`
+	 * - object method: `array($object, 'handleClick')`
+	 * - static method: `array('Page', 'handleClick')`
+	 * - anonymous function: `function($event) { ... }`
+	 *
+	 * The following is an example:
+	 *
+	 * ~~~
+	 * array(
+	 *	 'beforeValidate' => 'myBeforeValidate',
+	 *	 'afterValidate' => 'myAfterValidate',
+	 * )
+	 * ~~~
+	 *
+	 * @return array events (array keys) and the corresponding event handler methods (array values).
+	 */
+	public function events()
+	{
+		return array();
+	}
+
+	/**
+	 * Attaches the behavior object to the component.
+	 * The default implementation will set the [[owner]] property
+	 * and attach event handlers as declared in [[events]].
+	 * Make sure you call the parent implementation if you override this method.
+	 * @param Component $owner the component that this behavior is to be attached to.
+	 */
+	public function attach($owner)
+	{
+		$this->owner = $owner;
+		foreach ($this->events() as $event => $handler) {
+			$owner->on($event, is_string($handler) ? array($this, $handler) : $handler);
+		}
+	}
+
+	/**
+	 * Detaches the behavior object from the component.
+	 * The default implementation will unset the [[owner]] property
+	 * and detach event handlers declared in [[events]].
+	 * Make sure you call the parent implementation if you override this method.
+	 */
+	public function detach()
+	{
+		if ($this->owner) {
+			foreach ($this->events() as $event => $handler) {
+				$this->owner->off($event, is_string($handler) ? array($this, $handler) : $handler);
+			}
+			$this->owner = null;
+		}
+	}
+}
diff --git a/yii/base/Component.php b/yii/base/Component.php
new file mode 100644
index 0000000..8e75835
--- /dev/null
+++ b/yii/base/Component.php
@@ -0,0 +1,555 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+use Yii;
+
+/**
+ * @include @yii/base/Component.md
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Component extends Object
+{
+	/**
+	 * @var array the attached event handlers (event name => handlers)
+	 */
+	private $_events;
+	/**
+	 * @var Behavior[] the attached behaviors (behavior name => behavior)
+	 */
+	private $_behaviors;
+
+	/**
+	 * Returns the value of a component property.
+	 * This method will check in the following order and act accordingly:
+	 *
+	 *  - a property defined by a getter: return the getter result
+	 *  - a property of a behavior: return the behavior property value
+	 *
+	 * Do not call this method directly as it is a PHP magic method that
+	 * will be implicitly called when executing `$value = $component->property;`.
+	 * @param string $name the property name
+	 * @return mixed the property value, event handlers attached to the event,
+	 * the behavior, or the value of a behavior's property
+	 * @throws UnknownPropertyException if the property is not defined
+	 * @see __set
+	 */
+	public function __get($name)
+	{
+		$getter = 'get' . $name;
+		if (method_exists($this, $getter)) {
+			// read property, e.g. getName()
+			return $this->$getter();
+		} else {
+			// behavior property
+			$this->ensureBehaviors();
+			foreach ($this->_behaviors as $behavior) {
+				if ($behavior->canGetProperty($name)) {
+					return $behavior->$name;
+				}
+			}
+		}
+		throw new UnknownPropertyException('Getting unknown property: ' . get_class($this) . '::' . $name);
+	}
+
+	/**
+	 * Sets the value of a component property.
+	 * This method will check in the following order and act accordingly:
+	 *
+	 *  - a property defined by a setter: set the property value
+	 *  - an event in the format of "on xyz": attach the handler to the event "xyz"
+	 *  - a behavior in the format of "as xyz": attach the behavior named as "xyz"
+	 *  - a property of a behavior: set the behavior property value
+	 *
+	 * Do not call this method directly as it is a PHP magic method that
+	 * will be implicitly called when executing `$component->property = $value;`.
+	 * @param string $name the property name or the event name
+	 * @param mixed $value the property value
+	 * @throws UnknownPropertyException if the property is not defined
+	 * @throws InvalidCallException if the property is read-only.
+	 * @see __get
+	 */
+	public function __set($name, $value)
+	{
+		$setter = 'set' . $name;
+		if (method_exists($this, $setter)) {
+			// set property
+			$this->$setter($value);
+			return;
+		} elseif (strncmp($name, 'on ', 3) === 0) {
+			// on event: attach event handler
+			$this->on(trim(substr($name, 3)), $value);
+			return;
+		} elseif (strncmp($name, 'as ', 3) === 0) {
+			// as behavior: attach behavior
+			$name = trim(substr($name, 3));
+			$this->attachBehavior($name, $value instanceof Behavior ? $value : Yii::createObject($value));
+			return;
+		} else {
+			// behavior property
+			$this->ensureBehaviors();
+			foreach ($this->_behaviors as $behavior) {
+				if ($behavior->canSetProperty($name)) {
+					$behavior->$name = $value;
+					return;
+				}
+			}
+		}
+		if (method_exists($this, 'get' . $name)) {
+			throw new InvalidCallException('Setting read-only property: ' . get_class($this) . '::' . $name);
+		} else {
+			throw new UnknownPropertyException('Setting unknown property: ' . get_class($this) . '::' . $name);
+		}
+	}
+
+	/**
+	 * Checks if a property value is null.
+	 * This method will check in the following order and act accordingly:
+	 *
+	 *  - a property defined by a setter: return whether the property value is null
+	 *  - a property of a behavior: return whether the property value is null
+	 *
+	 * Do not call this method directly as it is a PHP magic method that
+	 * will be implicitly called when executing `isset($component->property)`.
+	 * @param string $name the property name or the event name
+	 * @return boolean whether the named property is null
+	 */
+	public function __isset($name)
+	{
+		$getter = 'get' . $name;
+		if (method_exists($this, $getter)) {
+			return $this->$getter() !== null;
+		} else {
+			// behavior property
+			$this->ensureBehaviors();
+			foreach ($this->_behaviors as $behavior) {
+				if ($behavior->canGetProperty($name)) {
+					return $behavior->$name !== null;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Sets a component property to be null.
+	 * This method will check in the following order and act accordingly:
+	 *
+	 *  - a property defined by a setter: set the property value to be null
+	 *  - a property of a behavior: set the property value to be null
+	 *
+	 * Do not call this method directly as it is a PHP magic method that
+	 * will be implicitly called when executing `unset($component->property)`.
+	 * @param string $name the property name
+	 * @throws InvalidCallException if the property is read only.
+	 */
+	public function __unset($name)
+	{
+		$setter = 'set' . $name;
+		if (method_exists($this, $setter)) {
+			$this->$setter(null);
+			return;
+		} else {
+			// behavior property
+			$this->ensureBehaviors();
+			foreach ($this->_behaviors as $behavior) {
+				if ($behavior->canSetProperty($name)) {
+					$behavior->$name = null;
+					return;
+				}
+			}
+		}
+		if (method_exists($this, 'get' . $name)) {
+			throw new InvalidCallException('Unsetting read-only property: ' . get_class($this) . '.' . $name);
+		}
+	}
+
+	/**
+	 * Calls the named method which is not a class method.
+	 * If the name refers to a component property whose value is
+	 * an anonymous function, the method will execute the function.
+	 * Otherwise, it will check if any attached behavior has
+	 * the named method and will execute it if available.
+	 *
+	 * Do not call this method directly as it is a PHP magic method that
+	 * will be implicitly called when an unknown method is being invoked.
+	 * @param string $name the method name
+	 * @param array $params method parameters
+	 * @return mixed the method return value
+	 * @throws UnknownMethodException when calling unknown method
+	 */
+	public function __call($name, $params)
+	{
+		$getter = 'get' . $name;
+		if (method_exists($this, $getter)) {
+			$func = $this->$getter();
+			if ($func instanceof \Closure) {
+				return call_user_func_array($func, $params);
+			}
+		}
+
+		$this->ensureBehaviors();
+		foreach ($this->_behaviors as $object) {
+			if (method_exists($object, $name)) {
+				return call_user_func_array(array($object, $name), $params);
+			}
+		}
+
+		throw new UnknownMethodException('Calling unknown method: ' . get_class($this) . "::$name()");
+	}
+
+	/**
+	 * This method is called after the object is created by cloning an existing one.
+	 * It removes all behaviors because they are attached to the old object.
+	 */
+	public function __clone()
+	{
+		$this->_events = null;
+		$this->_behaviors = null;
+	}
+
+	/**
+	 * Returns a value indicating whether a property is defined for this component.
+	 * A property is defined if:
+	 *
+	 * - the class has a getter or setter method associated with the specified name
+	 *   (in this case, property name is case-insensitive);
+	 * - the class has a member variable with the specified name (when `$checkVar` is true);
+	 * - an attached behavior has a property of the given name (when `$checkBehavior` is true).
+	 *
+	 * @param string $name the property name
+	 * @param boolean $checkVar whether to treat member variables as properties
+	 * @param boolean $checkBehavior whether to treat behaviors' properties as properties of this component
+	 * @return boolean whether the property is defined
+	 * @see canGetProperty
+	 * @see canSetProperty
+	 */
+	public function hasProperty($name, $checkVar = true, $checkBehavior = true)
+	{
+		return $this->canGetProperty($name, $checkVar, $checkBehavior) || $this->canSetProperty($name, $checkVar, $checkBehavior);
+	}
+
+	/**
+	 * Returns a value indicating whether a property can be read.
+	 * A property can be read if:
+	 *
+	 * - the class has a getter method associated with the specified name
+	 *   (in this case, property name is case-insensitive);
+	 * - the class has a member variable with the specified name (when `$checkVar` is true);
+	 * - an attached behavior has a readable property of the given name (when `$checkBehavior` is true).
+	 *
+	 * @param string $name the property name
+	 * @param boolean $checkVar whether to treat member variables as properties
+	 * @param boolean $checkBehavior whether to treat behaviors' properties as properties of this component
+	 * @return boolean whether the property can be read
+	 * @see canSetProperty
+	 */
+	public function canGetProperty($name, $checkVar = true, $checkBehavior = true)
+	{
+		if (method_exists($this, 'get' . $name) || $checkVar && property_exists($this, $name)) {
+			return true;
+		} else {
+			$this->ensureBehaviors();
+			foreach ($this->_behaviors as $behavior) {
+				if ($behavior->canGetProperty($name, $checkVar)) {
+					return true;
+				}
+			}
+			return false;
+		}
+	}
+
+	/**
+	 * Returns a value indicating whether a property can be set.
+	 * A property can be written if:
+	 *
+	 * - the class has a setter method associated with the specified name
+	 *   (in this case, property name is case-insensitive);
+	 * - the class has a member variable with the specified name (when `$checkVar` is true);
+	 * - an attached behavior has a writable property of the given name (when `$checkBehavior` is true).
+	 *
+	 * @param string $name the property name
+	 * @param boolean $checkVar whether to treat member variables as properties
+	 * @param boolean $checkBehavior whether to treat behaviors' properties as properties of this component
+	 * @return boolean whether the property can be written
+	 * @see canGetProperty
+	 */
+	public function canSetProperty($name, $checkVar = true, $checkBehavior = true)
+	{
+		if (method_exists($this, 'set' . $name) || $checkVar && property_exists($this, $name)) {
+			return true;
+		} else {
+			$this->ensureBehaviors();
+			foreach ($this->_behaviors as $behavior) {
+				if ($behavior->canSetProperty($name, $checkVar)) {
+					return true;
+				}
+			}
+			return false;
+		}
+	}
+
+	/**
+	 * Returns a list of behaviors that this component should behave as.
+	 *
+	 * Child classes may override this method to specify the behaviors they want to behave as.
+	 *
+	 * The return value of this method should be an array of behavior objects or configurations
+	 * indexed by behavior names. A behavior configuration can be either a string specifying
+	 * the behavior class or an array of the following structure:
+	 *
+	 * ~~~
+	 * 'behaviorName' => array(
+	 *     'class' => 'BehaviorClass',
+	 *     'property1' => 'value1',
+	 *     'property2' => 'value2',
+	 * )
+	 * ~~~
+	 *
+	 * Note that a behavior class must extend from [[Behavior]]. Behavior names can be strings
+	 * or integers. If the former, they uniquely identify the behaviors. If the latter, the corresponding
+	 * behaviors are anonymous and their properties and methods will NOT be made available via the component
+	 * (however, the behaviors can still respond to the component's events).
+	 *
+	 * Behaviors declared in this method will be attached to the component automatically (on demand).
+	 *
+	 * @return array the behavior configurations.
+	 */
+	public function behaviors()
+	{
+		return array();
+	}
+
+	/**
+	 * Returns a value indicating whether there is any handler attached to the named event.
+	 * @param string $name the event name
+	 * @return boolean whether there is any handler attached to the event.
+	 */
+	public function hasEventHandlers($name)
+	{
+		$this->ensureBehaviors();
+		return !empty($this->_events[$name]);
+	}
+
+	/**
+	 * Attaches an event handler to an event.
+	 *
+	 * An event handler must be a valid PHP callback. The followings are
+	 * some examples:
+	 *
+	 * ~~~
+	 * function ($event) { ... }         // anonymous function
+	 * array($object, 'handleClick')    // $object->handleClick()
+	 * array('Page', 'handleClick')     // Page::handleClick()
+	 * 'handleClick'                    // global function handleClick()
+	 * ~~~
+	 *
+	 * An event handler must be defined with the following signature,
+	 *
+	 * ~~~
+	 * function ($event)
+	 * ~~~
+	 *
+	 * where `$event` is an [[Event]] object which includes parameters associated with the event.
+	 *
+	 * @param string $name the event name
+	 * @param callback $handler the event handler
+	 * @param mixed $data the data to be passed to the event handler when the event is triggered.
+	 * When the event handler is invoked, this data can be accessed via [[Event::data]].
+	 * @see off()
+	 */
+	public function on($name, $handler, $data = null)
+	{
+		$this->ensureBehaviors();
+		$this->_events[$name][] = array($handler, $data);
+	}
+
+	/**
+	 * Detaches an existing event handler from this component.
+	 * This method is the opposite of [[on()]].
+	 * @param string $name event name
+	 * @param callback $handler the event handler to be removed.
+	 * If it is null, all handlers attached to the named event will be removed.
+	 * @return boolean if a handler is found and detached
+	 * @see on()
+	 */
+	public function off($name, $handler = null)
+	{
+		$this->ensureBehaviors();
+		if (isset($this->_events[$name])) {
+			if ($handler === null) {
+				$this->_events[$name] = array();
+			} else {
+				$removed = false;
+				foreach ($this->_events[$name] as $i => $event) {
+					if ($event[0] === $handler) {
+						unset($this->_events[$name][$i]);
+						$removed = true;
+					}
+				}
+				if ($removed) {
+					$this->_events[$name] = array_values($this->_events[$name]);
+				}
+				return $removed;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Triggers an event.
+	 * This method represents the happening of an event. It invokes
+	 * all attached handlers for the event.
+	 * @param string $name the event name
+	 * @param Event $event the event parameter. If not set, a default [[Event]] object will be created.
+	 */
+	public function trigger($name, $event = null)
+	{
+		$this->ensureBehaviors();
+		if (!empty($this->_events[$name])) {
+			if ($event === null) {
+				$event = new Event;
+			}
+			if ($event->sender === null) {
+				$event->sender = $this;
+			}
+			$event->handled = false;
+			$event->name = $name;
+			foreach ($this->_events[$name] as $handler) {
+				$event->data = $handler[1];
+				call_user_func($handler[0], $event);
+				// stop further handling if the event is handled
+				if ($event instanceof Event && $event->handled) {
+					return;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Returns the named behavior object.
+	 * @param string $name the behavior name
+	 * @return Behavior the behavior object, or null if the behavior does not exist
+	 */
+	public function getBehavior($name)
+	{
+		$this->ensureBehaviors();
+		return isset($this->_behaviors[$name]) ? $this->_behaviors[$name] : null;
+	}
+
+	/**
+	 * Returns all behaviors attached to this component.
+	 * @return Behavior[] list of behaviors attached to this component
+	 */
+	public function getBehaviors()
+	{
+		$this->ensureBehaviors();
+		return $this->_behaviors;
+	}
+
+	/**
+	 * Attaches a behavior to this component.
+	 * This method will create the behavior object based on the given
+	 * configuration. After that, the behavior object will be attached to
+	 * this component by calling the [[Behavior::attach()]] method.
+	 * @param string $name the name of the behavior.
+	 * @param string|array|Behavior $behavior the behavior configuration. This can be one of the following:
+	 *
+	 *  - a [[Behavior]] object
+	 *  - a string specifying the behavior class
+	 *  - an object configuration array that will be passed to [[Yii::createObject()]] to create the behavior object.
+	 *
+	 * @return Behavior the behavior object
+	 * @see detachBehavior
+	 */
+	public function attachBehavior($name, $behavior)
+	{
+		$this->ensureBehaviors();
+		return $this->attachBehaviorInternal($name, $behavior);
+	}
+
+	/**
+	 * Attaches a list of behaviors to the component.
+	 * Each behavior is indexed by its name and should be a [[Behavior]] object,
+	 * a string specifying the behavior class, or an configuration array for creating the behavior.
+	 * @param array $behaviors list of behaviors to be attached to the component
+	 * @see attachBehavior
+	 */
+	public function attachBehaviors($behaviors)
+	{
+		$this->ensureBehaviors();
+		foreach ($behaviors as $name => $behavior) {
+			$this->attachBehaviorInternal($name, $behavior);
+		}
+	}
+
+	/**
+	 * Detaches a behavior from the component.
+	 * The behavior's [[Behavior::detach()]] method will be invoked.
+	 * @param string $name the behavior's name.
+	 * @return Behavior the detached behavior. Null if the behavior does not exist.
+	 */
+	public function detachBehavior($name)
+	{
+		$this->ensureBehaviors();
+		if (isset($this->_behaviors[$name])) {
+			$behavior = $this->_behaviors[$name];
+			unset($this->_behaviors[$name]);
+			$behavior->detach();
+			return $behavior;
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * Detaches all behaviors from the component.
+	 */
+	public function detachBehaviors()
+	{
+		$this->ensureBehaviors();
+		if ($this->_behaviors !== null) {
+			foreach ($this->_behaviors as $name => $behavior) {
+				$this->detachBehavior($name);
+			}
+		}
+		$this->_behaviors = array();
+	}
+
+	/**
+	 * Makes sure that the behaviors declared in [[behaviors()]] are attached to this component.
+	 */
+	public function ensureBehaviors()
+	{
+		if ($this->_behaviors === null) {
+			$this->_behaviors = array();
+			foreach ($this->behaviors() as $name => $behavior) {
+				$this->attachBehaviorInternal($name, $behavior);
+			}
+		}
+	}
+
+	/**
+	 * Attaches a behavior to this component.
+	 * @param string $name the name of the behavior.
+	 * @param string|array|Behavior $behavior the behavior to be attached
+	 * @return Behavior the attached behavior.
+	 */
+	private function attachBehaviorInternal($name, $behavior)
+	{
+		if (!($behavior instanceof Behavior)) {
+			$behavior = Yii::createObject($behavior);
+		}
+		if (isset($this->_behaviors[$name])) {
+			$this->_behaviors[$name]->detach();
+		}
+		$behavior->attach($this);
+		return $this->_behaviors[$name] = $behavior;
+	}
+}
diff --git a/yii/base/Controller.php b/yii/base/Controller.php
new file mode 100644
index 0000000..9572636
--- /dev/null
+++ b/yii/base/Controller.php
@@ -0,0 +1,504 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+use Yii;
+use yii\helpers\StringHelper;
+
+/**
+ * Controller is the base class for classes containing controller logic.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Controller extends Component
+{
+	/**
+	 * @event ActionEvent an event raised right before executing a controller action.
+	 * You may set [[ActionEvent::isValid]] to be false to cancel the action execution.
+	 */
+	const EVENT_BEFORE_ACTION = 'beforeAction';
+	/**
+	 * @event ActionEvent an event raised right after executing a controller action.
+	 */
+	const EVENT_AFTER_ACTION = 'afterAction';
+
+	/**
+	 * @var string the ID of this controller
+	 */
+	public $id;
+	/**
+	 * @var Module $module the module that this controller belongs to.
+	 */
+	public $module;
+	/**
+	 * @var string the ID of the action that is used when the action ID is not specified
+	 * in the request. Defaults to 'index'.
+	 */
+	public $defaultAction = 'index';
+	/**
+	 * @var string|boolean the name of the layout to be applied to this controller's views.
+	 * This property mainly affects the behavior of [[render()]].
+	 * Defaults to null, meaning the actual layout value should inherit that from [[module]]'s layout value.
+	 * If false, no layout will be applied.
+	 */
+	public $layout;
+	/**
+	 * @var Action the action that is currently being executed. This property will be set
+	 * by [[run()]] when it is called by [[Application]] to run an action.
+	 */
+	public $action;
+	/**
+	 * @var View the view object that can be used to render views or view files.
+	 */
+	private $_view;
+
+
+	/**
+	 * @param string $id the ID of this controller
+	 * @param Module $module the module that this controller belongs to.
+	 * @param array $config name-value pairs that will be used to initialize the object properties
+	 */
+	public function __construct($id, $module, $config = array())
+	{
+		$this->id = $id;
+		$this->module = $module;
+		parent::__construct($config);
+	}
+
+	/**
+	 * Declares external actions for the controller.
+	 * This method is meant to be overwritten to declare external actions for the controller.
+	 * It should return an array, with array keys being action IDs, and array values the corresponding
+	 * action class names or action configuration arrays. For example,
+	 *
+	 * ~~~
+	 * return array(
+	 *     'action1' => '@app/components/Action1',
+	 *     'action2' => array(
+	 *         'class' => '@app/components/Action2',
+	 *         'property1' => 'value1',
+	 *         'property2' => 'value2',
+	 *     ),
+	 * );
+	 * ~~~
+	 *
+	 * [[\Yii::createObject()]] will be used later to create the requested action
+	 * using the configuration provided here.
+	 */
+	public function actions()
+	{
+		return array();
+	}
+
+	/**
+	 * Runs an action with the specified action ID and parameters.
+	 * If the action ID is empty, the method will use [[defaultAction]].
+	 * @param string $id the ID of the action to be executed.
+	 * @param array $params the parameters (name-value pairs) to be passed to the action.
+	 * @return integer the status of the action execution. 0 means normal, other values mean abnormal.
+	 * @throws InvalidRouteException if the requested action ID cannot be resolved into an action successfully.
+	 * @see createAction
+	 */
+	public function runAction($id, $params = array())
+	{
+		$action = $this->createAction($id);
+		if ($action !== null) {
+			$oldAction = $this->action;
+			$this->action = $action;
+			$status = 1;
+			if ($this->module->beforeAction($action)) {
+				if ($this->beforeAction($action)) {
+					$status = $action->runWithParams($params);
+					$this->afterAction($action);
+				}
+				$this->module->afterAction($action);
+			}
+			$this->action = $oldAction;
+			return $status;
+		} else {
+			throw new InvalidRouteException('Unable to resolve the request: ' . $this->getUniqueId() . '/' . $id);
+		}
+	}
+
+	/**
+	 * Runs a request specified in terms of a route.
+	 * The route can be either an ID of an action within this controller or a complete route consisting
+	 * of module IDs, controller ID and action ID. If the route starts with a slash '/', the parsing of
+	 * the route will start from the application; otherwise, it will start from the parent module of this controller.
+	 * @param string $route the route to be handled, e.g., 'view', 'comment/view', '/admin/comment/view'.
+	 * @param array $params the parameters to be passed to the action.
+	 * @return integer the status code returned by the action execution. 0 means normal, and other values mean abnormal.
+	 * @see runAction
+	 * @see forward
+	 */
+	public function run($route, $params = array())
+	{
+		$pos = strpos($route, '/');
+		if ($pos === false) {
+			return $this->runAction($route, $params);
+		} elseif ($pos > 0) {
+			return $this->module->runAction($route, $params);
+		} else {
+			return Yii::$app->runAction(ltrim($route, '/'), $params);
+		}
+	}
+
+	/**
+	 * Binds the parameters to the action.
+	 * This method is invoked by [[Action]] when it begins to run with the given parameters.
+	 * This method will check the parameter names that the action requires and return
+	 * the provided parameters according to the requirement. If there is any missing parameter,
+	 * an exception will be thrown.
+	 * @param Action $action the action to be bound with parameters
+	 * @param array $params the parameters to be bound to the action
+	 * @return array the valid parameters that the action can run with.
+	 * @throws InvalidRequestException if there are missing parameters.
+	 */
+	public function bindActionParams($action, $params)
+	{
+		if ($action instanceof InlineAction) {
+			$method = new \ReflectionMethod($this, $action->actionMethod);
+		} else {
+			$method = new \ReflectionMethod($action, 'run');
+		}
+
+		$args = array();
+		$missing = array();
+		foreach ($method->getParameters() as $param) {
+			$name = $param->getName();
+			if (array_key_exists($name, $params)) {
+				$args[] = $params[$name];
+				unset($params[$name]);
+			} elseif ($param->isDefaultValueAvailable()) {
+				$args[] = $param->getDefaultValue();
+			} else {
+				$missing[] = $name;
+			}
+		}
+
+		if (!empty($missing)) {
+			throw new InvalidRequestException(Yii::t('yii|Missing required parameters: {params}', array(
+				'{params}' => implode(', ', $missing),
+			)));
+		}
+
+		return $args;
+	}
+
+	/**
+	 * Forwards the current execution flow to handle a new request specified by a route.
+	 * The only difference between this method and [[run()]] is that after calling this method,
+	 * the application will exit.
+	 * @param string $route the route to be handled, e.g., 'view', 'comment/view', '/admin/comment/view'.
+	 * @param array $params the parameters to be passed to the action.
+	 * @return integer the status code returned by the action execution. 0 means normal, and other values mean abnormal.
+	 * @see run
+	 */
+	public function forward($route, $params = array())
+	{
+		$status = $this->run($route, $params);
+		exit($status);
+	}
+
+	/**
+	 * Creates an action based on the given action ID.
+	 * The method first checks if the action ID has been declared in [[actions()]]. If so,
+	 * it will use the configuration declared there to create the action object.
+	 * If not, it will look for a controller method whose name is in the format of `actionXyz`
+	 * where `Xyz` stands for the action ID. If found, an [[InlineAction]] representing that
+	 * method will be created and returned.
+	 * @param string $id the action ID
+	 * @return Action the newly created action instance. Null if the ID doesn't resolve into any action.
+	 */
+	public function createAction($id)
+	{
+		if ($id === '') {
+			$id = $this->defaultAction;
+		}
+
+		$actionMap = $this->actions();
+		if (isset($actionMap[$id])) {
+			return Yii::createObject($actionMap[$id], $id, $this);
+		} elseif (preg_match('/^[a-z0-9\\-_]+$/', $id)) {
+			$methodName = 'action' . StringHelper::id2camel($id);
+			if (method_exists($this, $methodName)) {
+				$method = new \ReflectionMethod($this, $methodName);
+				if ($method->getName() === $methodName) {
+					return new InlineAction($id, $this, $methodName);
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * This method is invoked right before an action is to be executed (after all possible filters.)
+	 * You may override this method to do last-minute preparation for the action.
+	 * @param Action $action the action to be executed.
+	 * @return boolean whether the action should continue to be executed.
+	 */
+	public function beforeAction($action)
+	{
+		$event = new ActionEvent($action);
+		$this->trigger(self::EVENT_BEFORE_ACTION, $event);
+		return $event->isValid;
+	}
+
+	/**
+	 * This method is invoked right after an action is executed.
+	 * You may override this method to do some postprocessing for the action.
+	 * @param Action $action the action just executed.
+	 */
+	public function afterAction($action)
+	{
+		$this->trigger(self::EVENT_AFTER_ACTION, new ActionEvent($action));
+	}
+
+	/**
+	 * Returns the request parameters that will be used for action parameter binding.
+	 * Default implementation simply returns an empty array.
+	 * Child classes may override this method to customize the parameters to be provided
+	 * for action parameter binding (e.g. `$_GET`).
+	 * @return array the request parameters (name-value pairs) to be used for action parameter binding
+	 */
+	public function getActionParams()
+	{
+		return array();
+	}
+
+	/**
+	 * Validates the parameter being bound to actions.
+	 * This method is invoked when parameters are being bound to the currently requested action.
+	 * Child classes may override this method to throw exceptions when there are missing and/or unknown parameters.
+	 * @param Action $action the currently requested action
+	 * @param array $missingParams the names of the missing parameters
+	 * @param array $unknownParams the unknown parameters (name=>value)
+	 */
+	public function validateActionParams($action, $missingParams, $unknownParams)
+	{
+	}
+
+	/**
+	 * @return string the controller ID that is prefixed with the module ID (if any).
+	 */
+	public function getUniqueId()
+	{
+		return $this->module instanceof Application ? $this->id : $this->module->getUniqueId() . '/' . $this->id;
+	}
+
+	/**
+	 * Returns the route of the current request.
+	 * @return string the route (module ID, controller ID and action ID) of the current request.
+	 */
+	public function getRoute()
+	{
+		return $this->action !== null ? $this->action->getUniqueId() : $this->getUniqueId();
+	}
+
+	/**
+	 * Populates one or multiple models from the given data array.
+	 * @param array $data the data array. This is usually `$_POST` or `$_GET`, but can also be any valid array.
+	 * @param Model $model the model to be populated. If there are more than one model to be populated,
+	 * you may supply them as additional parameters.
+	 * @return boolean whether at least one model is successfully populated with the data.
+	 */
+	public function populate($data, $model)
+	{
+		$success = false;
+		if (!empty($data) && is_array($data)) {
+			$models = func_get_args();
+			array_shift($models);
+			foreach ($models as $model) {
+				/** @var Model $model */
+				$scope = $model->formName();
+				if ($scope == '') {
+					$model->attributes = $data;
+					$success = true;
+				} elseif (isset($data[$scope])) {
+					$model->attributes = $data[$scope];
+					$success = true;
+				}
+			}
+		}
+		return $success;
+	}
+
+	/**
+	 * Renders a view and applies layout if available.
+	 *
+	 * The view to be rendered can be specified in one of the following formats:
+	 *
+	 * - path alias (e.g. "@app/views/site/index");
+	 * - absolute path within application (e.g. "//site/index"): the view name starts with double slashes.
+	 *   The actual view file will be looked for under the [[Application::viewPath|view path]] of the application.
+	 * - absolute path within module (e.g. "/site/index"): the view name starts with a single slash.
+	 *   The actual view file will be looked for under the [[Module::viewPath|view path]] of [[module]].
+	 * - relative path (e.g. "index"): the actual view file will be looked for under [[viewPath]].
+	 *
+	 * To determine which layout should be applied, the following two steps are conducted:
+	 *
+	 * 1. In the first step, it determines the layout name and the context module:
+	 *
+	 * - If [[layout]] is specified as a string, use it as the layout name and [[module]] as the context module;
+	 * - If [[layout]] is null, search through all ancestor modules of this controller and find the first
+	 *   module whose [[Module::layout|layout]] is not null. The layout and the corresponding module
+	 *   are used as the layout name and the context module, respectively. If such a module is not found
+	 *   or the corresponding layout is not a string, it will return false, meaning no applicable layout.
+	 *
+	 * 2. In the second step, it determines the actual layout file according to the previously found layout name
+	 *    and context module. The layout name can be
+	 *
+	 * - a path alias (e.g. "@app/views/layouts/main");
+	 * - an absolute path (e.g. "/main"): the layout name starts with a slash. The actual layout file will be
+	 *   looked for under the [[Application::layoutPath|layout path]] of the application;
+	 * - a relative path (e.g. "main"): the actual layout layout file will be looked for under the
+	 *   [[Module::viewPath|view path]] of the context module.
+	 *
+	 * If the layout name does not contain a file extension, it will use the default one `.php`.
+	 *
+	 * @param string $view the view name. Please refer to [[findViewFile()]] on how to specify a view name.
+	 * @param array $params the parameters (name-value pairs) that should be made available in the view.
+	 * These parameters will not be available in the layout.
+	 * @return string the rendering result.
+	 * @throws InvalidParamException if the view file or the layout file does not exist.
+	 */
+	public function render($view, $params = array())
+	{
+		$viewFile = $this->findViewFile($view);
+		$output = $this->getView()->renderFile($viewFile, $params, $this);
+		$layoutFile = $this->findLayoutFile();
+		if ($layoutFile !== false) {
+			return $this->getView()->renderFile($layoutFile, array('content' => $output), $this);
+		} else {
+			return $output;
+		}
+	}
+
+	/**
+	 * Renders a view.
+	 * This method differs from [[render()]] in that it does not apply any layout.
+	 * @param string $view the view name. Please refer to [[render()]] on how to specify a view name.
+	 * @param array $params the parameters (name-value pairs) that should be made available in the view.
+	 * @return string the rendering result.
+	 * @throws InvalidParamException if the view file does not exist.
+	 */
+	public function renderPartial($view, $params = array())
+	{
+		$viewFile = $this->findViewFile($view);
+		return $this->getView()->renderFile($viewFile, $params, $this);
+	}
+
+	/**
+	 * Renders a view file.
+	 * @param string $file the view file to be rendered. This can be either a file path or a path alias.
+	 * @param array $params the parameters (name-value pairs) that should be made available in the view.
+	 * @return string the rendering result.
+	 * @throws InvalidParamException if the view file does not exist.
+	 */
+	public function renderFile($file, $params = array())
+	{
+		return $this->getView()->renderFile($file, $params, $this);
+	}
+
+	/**
+	 * Returns the view object that can be used to render views or view files.
+	 * The [[render()]], [[renderPartial()]] and [[renderFile()]] methods will use
+	 * this view object to implement the actual view rendering.
+	 * @return View the view object that can be used to render views or view files.
+	 */
+	public function getView()
+	{
+		if ($this->_view === null) {
+			$this->_view = Yii::$app->getView();
+		}
+		return $this->_view;
+	}
+
+	/**
+	 * Sets the view object to be used by this controller.
+	 * @param View $view the view object that can be used to render views or view files.
+	 */
+	public function setView($view)
+	{
+		$this->_view = $view;
+	}
+
+	/**
+	 * Returns the directory containing view files for this controller.
+	 * The default implementation returns the directory named as controller [[id]] under the [[module]]'s
+	 * [[viewPath]] directory.
+	 * @return string the directory containing the view files for this controller.
+	 */
+	public function getViewPath()
+	{
+		return $this->module->getViewPath() . DIRECTORY_SEPARATOR . $this->id;
+	}
+
+	/**
+	 * Finds the view file based on the given view name.
+	 * @param string $view the view name or the path alias of the view file. Please refer to [[render()]]
+	 * on how to specify this parameter.
+	 * @return string the view file path. Note that the file may not exist.
+	 */
+	protected function findViewFile($view)
+	{
+		if (strncmp($view, '@', 1) === 0) {
+			// e.g. "@app/views/main"
+			$file = Yii::getAlias($view);
+		} elseif (strncmp($view, '//', 2) === 0) {
+			// e.g. "//layouts/main"
+			$file = Yii::$app->getViewPath() . DIRECTORY_SEPARATOR . ltrim($view, '/');
+		} elseif (strncmp($view, '/', 1) === 0) {
+			// e.g. "/site/index"
+			$file = $this->module->getViewPath() . DIRECTORY_SEPARATOR . ltrim($view, '/');
+		} else {
+			$file = $this->getViewPath() . DIRECTORY_SEPARATOR . $view;
+		}
+
+		return pathinfo($file, PATHINFO_EXTENSION) === '' ? $file . '.php' : $file;
+	}
+
+	/**
+	 * Finds the applicable layout file.
+	 * @return string|boolean the layout file path, or false if layout is not needed.
+	 * Please refer to [[render()]] on how to specify this parameter.
+	 * @throws InvalidParamException if an invalid path alias is used to specify the layout
+	 */
+	protected function findLayoutFile()
+	{
+		$module = $this->module;
+		if (is_string($this->layout)) {
+			$view = $this->layout;
+		} elseif ($this->layout === null) {
+			while ($module !== null && $module->layout === null) {
+				$module = $module->module;
+			}
+			if ($module !== null && is_string($module->layout)) {
+				$view = $module->layout;
+			}
+		}
+
+		if (!isset($view)) {
+			return false;
+		}
+
+		if (strncmp($view, '@', 1) === 0) {
+			$file = Yii::getAlias($view);
+		} elseif (strncmp($view, '/', 1) === 0) {
+			$file = Yii::$app->getLayoutPath() . DIRECTORY_SEPARATOR . $view;
+		} else {
+			$file = $module->getLayoutPath() . DIRECTORY_SEPARATOR . $view;
+		}
+
+		if (pathinfo($file, PATHINFO_EXTENSION) === '') {
+			$file .= '.php';
+		}
+		return $file;
+	}
+}
diff --git a/yii/base/Dictionary.php b/yii/base/Dictionary.php
new file mode 100644
index 0000000..5807d93
--- /dev/null
+++ b/yii/base/Dictionary.php
@@ -0,0 +1,297 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+use yii\helpers\ArrayHelper;
+
+/**
+ * Dictionary implements a collection that stores key-value pairs.
+ *
+ * You can access, add or remove an item with a key by using
+ * [[itemAt()]], [[add()]], and [[remove()]].
+ *
+ * To get the number of the items in the dictionary, use [[getCount()]].
+ *
+ * Because Dictionary implements a set of SPL interfaces, it can be used
+ * like a regular PHP array as follows,
+ *
+ * ~~~
+ * $dictionary[$key] = $value;		   // add a key-value pair
+ * unset($dictionary[$key]);			 // remove the value with the specified key
+ * if (isset($dictionary[$key]))		 // if the dictionary contains the key
+ * foreach ($dictionary as $key=>$value) // traverse the items in the dictionary
+ * $n = count($dictionary);			  // returns the number of items in the dictionary
+ * ~~~
+ *
+ * @property integer $count the number of items in the dictionary
+ * @property array $keys The keys in the dictionary
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Dictionary extends Object implements \IteratorAggregate, \ArrayAccess, \Countable
+{
+	/**
+	 * @var array internal data storage
+	 */
+	private $_d = array();
+
+	/**
+	 * Constructor.
+	 * Initializes the dictionary with an array or an iterable object.
+	 * @param mixed $data the initial data to be populated into the dictionary.
+	 * This can be an array or an iterable object.
+	 * @param array $config name-value pairs that will be used to initialize the object properties
+	 * @throws Exception if data is not well formed (neither an array nor an iterable object)
+	 */
+	public function __construct($data = array(), $config = array())
+	{
+		if (!empty($data)) {
+			$this->copyFrom($data);
+		}
+		parent::__construct($config);
+	}
+
+	/**
+	 * Returns an iterator for traversing the items in the dictionary.
+	 * This method is required by the SPL interface `IteratorAggregate`.
+	 * It will be implicitly called when you use `foreach` to traverse the dictionary.
+	 * @return DictionaryIterator an iterator for traversing the items in the dictionary.
+	 */
+	public function getIterator()
+	{
+		return new DictionaryIterator($this->_d);
+	}
+
+	/**
+	 * Returns the number of items in the dictionary.
+	 * This method is required by the SPL `Countable` interface.
+	 * It will be implicitly called when you use `count($dictionary)`.
+	 * @return integer number of items in the dictionary.
+	 */
+	public function count()
+	{
+		return $this->getCount();
+	}
+
+	/**
+	 * Returns the number of items in the dictionary.
+	 * @return integer the number of items in the dictionary
+	 */
+	public function getCount()
+	{
+		return count($this->_d);
+	}
+
+	/**
+	 * Returns the keys stored in the dictionary.
+	 * @return array the key list
+	 */
+	public function getKeys()
+	{
+		return array_keys($this->_d);
+	}
+
+	/**
+	 * Returns the item with the specified key.
+	 * @param mixed $key the key
+	 * @return mixed the element with the specified key.
+	 * Null if the key cannot be found in the dictionary.
+	 */
+	public function itemAt($key)
+	{
+		return isset($this->_d[$key]) ? $this->_d[$key] : null;
+	}
+
+	/**
+	 * Adds an item into the dictionary.
+	 * Note, if the specified key already exists, the old value will be overwritten.
+	 * @param mixed $key key
+	 * @param mixed $value value
+	 * @throws Exception if the dictionary is read-only
+	 */
+	public function add($key, $value)
+	{
+		if ($key === null) {
+			$this->_d[] = $value;
+		} else {
+			$this->_d[$key] = $value;
+		}
+	}
+
+	/**
+	 * Removes an item from the dictionary by its key.
+	 * @param mixed $key the key of the item to be removed
+	 * @return mixed the removed value, null if no such key exists.
+	 * @throws Exception if the dictionary is read-only
+	 */
+	public function remove($key)
+	{
+		if (isset($this->_d[$key])) {
+			$value = $this->_d[$key];
+			unset($this->_d[$key]);
+			return $value;
+		} else { // the value is null
+			unset($this->_d[$key]);
+			return null;
+		}
+	}
+
+	/**
+	 * Removes all items from the dictionary.
+	 * @param boolean $safeClear whether to clear every item by calling [[remove]].
+	 * Defaults to false, meaning all items in the dictionary will be cleared directly
+	 * without calling [[remove]].
+	 */
+	public function removeAll($safeClear = false)
+	{
+		if ($safeClear) {
+			foreach (array_keys($this->_d) as $key) {
+				$this->remove($key);
+			}
+		} else {
+			$this->_d = array();
+		}
+	}
+
+	/**
+	 * Returns a value indicating whether the dictionary contains the specified key.
+	 * @param mixed $key the key
+	 * @return boolean whether the dictionary contains an item with the specified key
+	 */
+	public function has($key)
+	{
+		return isset($this->_d[$key]) || array_key_exists($key, $this->_d);
+	}
+
+	/**
+	 * Returns the dictionary as a PHP array.
+	 * @return array the list of items in array
+	 */
+	public function toArray()
+	{
+		return $this->_d;
+	}
+
+	/**
+	 * Copies iterable data into the dictionary.
+	 * Note, existing data in the dictionary will be cleared first.
+	 * @param mixed $data the data to be copied from, must be an array or an object implementing `Traversable`
+	 * @throws InvalidParamException if data is neither an array nor an iterator.
+	 */
+	public function copyFrom($data)
+	{
+		if (is_array($data) || $data instanceof \Traversable) {
+			if (!empty($this->_d)) {
+				$this->removeAll();
+			}
+			if ($data instanceof self) {
+				$data = $data->_d;
+			}
+			foreach ($data as $key => $value) {
+				$this->add($key, $value);
+			}
+		} else {
+			throw new InvalidParamException('Data must be either an array or an object implementing Traversable.');
+		}
+	}
+
+	/**
+	 * Merges iterable data into the dictionary.
+	 *
+	 * Existing elements in the dictionary will be overwritten if their keys are the same as those in the source.
+	 * If the merge is recursive, the following algorithm is performed:
+	 *
+	 * - the dictionary data is saved as $a, and the source data is saved as $b;
+	 * - if $a and $b both have an array indexed at the same string key, the arrays will be merged using this algorithm;
+	 * - any integer-indexed elements in $b will be appended to $a;
+	 * - any string-indexed elements in $b will overwrite elements in $a with the same index;
+	 *
+	 * @param array|\Traversable $data the data to be merged with. It must be an array or object implementing Traversable
+	 * @param boolean $recursive whether the merging should be recursive.
+	 * @throws InvalidParamException if data is neither an array nor an object implementing `Traversable`.
+	 */
+	public function mergeWith($data, $recursive = true)
+	{
+		if (is_array($data) || $data instanceof \Traversable) {
+			if ($data instanceof self) {
+				$data = $data->_d;
+			}
+			if ($recursive) {
+				if ($data instanceof \Traversable) {
+					$d = array();
+					foreach ($data as $key => $value) {
+						$d[$key] = $value;
+					}
+					$this->_d = ArrayHelper::merge($this->_d, $d);
+				} else {
+					$this->_d = ArrayHelper::merge($this->_d, $data);
+				}
+			} else {
+				foreach ($data as $key => $value) {
+					$this->add($key, $value);
+				}
+			}
+		} else {
+			throw new InvalidParamException('The data to be merged with must be an array or an object implementing Traversable.');
+		}
+	}
+
+	/**
+	 * Returns whether there is an element at the specified offset.
+	 * This method is required by the SPL interface `ArrayAccess`.
+	 * It is implicitly called when you use something like `isset($dictionary[$offset])`.
+	 * This is equivalent to [[contains]].
+	 * @param mixed $offset the offset to check on
+	 * @return boolean
+	 */
+	public function offsetExists($offset)
+	{
+		return $this->has($offset);
+	}
+
+	/**
+	 * Returns the element at the specified offset.
+	 * This method is required by the SPL interface `ArrayAccess`.
+	 * It is implicitly called when you use something like `$value = $dictionary[$offset];`.
+	 * This is equivalent to [[itemAt]].
+	 * @param mixed $offset the offset to retrieve element.
+	 * @return mixed the element at the offset, null if no element is found at the offset
+	 */
+	public function offsetGet($offset)
+	{
+		return $this->itemAt($offset);
+	}
+
+	/**
+	 * Sets the element at the specified offset.
+	 * This method is required by the SPL interface `ArrayAccess`.
+	 * It is implicitly called when you use something like `$dictionary[$offset] = $item;`.
+	 * If the offset is null, the new item will be appended to the dictionary.
+	 * Otherwise, the existing item at the offset will be replaced with the new item.
+	 * This is equivalent to [[add]].
+	 * @param mixed $offset the offset to set element
+	 * @param mixed $item the element value
+	 */
+	public function offsetSet($offset, $item)
+	{
+		$this->add($offset, $item);
+	}
+
+	/**
+	 * Unsets the element at the specified offset.
+	 * This method is required by the SPL interface `ArrayAccess`.
+	 * It is implicitly called when you use something like `unset($dictionary[$offset])`.
+	 * This is equivalent to [[remove]].
+	 * @param mixed $offset the offset to unset element
+	 */
+	public function offsetUnset($offset)
+	{
+		$this->remove($offset);
+	}
+}
diff --git a/yii/base/DictionaryIterator.php b/yii/base/DictionaryIterator.php
new file mode 100644
index 0000000..0d15bb0
--- /dev/null
+++ b/yii/base/DictionaryIterator.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+/**
+ * DictionaryIterator implements the SPL `Iterator` interface for [[Dictionary]].
+ *
+ * It allows [[Dictionary]] to return a new iterator for data traversing purpose.
+ * You normally do not use this class directly.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class DictionaryIterator implements \Iterator
+{
+	/**
+	 * @var array the data to be iterated through
+	 */
+	private $_d;
+	/**
+	 * @var array list of keys in the map
+	 */
+	private $_keys;
+	/**
+	 * @var mixed current key
+	 */
+	private $_key;
+
+	/**
+	 * Constructor.
+	 * @param array $data the data to be iterated through
+	 */
+	public function __construct(&$data)
+	{
+		$this->_d = &$data;
+		$this->_keys = array_keys($data);
+		$this->_key = reset($this->_keys);
+	}
+
+	/**
+	 * Rewinds the index of the current item.
+	 * This method is required by the SPL interface `Iterator`.
+	 */
+	public function rewind()
+	{
+		$this->_key = reset($this->_keys);
+	}
+
+	/**
+	 * Returns the key of the current array element.
+	 * This method is required by the SPL interface `Iterator`.
+	 * @return mixed the key of the current array element
+	 */
+	public function key()
+	{
+		return $this->_key;
+	}
+
+	/**
+	 * Returns the current array element.
+	 * This method is required by the SPL interface `Iterator`.
+	 * @return mixed the current array element
+	 */
+	public function current()
+	{
+		return $this->_d[$this->_key];
+	}
+
+	/**
+	 * Moves the internal pointer to the next element.
+	 * This method is required by the SPL interface `Iterator`.
+	 */
+	public function next()
+	{
+		$this->_key = next($this->_keys);
+	}
+
+	/**
+	 * Returns whether there is an element at current position.
+	 * This method is required by the SPL interface `Iterator`.
+	 * @return boolean whether there is an item at current position.
+	 */
+	public function valid()
+	{
+		return $this->_key !== false;
+	}
+}
diff --git a/yii/base/ErrorException.php b/yii/base/ErrorException.php
new file mode 100644
index 0000000..b41e9ed
--- /dev/null
+++ b/yii/base/ErrorException.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+use Yii;
+
+/**
+ * ErrorException represents a PHP error.
+ *
+ * @author Alexander Makarov <sam@rmcreative.ru>
+ * @since 2.0
+ */
+class ErrorException extends Exception
+{
+	protected $severity;
+
+	/**
+	 * Constructs the exception
+	 * @link http://php.net/manual/en/errorexception.construct.php
+	 * @param $message [optional]
+	 * @param $code [optional]
+	 * @param $severity [optional]
+	 * @param $filename [optional]
+	 * @param $lineno [optional]
+	 * @param $previous [optional]
+	 */
+	public function __construct($message = '', $code = 0, $severity = 1, $filename = __FILE__, $lineno = __LINE__, \Exception $previous = null)
+	{
+		parent::__construct($message, $code, $previous);
+		$this->severity = $severity;
+		$this->file = $filename;
+		$this->line = $lineno;
+
+		if (function_exists('xdebug_get_function_stack')) {
+			$trace = array_slice(array_reverse(xdebug_get_function_stack()), 3, -1);
+			foreach ($trace as &$frame) {
+				if (!isset($frame['function'])) {
+					$frame['function'] = 'unknown';
+				}
+
+				// XDebug < 2.1.1: http://bugs.xdebug.org/view.php?id=695
+				if (!isset($frame['type']) || $frame['type'] === 'static') {
+					$frame['type'] = '::';
+				} elseif ($frame['type'] === 'dynamic') {
+					$frame['type'] = '->';
+				}
+
+				// XDebug has a different key name
+				$frame['args'] = array();
+				if (isset($frame['params']) && !isset($frame['args'])) {
+					$frame['args'] = $frame['params'];
+				}
+			}
+
+			$ref = new \ReflectionProperty('Exception', 'trace');
+			$ref->setAccessible(true);
+			$ref->setValue($this, $trace);
+		}
+	}
+
+	/**
+	 * Gets the exception severity
+	 * @link http://php.net/manual/en/errorexception.getseverity.php
+	 * @return int the severity level of the exception.
+	 */
+	final public function getSeverity()
+	{
+		return $this->severity;
+	}
+
+	/**
+	 * Returns if error is one of fatal type
+	 *
+	 * @param array $error error got from error_get_last()
+	 * @return bool if error is one of fatal type
+	 */
+	public static function isFatalError($error)
+	{
+		return isset($error['type']) && in_array($error['type'], array(E_ERROR, E_PARSE, E_CORE_ERROR, E_CORE_WARNING, E_COMPILE_ERROR, E_COMPILE_WARNING));
+	}
+
+	/**
+	 * @return string the user-friendly name of this exception
+	 */
+	public function getName()
+	{
+		$names = array(
+			E_ERROR => Yii::t('yii|Fatal Error'),
+			E_PARSE => Yii::t('yii|Parse Error'),
+			E_CORE_ERROR => Yii::t('yii|Core Error'),
+			E_COMPILE_ERROR => Yii::t('yii|Compile Error'),
+			E_USER_ERROR => Yii::t('yii|User Error'),
+			E_WARNING => Yii::t('yii|Warning'),
+			E_CORE_WARNING => Yii::t('yii|Core Warning'),
+			E_COMPILE_WARNING => Yii::t('yii|Compile Warning'),
+			E_USER_WARNING => Yii::t('yii|User Warning'),
+			E_STRICT => Yii::t('yii|Strict'),
+			E_NOTICE => Yii::t('yii|Notice'),
+			E_RECOVERABLE_ERROR => Yii::t('yii|Recoverable Error'),
+			E_DEPRECATED => Yii::t('yii|Deprecated'),
+		);
+		return isset($names[$this->getCode()]) ? $names[$this->getCode()] : Yii::t('yii|Error');
+	}
+}
diff --git a/yii/base/ErrorHandler.php b/yii/base/ErrorHandler.php
new file mode 100644
index 0000000..98a061d
--- /dev/null
+++ b/yii/base/ErrorHandler.php
@@ -0,0 +1,280 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+/**
+ * ErrorHandler handles uncaught PHP errors and exceptions.
+ *
+ * ErrorHandler displays these errors using appropriate views based on the
+ * nature of the errors and the mode the application runs at.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class ErrorHandler extends Component
+{
+	/**
+	 * @var integer maximum number of source code lines to be displayed. Defaults to 25.
+	 */
+	public $maxSourceLines = 25;
+	/**
+	 * @var integer maximum number of trace source code lines to be displayed. Defaults to 10.
+	 */
+	public $maxTraceSourceLines = 10;
+	/**
+	 * @var boolean whether to discard any existing page output before error display. Defaults to true.
+	 */
+	public $discardExistingOutput = true;
+	/**
+	 * @var string the route (eg 'site/error') to the controller action that will be used to display external errors.
+	 * Inside the action, it can retrieve the error information by \Yii::$app->errorHandler->error.
+	 * This property defaults to null, meaning ErrorHandler will handle the error display.
+	 */
+	public $errorAction;
+	/**
+	 * @var string the path of the view file for rendering exceptions
+	 */
+	public $exceptionView = '@yii/views/exception.php';
+	/**
+	 * @var string the path of the view file for rendering errors
+	 */
+	public $errorView = '@yii/views/error.php';
+	/**
+	 * @var \Exception the exception that is being handled currently
+	 */
+	public $exception;
+
+
+	/**
+	 * Handles exception
+	 * @param \Exception $exception
+	 */
+	public function handle($exception)
+	{
+		$this->exception = $exception;
+
+		if ($this->discardExistingOutput) {
+			$this->clearOutput();
+		}
+
+		$this->renderException($exception);
+	}
+
+	/**
+	 * Renders exception
+	 * @param \Exception $exception
+	 */
+	protected function renderException($exception)
+	{
+		if ($this->errorAction !== null) {
+			\Yii::$app->runAction($this->errorAction);
+		} elseif (\Yii::$app instanceof \yii\web\Application) {
+			if (!headers_sent()) {
+				$errorCode = $exception instanceof HttpException ? $exception->statusCode : 500;
+				header("HTTP/1.0 $errorCode " . get_class($exception));
+			}
+			if (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest') {
+				\Yii::$app->renderException($exception);
+			} else {
+				// if there is an error during error rendering it's useful to
+				// display PHP error in debug mode instead of a blank screen
+				if(YII_DEBUG) {
+					ini_set('display_errors', 1);
+				}
+
+				$view = new View;
+				if (!YII_DEBUG || $exception instanceof UserException) {
+					$viewName = $this->errorView;
+				} else {
+					$viewName = $this->exceptionView;
+				}
+				echo $view->renderFile($viewName, array(
+					'exception' => $exception,
+				), $this);
+			}
+		} else {
+			\Yii::$app->renderException($exception);
+		}
+	}
+
+	/**
+	 * Returns server and Yii version information.
+	 * @return string server version information.
+	 */
+	public function getVersionInfo()
+	{
+		$version = '<a href="http://www.yiiframework.com/">Yii Framework</a>/' . \Yii::getVersion();
+		if (isset($_SERVER['SERVER_SOFTWARE'])) {
+			$version = $_SERVER['SERVER_SOFTWARE'] . ' ' . $version;
+		}
+		return $version;
+	}
+
+	/**
+	 * Converts arguments array to its string representation
+	 *
+	 * @param array $args arguments array to be converted
+	 * @return string string representation of the arguments array
+	 */
+	public function argumentsToString($args)
+	{
+		$isAssoc = $args !== array_values($args);
+		$count = 0;
+		foreach ($args as $key => $value) {
+			$count++;
+			if ($count >= 5) {
+				if ($count > 5) {
+					unset($args[$key]);
+				} else {
+					$args[$key] = '...';
+				}
+				continue;
+			}
+
+			if (is_object($value)) {
+				$args[$key] = get_class($value);
+			} elseif (is_bool($value)) {
+				$args[$key] = $value ? 'true' : 'false';
+			} elseif (is_string($value)) {
+				if (strlen($value) > 64) {
+					$args[$key] = '"' . substr($value, 0, 64) . '..."';
+				} else {
+					$args[$key] = '"' . $value . '"';
+				}
+			} elseif (is_array($value)) {
+				$args[$key] = 'array(' . $this->argumentsToString($value) . ')';
+			} elseif ($value === null) {
+				$args[$key] = 'null';
+			} elseif (is_resource($value)) {
+				$args[$key] = 'resource';
+			}
+
+			if (is_string($key)) {
+				$args[$key] = '"' . $key . '" => ' . $args[$key];
+			} elseif ($isAssoc) {
+				$args[$key] = $key . ' => ' . $args[$key];
+			}
+		}
+		return implode(', ', $args);
+	}
+
+	/**
+	 * Returns a value indicating whether the call stack is from application code.
+	 * @param array $trace the trace data
+	 * @return boolean whether the call stack is from application code.
+	 */
+	public function isCoreCode($trace)
+	{
+		if (isset($trace['file'])) {
+			return $trace['file'] === 'unknown' || strpos(realpath($trace['file']), YII_PATH . DIRECTORY_SEPARATOR) === 0;
+		}
+		return false;
+	}
+
+	/**
+	 * Renders the source code around the error line.
+	 * @param string $file source file path
+	 * @param integer $errorLine the error line number
+	 * @param integer $maxLines maximum number of lines to display
+	 */
+	public function renderSourceCode($file, $errorLine, $maxLines)
+	{
+		$errorLine--; // adjust line number to 0-based from 1-based
+		if ($errorLine < 0 || ($lines = @file($file)) === false || ($lineCount = count($lines)) <= $errorLine) {
+			return;
+		}
+
+		$halfLines = (int)($maxLines / 2);
+		$beginLine = $errorLine - $halfLines > 0 ? $errorLine - $halfLines : 0;
+		$endLine = $errorLine + $halfLines < $lineCount ? $errorLine + $halfLines : $lineCount - 1;
+		$lineNumberWidth = strlen($endLine + 1);
+
+		$output = '';
+		for ($i = $beginLine; $i <= $endLine; ++$i) {
+			$isErrorLine = $i === $errorLine;
+			$code = sprintf("<span class=\"ln" . ($isErrorLine ? ' error-ln' : '') . "\">%0{$lineNumberWidth}d</span> %s", $i + 1, $this->htmlEncode(str_replace("\t", '    ', $lines[$i])));
+			if (!$isErrorLine) {
+				$output .= $code;
+			} else {
+				$output .= '<span class="error">' . $code . '</span>';
+			}
+		}
+		echo '<div class="code"><pre>' . $output . '</pre></div>';
+	}
+
+	/**
+	 * Renders calls stack trace
+	 * @param array $trace
+	 */
+	public function renderTrace($trace)
+	{
+		$count = 0;
+		echo "<table>\n";
+		foreach ($trace as $n => $t) {
+			if ($this->isCoreCode($t)) {
+				$cssClass = 'core collapsed';
+			} elseif (++$count > 3) {
+				$cssClass = 'app collapsed';
+			} else {
+				$cssClass = 'app expanded';
+			}
+
+			$hasCode = isset($t['file']) && $t['file'] !== 'unknown' && is_file($t['file']);
+			echo "<tr class=\"trace $cssClass\"><td class=\"number\">#$n</td><td class=\"content\">";
+			echo '<div class="trace-file">';
+			if ($hasCode) {
+				echo '<div class="plus">+</div><div class="minus">-</div>';
+			}
+			echo '&nbsp;';
+			if(isset($t['file'])) {
+				echo $this->htmlEncode($t['file']) . '(' . $t['line'] . '): ';
+			}
+			if (!empty($t['class'])) {
+				echo '<strong>' . $t['class'] . '</strong>' . $t['type'];
+			}
+			echo '<strong>' . $t['function'] . '</strong>';
+			echo '(' . (empty($t['args']) ? '' : $this->htmlEncode($this->argumentsToString($t['args']))) . ')';
+			echo '</div>';
+			if ($hasCode) {
+				$this->renderSourceCode($t['file'], $t['line'], $this->maxTraceSourceLines);
+			}
+			echo "</td></tr>\n";
+		}
+		echo '</table>';
+	}
+
+	/**
+	 * Converts special characters to HTML entities
+	 * @param string $text text to encode
+	 * @return string
+	 */
+	public function htmlEncode($text)
+	{
+		return htmlspecialchars($text, ENT_QUOTES, \Yii::$app->charset);
+	}
+
+	public function clearOutput()
+	{
+		// the following manual level counting is to deal with zlib.output_compression set to On
+		for ($level = ob_get_level(); $level > 0; --$level) {
+			@ob_end_clean();
+		}
+	}
+
+	/**
+	 * @param \Exception $exception
+	 */
+	public function renderAsHtml($exception)
+	{
+		$view = new View;
+		$name = !YII_DEBUG || $exception instanceof HttpException ? $this->errorView : $this->exceptionView;
+		echo $view->renderFile($name, array(
+			'exception' => $exception,
+		), $this);
+	}
+}
diff --git a/yii/base/Event.php b/yii/base/Event.php
new file mode 100644
index 0000000..5d40736
--- /dev/null
+++ b/yii/base/Event.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+/**
+ * Event is the base class for all event classes.
+ *
+ * It encapsulates the parameters associated with an event.
+ * The [[sender]] property describes who raises the event.
+ * And the [[handled]] property indicates if the event is handled.
+ * If an event handler sets [[handled]] to be true, the rest of the
+ * uninvoked handlers will no longer be called to handle the event.
+ *
+ * Additionally, when attaching an event handler, extra data may be passed
+ * and be available via the [[data]] property when the event handler is invoked.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Event extends Object
+{
+	/**
+	 * @var string the event name. This property is set by [[Component::trigger()]].
+	 * Event handlers may use this property to check what event it is handling.
+	 */
+	public $name;
+	/**
+	 * @var object the sender of this event. If not set, this property will be
+	 * set as the object whose "trigger()" method is called.
+	 */
+	public $sender;
+	/**
+	 * @var boolean whether the event is handled. Defaults to false.
+	 * When a handler sets this to be true, the event processing will stop and
+	 * ignore the rest of the uninvoked event handlers.
+	 */
+	public $handled = false;
+	/**
+	 * @var mixed the data that is passed to [[Component::on()]] when attaching an event handler.
+	 * Note that this varies according to which event handler is currently executing.
+	 */
+	public $data;
+}
diff --git a/yii/base/Exception.php b/yii/base/Exception.php
new file mode 100644
index 0000000..7d26bd0
--- /dev/null
+++ b/yii/base/Exception.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+/**
+ * Exception represents a generic exception for all purposes.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Exception extends \Exception
+{
+	/**
+	 * @return string the user-friendly name of this exception
+	 */
+	public function getName()
+	{
+		return \Yii::t('yii|Exception');
+	}
+}
diff --git a/yii/base/HttpException.php b/yii/base/HttpException.php
new file mode 100644
index 0000000..948d96b
--- /dev/null
+++ b/yii/base/HttpException.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+/**
+ * HttpException represents an exception caused by an improper request of the end-user.
+ *
+ * HttpException can be differentiated via its [[statusCode]] property value which
+ * keeps a standard HTTP status code (e.g. 404, 500). Error handlers may use this status code
+ * to decide how to format the error page.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class HttpException extends UserException
+{
+	/**
+	 * @var integer HTTP status code, such as 403, 404, 500, etc.
+	 */
+	public $statusCode;
+
+	/**
+	 * Constructor.
+	 * @param integer $status HTTP status code, such as 404, 500, etc.
+	 * @param string $message error message
+	 * @param integer $code error code
+	 * @param \Exception $previous The previous exception used for the exception chaining.
+	 */
+	public function __construct($status, $message = null, $code = 0, \Exception $previous = null)
+	{
+		$this->statusCode = $status;
+		parent::__construct($message, $code, $previous);
+	}
+
+	/**
+	 * @return string the user-friendly name of this exception
+	 */
+	public function getName()
+	{
+		static $httpCodes = array(
+			100 => 'Continue',
+			101 => 'Switching Protocols',
+			102 => 'Processing',
+			118 => 'Connection timed out',
+			200 => 'OK',
+			201 => 'Created',
+			202 => 'Accepted',
+			203 => 'Non-Authoritative',
+			204 => 'No Content',
+			205 => 'Reset Content',
+			206 => 'Partial Content',
+			207 => 'Multi-Status',
+			210 => 'Content Different',
+			300 => 'Multiple Choices',
+			301 => 'Moved Permanently',
+			302 => 'Found',
+			303 => 'See Other',
+			304 => 'Not Modified',
+			305 => 'Use Proxy',
+			307 => 'Temporary Redirect',
+			310 => 'Too many Redirect',
+			400 => 'Bad Request',
+			401 => 'Unauthorized',
+			402 => 'Payment Required',
+			403 => 'Forbidden',
+			404 => 'Not Found',
+			405 => 'Method Not Allowed',
+			406 => 'Not Acceptable',
+			407 => 'Proxy Authentication Required',
+			408 => 'Request Time-out',
+			409 => 'Conflict',
+			410 => 'Gone',
+			411 => 'Length Required',
+			412 => 'Precondition Failed',
+			413 => 'Request Entity Too Large',
+			414 => 'Request-URI Too Long',
+			415 => 'Unsupported Media Type',
+			416 => 'Requested range unsatisfiable',
+			417 => 'Expectation failed',
+			418 => 'I’m a teapot',
+			422 => 'Unprocessable entity',
+			423 => 'Locked',
+			424 => 'Method failure',
+			425 => 'Unordered Collection',
+			426 => 'Upgrade Required',
+			449 => 'Retry With',
+			450 => 'Blocked by Windows Parental Controls',
+			500 => 'Internal Server Error',
+			501 => 'Not Implemented',
+			502 => 'Bad Gateway ou Proxy Error',
+			503 => 'Service Unavailable',
+			504 => 'Gateway Time-out',
+			505 => 'HTTP Version not supported',
+			507 => 'Insufficient storage',
+			509 => 'Bandwidth Limit Exceeded',
+		);
+
+		if(isset($httpCodes[$this->statusCode]))
+			return $httpCodes[$this->statusCode];
+		else
+			return \Yii::t('yii|Error');
+	}
+}
diff --git a/yii/base/InlineAction.php b/yii/base/InlineAction.php
new file mode 100644
index 0000000..c5afe28
--- /dev/null
+++ b/yii/base/InlineAction.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+/**
+ * InlineAction represents an action that is defined as a controller method.
+ *
+ * The name of the controller method is available via [[actionMethod]] which
+ * is set by the [[controller]] who creates this action.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class InlineAction extends Action
+{
+	/**
+	 * @var string the controller method that  this inline action is associated with
+	 */
+	public $actionMethod;
+
+	/**
+	 * @param string $id the ID of this action
+	 * @param Controller $controller the controller that owns this action
+	 * @param string $actionMethod the controller method that  this inline action is associated with
+	 * @param array $config name-value pairs that will be used to initialize the object properties
+	 */
+	public function __construct($id, $controller, $actionMethod, $config = array())
+	{
+		$this->actionMethod = $actionMethod;
+		parent::__construct($id, $controller, $config);
+	}
+
+	/**
+	 * Runs this action with the specified parameters.
+	 * This method is mainly invoked by the controller.
+	 * @param array $params action parameters
+	 * @return integer the exit status (0 means normal, non-zero means abnormal).
+	 */
+	public function runWithParams($params)
+	{
+		$args = $this->controller->bindActionParams($this, $params);
+		return (int)call_user_func_array(array($this->controller, $this->actionMethod), $args);
+	}
+}
diff --git a/yii/base/InvalidCallException.php b/yii/base/InvalidCallException.php
new file mode 100644
index 0000000..9aefe14
--- /dev/null
+++ b/yii/base/InvalidCallException.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+/**
+ * InvalidCallException represents an exception caused by calling a method in a wrong way.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class InvalidCallException extends Exception
+{
+	/**
+	 * @return string the user-friendly name of this exception
+	 */
+	public function getName()
+	{
+		return \Yii::t('yii|Invalid Call');
+	}
+}
+
diff --git a/yii/base/InvalidConfigException.php b/yii/base/InvalidConfigException.php
new file mode 100644
index 0000000..389737c
--- /dev/null
+++ b/yii/base/InvalidConfigException.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+/**
+ * InvalidConfigException represents an exception caused by incorrect object configuration.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class InvalidConfigException extends Exception
+{
+	/**
+	 * @return string the user-friendly name of this exception
+	 */
+	public function getName()
+	{
+		return \Yii::t('yii|Invalid Configuration');
+	}
+}
+
diff --git a/yii/base/InvalidParamException.php b/yii/base/InvalidParamException.php
new file mode 100644
index 0000000..a8c96fd
--- /dev/null
+++ b/yii/base/InvalidParamException.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+/**
+ * InvalidParamException represents an exception caused by invalid parameters passed to a method.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class InvalidParamException extends Exception
+{
+	/**
+	 * @return string the user-friendly name of this exception
+	 */
+	public function getName()
+	{
+		return \Yii::t('yii|Invalid Parameter');
+	}
+}
+
diff --git a/yii/base/InvalidRequestException.php b/yii/base/InvalidRequestException.php
new file mode 100644
index 0000000..6663e29
--- /dev/null
+++ b/yii/base/InvalidRequestException.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+/**
+ * InvalidRequestException represents an exception caused by incorrect end user request.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class InvalidRequestException extends UserException
+{
+	/**
+	 * @return string the user-friendly name of this exception
+	 */
+	public function getName()
+	{
+		return \Yii::t('yii|Invalid Request');
+	}
+}
+
diff --git a/yii/base/InvalidRouteException.php b/yii/base/InvalidRouteException.php
new file mode 100644
index 0000000..6d2256e
--- /dev/null
+++ b/yii/base/InvalidRouteException.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+/**
+ * InvalidRouteException represents an exception caused by an invalid route.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class InvalidRouteException extends UserException
+{
+	/**
+	 * @return string the user-friendly name of this exception
+	 */
+	public function getName()
+	{
+		return \Yii::t('yii|Invalid Route');
+	}
+}
+
diff --git a/yii/base/Model.php b/yii/base/Model.php
new file mode 100644
index 0000000..7f55239
--- /dev/null
+++ b/yii/base/Model.php
@@ -0,0 +1,688 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+use yii\helpers\StringHelper;
+use yii\validators\RequiredValidator;
+use yii\validators\Validator;
+
+/**
+ * Model is the base class for data models.
+ *
+ * Model implements the following commonly used features:
+ *
+ * - attribute declaration: by default, every public class member is considered as
+ *   a model attribute
+ * - attribute labels: each attribute may be associated with a label for display purpose
+ * - massive attribute assignment
+ * - scenario-based validation
+ *
+ * Model also raises the following events when performing data validation:
+ *
+ * - [[EVENT_BEFORE_VALIDATE]]: an event raised at the beginning of [[validate()]]
+ * - [[EVENT_AFTER_VALIDATE]]: an event raised at the end of [[validate()]]
+ *
+ * You may directly use Model to store model data, or extend it with customization.
+ * You may also customize Model by attaching [[ModelBehavior|model behaviors]].
+ *
+ * @property Vector $validators All the validators declared in the model.
+ * @property array $activeValidators The validators applicable to the current [[scenario]].
+ * @property array $errors Errors for all attributes or the specified attribute. Empty array is returned if no error.
+ * @property array $attributes Attribute values (name=>value).
+ * @property string $scenario The scenario that this model is in.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Model extends Component implements \IteratorAggregate, \ArrayAccess
+{
+	/**
+	 * @event ModelEvent an event raised at the beginning of [[validate()]]. You may set
+	 * [[ModelEvent::isValid]] to be false to stop the validation.
+	 */
+	const EVENT_BEFORE_VALIDATE = 'beforeValidate';
+	/**
+	 * @event Event an event raised at the end of [[validate()]]
+	 */
+	const EVENT_AFTER_VALIDATE = 'afterValidate';
+
+	/**
+	 * @var array validation errors (attribute name => array of errors)
+	 */
+	private $_errors;
+	/**
+	 * @var Vector vector of validators
+	 */
+	private $_validators;
+	/**
+	 * @var string current scenario
+	 */
+	private $_scenario = 'default';
+
+	/**
+	 * Returns the validation rules for attributes.
+	 *
+	 * Validation rules are used by [[validate()]] to check if attribute values are valid.
+	 * Child classes may override this method to declare different validation rules.
+	 *
+	 * Each rule is an array with the following structure:
+	 *
+	 * ~~~
+	 * array(
+	 *     'attribute list',
+	 *     'validator type',
+	 *     'on'=>'scenario name',
+	 *     ...other parameters...
+	 * )
+	 * ~~~
+	 *
+	 * where
+	 *
+	 *  - attribute list: required, specifies the attributes (separated by commas) to be validated;
+	 *  - validator type: required, specifies the validator to be used. It can be the name of a model
+	 *    class method, the name of a built-in validator, or a validator class name (or its path alias).
+	 *  - on: optional, specifies the [[scenario|scenarios]] (separated by commas) when the validation
+	 *    rule can be applied. If this option is not set, the rule will apply to all scenarios.
+	 *  - additional name-value pairs can be specified to initialize the corresponding validator properties.
+	 *    Please refer to individual validator class API for possible properties.
+	 *
+	 * A validator can be either an object of a class extending [[Validator]], or a model class method
+	 * (called *inline validator*) that has the following signature:
+	 *
+	 * ~~~
+	 * // $params refers to validation parameters given in the rule
+	 * function validatorName($attribute, $params)
+	 * ~~~
+	 *
+	 * Yii also provides a set of [[Validator::builtInValidators|built-in validators]].
+	 * They each has an alias name which can be used when specifying a validation rule.
+	 *
+	 * Below are some examples:
+	 *
+	 * ~~~
+	 * array(
+	 *     // built-in "required" validator
+	 *     array('username', 'required'),
+	 *     // built-in "length" validator customized with "min" and "max" properties
+	 *     array('username', 'length', 'min'=>3, 'max'=>12),
+	 *     // built-in "compare" validator that is used in "register" scenario only
+	 *     array('password', 'compare', 'compareAttribute'=>'password2', 'on'=>'register'),
+	 *     // an inline validator defined via the "authenticate()" method in the model class
+	 *     array('password', 'authenticate', 'on'=>'login'),
+	 *     // a validator of class "CaptchaValidator"
+	 *     array('captcha', 'CaptchaValidator'),
+	 * );
+	 * ~~~
+	 *
+	 * Note, in order to inherit rules defined in the parent class, a child class needs to
+	 * merge the parent rules with child rules using functions such as `array_merge()`.
+	 *
+	 * @return array validation rules
+	 * @see scenarios
+	 */
+	public function rules()
+	{
+		return array();
+	}
+
+	/**
+	 * Returns a list of scenarios and the corresponding active attributes.
+	 * An active attribute is one that is subject to validation in the current scenario.
+	 * The returned array should be in the following format:
+	 *
+	 * ~~~
+	 * array(
+	 *     'scenario1' => array('attribute11', 'attribute12', ...),
+	 *     'scenario2' => array('attribute21', 'attribute22', ...),
+	 *     ...
+	 * )
+	 * ~~~
+	 *
+	 * By default, an active attribute that is considered safe and can be massively assigned.
+	 * If an attribute should NOT be massively assigned (thus considered unsafe),
+	 * please prefix the attribute with an exclamation character (e.g. '!rank').
+	 *
+	 * The default implementation of this method will return a 'default' scenario
+	 * which corresponds to all attributes listed in the validation rules applicable
+	 * to the 'default' scenario.
+	 *
+	 * @return array a list of scenarios and the corresponding active attributes.
+	 */
+	public function scenarios()
+	{
+		$attributes = array();
+		foreach ($this->getActiveValidators() as $validator) {
+			if ($validator->isActive('default')) {
+				foreach ($validator->attributes as $name) {
+					$attributes[$name] = true;
+				}
+			}
+		}
+		return array(
+			'default' => array_keys($attributes),
+		);
+	}
+
+	/**
+	 * Returns the form name that this model class should use.
+	 *
+	 * The form name is mainly used by [[\yii\web\ActiveForm]] to determine how to name
+	 * the input fields for the attributes in a model. If the form name is "A" and an attribute
+	 * name is "b", then the corresponding input name would be "A[b]". If the form name is
+	 * an empty string, then the input name would be "b".
+	 *
+	 * By default, this method returns the model class name (without the namespace part)
+	 * as the form name. You may override it when the model is used in different forms.
+	 *
+	 * @return string the form name of this model class.
+	 */
+	public function formName()
+	{
+		$class = get_class($this);
+		$pos = strrpos($class, '\\');
+		return $pos === false ? $class : substr($class, $pos + 1);
+	}
+
+	/**
+	 * Returns the list of attribute names.
+	 * By default, this method returns all public non-static properties of the class.
+	 * You may override this method to change the default behavior.
+	 * @return array list of attribute names.
+	 */
+	public function attributes()
+	{
+		$class = new \ReflectionClass($this);
+		$names = array();
+		foreach ($class->getProperties(\ReflectionProperty::IS_PUBLIC) as $property) {
+			$name = $property->getName();
+			if (!$property->isStatic()) {
+				$names[] = $name;
+			}
+		}
+		return $names;
+	}
+
+	/**
+	 * Returns the attribute labels.
+	 *
+	 * Attribute labels are mainly used for display purpose. For example, given an attribute
+	 * `firstName`, we can declare a label `First Name` which is more user-friendly and can
+	 * be displayed to end users.
+	 *
+	 * By default an attribute label is generated using [[generateAttributeLabel()]].
+	 * This method allows you to explicitly specify attribute labels.
+	 *
+	 * Note, in order to inherit labels defined in the parent class, a child class needs to
+	 * merge the parent labels with child labels using functions such as `array_merge()`.
+	 *
+	 * @return array attribute labels (name=>label)
+	 * @see generateAttributeLabel
+	 */
+	public function attributeLabels()
+	{
+		return array();
+	}
+
+	/**
+	 * Performs the data validation.
+	 *
+	 * This method executes the validation rules applicable to the current [[scenario]].
+	 * The following criteria are used to determine whether a rule is currently applicable:
+	 *
+	 * - the rule must be associated with the attributes relevant to the current scenario;
+	 * - the rules must be effective for the current scenario.
+	 *
+	 * This method will call [[beforeValidate()]] and [[afterValidate()]] before and
+	 * after the actual validation, respectively. If [[beforeValidate()]] returns false,
+	 * the validation will be cancelled and [[afterValidate()]] will not be called.
+	 *
+	 * Errors found during the validation can be retrieved via [[getErrors()]]
+	 * and [[getError()]].
+	 *
+	 * @param array $attributes list of attributes that should be validated.
+	 * If this parameter is empty, it means any attribute listed in the applicable
+	 * validation rules should be validated.
+	 * @param boolean $clearErrors whether to call [[clearErrors()]] before performing validation
+	 * @return boolean whether the validation is successful without any error.
+	 */
+	public function validate($attributes = null, $clearErrors = true)
+	{
+		if ($clearErrors) {
+			$this->clearErrors();
+		}
+		if ($attributes === null) {
+			$attributes = $this->activeAttributes();
+		}
+		if ($this->beforeValidate()) {
+			foreach ($this->getActiveValidators() as $validator) {
+				$validator->validate($this, $attributes);
+			}
+			$this->afterValidate();
+			return !$this->hasErrors();
+		}
+		return false;
+	}
+
+	/**
+	 * This method is invoked before validation starts.
+	 * The default implementation raises a `beforeValidate` event.
+	 * You may override this method to do preliminary checks before validation.
+	 * Make sure the parent implementation is invoked so that the event can be raised.
+	 * @return boolean whether the validation should be executed. Defaults to true.
+	 * If false is returned, the validation will stop and the model is considered invalid.
+	 */
+	public function beforeValidate()
+	{
+		$event = new ModelEvent;
+		$this->trigger(self::EVENT_BEFORE_VALIDATE, $event);
+		return $event->isValid;
+	}
+
+	/**
+	 * This method is invoked after validation ends.
+	 * The default implementation raises an `afterValidate` event.
+	 * You may override this method to do postprocessing after validation.
+	 * Make sure the parent implementation is invoked so that the event can be raised.
+	 */
+	public function afterValidate()
+	{
+		$this->trigger(self::EVENT_AFTER_VALIDATE);
+	}
+
+	/**
+	 * Returns all the validators declared in [[rules()]].
+	 *
+	 * This method differs from [[getActiveValidators()]] in that the latter
+	 * only returns the validators applicable to the current [[scenario]].
+	 *
+	 * Because this method returns a [[Vector]] object, you may
+	 * manipulate it by inserting or removing validators (useful in model behaviors).
+	 * For example,
+	 *
+	 * ~~~
+	 * $model->validators->add($newValidator);
+	 * ~~~
+	 *
+	 * @return Vector all the validators declared in the model.
+	 */
+	public function getValidators()
+	{
+		if ($this->_validators === null) {
+			$this->_validators = $this->createValidators();
+		}
+		return $this->_validators;
+	}
+
+	/**
+	 * Returns the validators applicable to the current [[scenario]].
+	 * @param string $attribute the name of the attribute whose applicable validators should be returned.
+	 * If this is null, the validators for ALL attributes in the model will be returned.
+	 * @return \yii\validators\Validator[] the validators applicable to the current [[scenario]].
+	 */
+	public function getActiveValidators($attribute = null)
+	{
+		$validators = array();
+		$scenario = $this->getScenario();
+		/** @var $validator Validator */
+		foreach ($this->getValidators() as $validator) {
+			if ($validator->isActive($scenario) && ($attribute === null || in_array($attribute, $validator->attributes, true))) {
+				$validators[] = $validator;
+			}
+		}
+		return $validators;
+	}
+
+	/**
+	 * Creates validator objects based on the validation rules specified in [[rules()]].
+	 * Unlike [[getValidators()]], each time this method is called, a new list of validators will be returned.
+	 * @return Vector validators
+	 * @throws InvalidConfigException if any validation rule configuration is invalid
+	 */
+	public function createValidators()
+	{
+		$validators = new Vector;
+		foreach ($this->rules() as $rule) {
+			if ($rule instanceof Validator) {
+				$validators->add($rule);
+			} elseif (is_array($rule) && isset($rule[0], $rule[1])) { // attributes, validator type
+				$validator = Validator::createValidator($rule[1], $this, $rule[0], array_slice($rule, 2));
+				$validators->add($validator);
+			} else {
+				throw new InvalidConfigException('Invalid validation rule: a rule must specify both attribute names and validator type.');
+			}
+		}
+		return $validators;
+	}
+
+	/**
+	 * Returns a value indicating whether the attribute is required.
+	 * This is determined by checking if the attribute is associated with a
+	 * [[\yii\validators\RequiredValidator|required]] validation rule in the
+	 * current [[scenario]].
+	 * @param string $attribute attribute name
+	 * @return boolean whether the attribute is required
+	 */
+	public function isAttributeRequired($attribute)
+	{
+		foreach ($this->getActiveValidators($attribute) as $validator) {
+			if ($validator instanceof RequiredValidator) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Returns a value indicating whether the attribute is safe for massive assignments.
+	 * @param string $attribute attribute name
+	 * @return boolean whether the attribute is safe for massive assignments
+	 */
+	public function isAttributeSafe($attribute)
+	{
+		return in_array($attribute, $this->safeAttributes(), true);
+	}
+
+	/**
+	 * Returns the text label for the specified attribute.
+	 * @param string $attribute the attribute name
+	 * @return string the attribute label
+	 * @see generateAttributeLabel
+	 * @see attributeLabels
+	 */
+	public function getAttributeLabel($attribute)
+	{
+		$labels = $this->attributeLabels();
+		return isset($labels[$attribute]) ? $labels[$attribute] : $this->generateAttributeLabel($attribute);
+	}
+
+	/**
+	 * Returns a value indicating whether there is any validation error.
+	 * @param string|null $attribute attribute name. Use null to check all attributes.
+	 * @return boolean whether there is any error.
+	 */
+	public function hasErrors($attribute = null)
+	{
+		return $attribute === null ? !empty($this->_errors) : isset($this->_errors[$attribute]);
+	}
+
+	/**
+	 * Returns the errors for all attribute or a single attribute.
+	 * @param string $attribute attribute name. Use null to retrieve errors for all attributes.
+	 * @return array errors for all attributes or the specified attribute. Empty array is returned if no error.
+	 * Note that when returning errors for all attributes, the result is a two-dimensional array, like the following:
+	 *
+	 * ~~~
+	 * array(
+	 *     'username' => array(
+	 *         'Username is required.',
+	 *         'Username must contain only word characters.',
+	 *     ),
+	 *     'email' => array(
+	 *         'Email address is invalid.',
+	 *     )
+	 * )
+	 * ~~~
+	 *
+	 * @see getError
+	 */
+	public function getErrors($attribute = null)
+	{
+		if ($attribute === null) {
+			return $this->_errors === null ? array() : $this->_errors;
+		} else {
+			return isset($this->_errors[$attribute]) ? $this->_errors[$attribute] : array();
+		}
+	}
+
+	/**
+	 * Returns the first error of every attribute in the model.
+	 * @return array the first errors. An empty array will be returned if there is no error.
+	 */
+	public function getFirstErrors()
+	{
+		if (empty($this->_errors)) {
+			return array();
+		} else {
+			$errors = array();
+			foreach ($this->_errors as $attributeErrors) {
+				if (isset($attributeErrors[0])) {
+					$errors[] = $attributeErrors[0];
+				}
+			}
+		}
+		return $errors;
+	}
+
+	/**
+	 * Returns the first error of the specified attribute.
+	 * @param string $attribute attribute name.
+	 * @return string the error message. Null is returned if no error.
+	 * @see getErrors
+	 */
+	public function getFirstError($attribute)
+	{
+		return isset($this->_errors[$attribute]) ? reset($this->_errors[$attribute]) : null;
+	}
+
+	/**
+	 * Adds a new error to the specified attribute.
+	 * @param string $attribute attribute name
+	 * @param string $error new error message
+	 */
+	public function addError($attribute, $error)
+	{
+		$this->_errors[$attribute][] = $error;
+	}
+
+	/**
+	 * Removes errors for all attributes or a single attribute.
+	 * @param string $attribute attribute name. Use null to remove errors for all attribute.
+	 */
+	public function clearErrors($attribute = null)
+	{
+		if ($attribute === null) {
+			$this->_errors = array();
+		} else {
+			unset($this->_errors[$attribute]);
+		}
+	}
+
+	/**
+	 * Generates a user friendly attribute label based on the give attribute name.
+	 * This is done by replacing underscores, dashes and dots with blanks and
+	 * changing the first letter of each word to upper case.
+	 * For example, 'department_name' or 'DepartmentName' will generate 'Department Name'.
+	 * @param string $name the column name
+	 * @return string the attribute label
+	 */
+	public function generateAttributeLabel($name)
+	{
+		return StringHelper::camel2words($name, true);
+	}
+
+	/**
+	 * Returns attribute values.
+	 * @param array $names list of attributes whose value needs to be returned.
+	 * Defaults to null, meaning all attributes listed in [[attributes()]] will be returned.
+	 * If it is an array, only the attributes in the array will be returned.
+	 * @param array $except list of attributes whose value should NOT be returned.
+	 * @return array attribute values (name=>value).
+	 */
+	public function getAttributes($names = null, $except = array())
+	{
+		$values = array();
+		if ($names === null) {
+			$names = $this->attributes();
+		}
+		foreach ($names as $name) {
+			$values[$name] = $this->$name;
+		}
+		foreach ($except as $name) {
+			unset($values[$name]);
+		}
+
+		return $values;
+	}
+
+	/**
+	 * Sets the attribute values in a massive way.
+	 * @param array $values attribute values (name=>value) to be assigned to the model.
+	 * @param boolean $safeOnly whether the assignments should only be done to the safe attributes.
+	 * A safe attribute is one that is associated with a validation rule in the current [[scenario]].
+	 * @see safeAttributes()
+	 * @see attributes()
+	 */
+	public function setAttributes($values, $safeOnly = true)
+	{
+		if (is_array($values)) {
+			$attributes = array_flip($safeOnly ? $this->safeAttributes() : $this->attributes());
+			foreach ($values as $name => $value) {
+				if (isset($attributes[$name])) {
+					$this->$name = $value;
+				} elseif ($safeOnly) {
+					$this->onUnsafeAttribute($name, $value);
+				}
+			}
+		}
+	}
+
+	/**
+	 * This method is invoked when an unsafe attribute is being massively assigned.
+	 * The default implementation will log a warning message if YII_DEBUG is on.
+	 * It does nothing otherwise.
+	 * @param string $name the unsafe attribute name
+	 * @param mixed $value the attribute value
+	 */
+	public function onUnsafeAttribute($name, $value)
+	{
+		if (YII_DEBUG) {
+			\Yii::info("Failed to set unsafe attribute '$name' in '" . get_class($this) . "'.", __METHOD__);
+		}
+	}
+
+	/**
+	 * Returns the scenario that this model is used in.
+	 *
+	 * Scenario affects how validation is performed and which attributes can
+	 * be massively assigned.
+	 *
+	 * @return string the scenario that this model is in. Defaults to 'default'.
+	 */
+	public function getScenario()
+	{
+		return $this->_scenario;
+	}
+
+	/**
+	 * Sets the scenario for the model.
+	 * @param string $value the scenario that this model is in.
+	 * @see getScenario
+	 */
+	public function setScenario($value)
+	{
+		$this->_scenario = $value;
+	}
+
+	/**
+	 * Returns the attribute names that are safe to be massively assigned in the current scenario.
+	 * @return array safe attribute names
+	 */
+	public function safeAttributes()
+	{
+		$scenario = $this->getScenario();
+		$scenarios = $this->scenarios();
+		$attributes = array();
+		if (isset($scenarios[$scenario])) {
+			foreach ($scenarios[$scenario] as $attribute) {
+				if ($attribute[0] !== '!') {
+					$attributes[] = $attribute;
+				}
+			}
+		}
+		return $attributes;
+	}
+
+	/**
+	 * Returns the attribute names that are subject to validation in the current scenario.
+	 * @return array safe attribute names
+	 */
+	public function activeAttributes()
+	{
+		$scenario = $this->getScenario();
+		$scenarios = $this->scenarios();
+		if (isset($scenarios[$scenario])) {
+			$attributes = $scenarios[$this->getScenario()];
+			foreach ($attributes as $i => $attribute) {
+				if ($attribute[0] === '!') {
+					$attributes[$i] = substr($attribute, 1);
+				}
+			}
+			return $attributes;
+		} else {
+			return array();
+		}
+	}
+
+	/**
+	 * Returns an iterator for traversing the attributes in the model.
+	 * This method is required by the interface IteratorAggregate.
+	 * @return DictionaryIterator an iterator for traversing the items in the list.
+	 */
+	public function getIterator()
+	{
+		$attributes = $this->getAttributes();
+		return new DictionaryIterator($attributes);
+	}
+
+	/**
+	 * Returns whether there is an element at the specified offset.
+	 * This method is required by the SPL interface `ArrayAccess`.
+	 * It is implicitly called when you use something like `isset($model[$offset])`.
+	 * @param mixed $offset the offset to check on
+	 * @return boolean
+	 */
+	public function offsetExists($offset)
+	{
+		return $this->$offset !== null;
+	}
+
+	/**
+	 * Returns the element at the specified offset.
+	 * This method is required by the SPL interface `ArrayAccess`.
+	 * It is implicitly called when you use something like `$value = $model[$offset];`.
+	 * @param mixed $offset the offset to retrieve element.
+	 * @return mixed the element at the offset, null if no element is found at the offset
+	 */
+	public function offsetGet($offset)
+	{
+		return $this->$offset;
+	}
+
+	/**
+	 * Sets the element at the specified offset.
+	 * This method is required by the SPL interface `ArrayAccess`.
+	 * It is implicitly called when you use something like `$model[$offset] = $item;`.
+	 * @param integer $offset the offset to set element
+	 * @param mixed $item the element value
+	 */
+	public function offsetSet($offset, $item)
+	{
+		$this->$offset = $item;
+	}
+
+	/**
+	 * Sets the element value at the specified offset to null.
+	 * This method is required by the SPL interface `ArrayAccess`.
+	 * It is implicitly called when you use something like `unset($model[$offset])`.
+	 * @param mixed $offset the offset to unset element
+	 */
+	public function offsetUnset($offset)
+	{
+		$this->$offset = null;
+	}
+}
diff --git a/yii/base/ModelEvent.php b/yii/base/ModelEvent.php
new file mode 100644
index 0000000..57e41f9
--- /dev/null
+++ b/yii/base/ModelEvent.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+/**
+ * ModelEvent class.
+ *
+ * ModelEvent represents the parameter needed by model events.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class ModelEvent extends Event
+{
+	/**
+	 * @var boolean whether the model is in valid status. Defaults to true.
+	 * A model is in valid status if it passes validations or certain checks.
+	 */
+	public $isValid = true;
+}
diff --git a/yii/base/Module.php b/yii/base/Module.php
new file mode 100644
index 0000000..b1597e2
--- /dev/null
+++ b/yii/base/Module.php
@@ -0,0 +1,650 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+use Yii;
+use yii\helpers\StringHelper;
+
+/**
+ * Module is the base class for module and application classes.
+ *
+ * A module represents a sub-application which contains MVC elements by itself, such as
+ * models, views, controllers, etc.
+ *
+ * A module may consist of [[modules|sub-modules]].
+ *
+ * [[components|Components]] may be registered with the module so that they are globally
+ * accessible within the module.
+ *
+ * @property string $uniqueId An ID that uniquely identifies this module among all modules within
+ * the current application.
+ * @property string $basePath The root directory of the module. Defaults to the directory containing the module class.
+ * @property string $controllerPath The directory containing the controller classes. Defaults to "[[basePath]]/controllers".
+ * @property string $viewPath The directory containing the view files within this module. Defaults to "[[basePath]]/views".
+ * @property string $layoutPath The directory containing the layout view files within this module. Defaults to "[[viewPath]]/layouts".
+ * @property array $modules The configuration of the currently installed modules (module ID => configuration).
+ * @property array $components The components (indexed by their IDs) registered within this module.
+ * @property array $import List of aliases to be imported. This property is write-only.
+ * @property array $aliases List of aliases to be defined. This property is write-only.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+abstract class Module extends Component
+{
+	/**
+	 * @event ActionEvent an event raised before executing a controller action.
+	 * You may set [[ActionEvent::isValid]] to be false to cancel the action execution.
+	 */
+	const EVENT_BEFORE_ACTION = 'beforeAction';
+	/**
+	 * @event ActionEvent an event raised after executing a controller action.
+	 */
+	const EVENT_AFTER_ACTION = 'afterAction';
+	/**
+	 * @var array custom module parameters (name => value).
+	 */
+	public $params = array();
+	/**
+	 * @var array the IDs of the components that should be preloaded when this module is created.
+	 */
+	public $preload = array();
+	/**
+	 * @var string an ID that uniquely identifies this module among other modules which have the same [[module|parent]].
+	 */
+	public $id;
+	/**
+	 * @var Module the parent module of this module. Null if this module does not have a parent.
+	 */
+	public $module;
+	/**
+	 * @var string|boolean the layout that should be applied for views within this module. This refers to a view name
+	 * relative to [[layoutPath]]. If this is not set, it means the layout value of the [[module|parent module]]
+	 * will be taken. If this is false, layout will be disabled within this module.
+	 */
+	public $layout;
+	/**
+	 * @var array mapping from controller ID to controller configurations.
+	 * Each name-value pair specifies the configuration of a single controller.
+	 * A controller configuration can be either a string or an array.
+	 * If the former, the string should be the class name or path alias of the controller.
+	 * If the latter, the array must contain a 'class' element which specifies
+	 * the controller's class name or path alias, and the rest of the name-value pairs
+	 * in the array are used to initialize the corresponding controller properties. For example,
+	 *
+	 * ~~~
+	 * array(
+	 *   'account' => '@app/controllers/UserController',
+	 *   'article' => array(
+	 *      'class' => '@app/controllers/PostController',
+	 *      'pageTitle' => 'something new',
+	 *   ),
+	 * )
+	 * ~~~
+	 */
+	public $controllerMap = array();
+	/**
+	 * @var string the namespace that controller classes are in. Default is to use global namespace.
+	 */
+	public $controllerNamespace;
+	/**
+	 * @return string the default route of this module. Defaults to 'default'.
+	 * The route may consist of child module ID, controller ID, and/or action ID.
+	 * For example, `help`, `post/create`, `admin/post/create`.
+	 * If action ID is not given, it will take the default value as specified in
+	 * [[Controller::defaultAction]].
+	 */
+	public $defaultRoute = 'default';
+	/**
+	 * @var string the root directory of the module.
+	 */
+	private $_basePath;
+	/**
+	 * @var string the root directory that contains view files for this module
+	 */
+	private $_viewPath;
+	/**
+	 * @var string the root directory that contains layout view files for this module.
+	 */
+	private $_layoutPath;
+	/**
+	 * @var string the directory containing controller classes in the module.
+	 */
+	private $_controllerPath;
+	/**
+	 * @var array child modules of this module
+	 */
+	private $_modules = array();
+	/**
+	 * @var array components registered under this module
+	 */
+	private $_components = array();
+
+	/**
+	 * Constructor.
+	 * @param string $id the ID of this module
+	 * @param Module $parent the parent module (if any)
+	 * @param array $config name-value pairs that will be used to initialize the object properties
+	 */
+	public function __construct($id, $parent = null, $config = array())
+	{
+		$this->id = $id;
+		$this->module = $parent;
+		parent::__construct($config);
+	}
+
+	/**
+	 * Getter magic method.
+	 * This method is overridden to support accessing components
+	 * like reading module properties.
+	 * @param string $name component or property name
+	 * @return mixed the named property value
+	 */
+	public function __get($name)
+	{
+		if ($this->hasComponent($name)) {
+			return $this->getComponent($name);
+		} else {
+			return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Checks if a property value is null.
+	 * This method overrides the parent implementation by checking
+	 * if the named component is loaded.
+	 * @param string $name the property name or the event name
+	 * @return boolean whether the property value is null
+	 */
+	public function __isset($name)
+	{
+		if ($this->hasComponent($name)) {
+			return $this->getComponent($name) !== null;
+		} else {
+			return parent::__isset($name);
+		}
+	}
+
+	/**
+	 * Initializes the module.
+	 * This method is called after the module is created and initialized with property values
+	 * given in configuration. The default implement will create a path alias using the module [[id]]
+	 * and then call [[preloadComponents()]] to load components that are declared in [[preload]].
+	 */
+	public function init()
+	{
+		$this->preloadComponents();
+	}
+
+	/**
+	 * Returns an ID that uniquely identifies this module among all modules within the current application.
+	 * Note that if the module is an application, an empty string will be returned.
+	 * @return string the unique ID of the module.
+	 */
+	public function getUniqueId()
+	{
+		if ($this instanceof Application) {
+			return '';
+		} elseif ($this->module) {
+			return $this->module->getUniqueId() . '/' . $this->id;
+		} else {
+			return $this->id;
+		}
+	}
+
+	/**
+	 * Returns the root directory of the module.
+	 * It defaults to the directory containing the module class file.
+	 * @return string the root directory of the module.
+	 */
+	public function getBasePath()
+	{
+		if ($this->_basePath === null) {
+			$class = new \ReflectionClass($this);
+			$this->_basePath = dirname($class->getFileName());
+		}
+		return $this->_basePath;
+	}
+
+	/**
+	 * Sets the root directory of the module.
+	 * This method can only be invoked at the beginning of the constructor.
+	 * @param string $path the root directory of the module. This can be either a directory name or a path alias.
+	 * @throws InvalidParamException if the directory does not exist.
+	 */
+	public function setBasePath($path)
+	{
+		$path = Yii::getAlias($path);
+		$p = realpath($path);
+		if ($p !== false && is_dir($p)) {
+			$this->_basePath = $p;
+		} else {
+			throw new InvalidParamException("The directory does not exist: $path");
+		}
+	}
+
+	/**
+	 * Returns the directory that contains the controller classes.
+	 * Defaults to "[[basePath]]/controllers".
+	 * @return string the directory that contains the controller classes.
+	 */
+	public function getControllerPath()
+	{
+		if ($this->_controllerPath !== null) {
+			return $this->_controllerPath;
+		} else {
+			return $this->_controllerPath = $this->getBasePath() . DIRECTORY_SEPARATOR . 'controllers';
+		}
+	}
+
+	/**
+	 * Sets the directory that contains the controller classes.
+	 * @param string $path the directory that contains the controller classes.
+	 * This can be either a directory name or a path alias.
+	 * @throws Exception if the directory is invalid
+	 */
+	public function setControllerPath($path)
+	{
+		$this->_controllerPath = Yii::getAlias($path);
+	}
+
+	/**
+	 * Returns the directory that contains the view files for this module.
+	 * @return string the root directory of view files. Defaults to "[[basePath]]/view".
+	 */
+	public function getViewPath()
+	{
+		if ($this->_viewPath !== null) {
+			return $this->_viewPath;
+		} else {
+			return $this->_viewPath = $this->getBasePath() . DIRECTORY_SEPARATOR . 'views';
+		}
+	}
+
+	/**
+	 * Sets the directory that contains the view files.
+	 * @param string $path the root directory of view files.
+	 * @throws Exception if the directory is invalid
+	 */
+	public function setViewPath($path)
+	{
+		$this->_viewPath = Yii::getAlias($path);
+	}
+
+	/**
+	 * Returns the directory that contains layout view files for this module.
+	 * @return string the root directory of layout files. Defaults to "[[viewPath]]/layouts".
+	 */
+	public function getLayoutPath()
+	{
+		if ($this->_layoutPath !== null) {
+			return $this->_layoutPath;
+		} else {
+			return $this->_layoutPath = $this->getViewPath() . DIRECTORY_SEPARATOR . 'layouts';
+		}
+	}
+
+	/**
+	 * Sets the directory that contains the layout files.
+	 * @param string $path the root directory of layout files.
+	 * @throws Exception if the directory is invalid
+	 */
+	public function setLayoutPath($path)
+	{
+		$this->_layoutPath = Yii::getAlias($path);
+	}
+
+	/**
+	 * Defines path aliases.
+	 * This method calls [[Yii::setAlias()]] to register the path aliases.
+	 * This method is provided so that you can define path aliases when configuring a module.
+	 * @param array $aliases list of path aliases to be defined. The array keys are alias names
+	 * (must start with '@') and the array values are the corresponding paths or aliases.
+	 * For example,
+	 *
+	 * ~~~
+	 * array(
+	 *	'@models' => '@app/models', // an existing alias
+	 *	'@backend' => __DIR__ . '/../backend',  // a directory
+	 * )
+	 * ~~~
+	 */
+	public function setAliases($aliases)
+	{
+		foreach ($aliases as $name => $alias) {
+			Yii::setAlias($name, $alias);
+		}
+	}
+
+	/**
+	 * Checks whether the named module exists.
+	 * @param string $id module ID
+	 * @return boolean whether the named module exists. Both loaded and unloaded modules
+	 * are considered.
+	 */
+	public function hasModule($id)
+	{
+		return isset($this->_modules[$id]);
+	}
+
+	/**
+	 * Retrieves the named module.
+	 * @param string $id module ID (case-sensitive)
+	 * @param boolean $load whether to load the module if it is not yet loaded.
+	 * @return Module|null the module instance, null if the module
+	 * does not exist.
+	 * @see hasModule()
+	 */
+	public function getModule($id, $load = true)
+	{
+		if (isset($this->_modules[$id])) {
+			if ($this->_modules[$id] instanceof Module) {
+				return $this->_modules[$id];
+			} elseif ($load) {
+				Yii::trace("Loading module: $id", __METHOD__);
+				return $this->_modules[$id] = Yii::createObject($this->_modules[$id], $id, $this);
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Adds a sub-module to this module.
+	 * @param string $id module ID
+	 * @param Module|array|null $module the sub-module to be added to this module. This can
+	 * be one of the followings:
+	 *
+	 * - a [[Module]] object
+	 * - a configuration array: when [[getModule()]] is called initially, the array
+	 *   will be used to instantiate the sub-module
+	 * - null: the named sub-module will be removed from this module
+	 */
+	public function setModule($id, $module)
+	{
+		if ($module === null) {
+			unset($this->_modules[$id]);
+		} else {
+			$this->_modules[$id] = $module;
+		}
+	}
+
+	/**
+	 * Returns the sub-modules in this module.
+	 * @param boolean $loadedOnly whether to return the loaded sub-modules only. If this is set false,
+	 * then all sub-modules registered in this module will be returned, whether they are loaded or not.
+	 * Loaded modules will be returned as objects, while unloaded modules as configuration arrays.
+	 * @return array the modules (indexed by their IDs)
+	 */
+	public function getModules($loadedOnly = false)
+	{
+		if ($loadedOnly) {
+			$modules = array();
+			foreach ($this->_modules as $module) {
+				if ($module instanceof Module) {
+					$modules[] = $module;
+				}
+			}
+			return $modules;
+		} else {
+			return $this->_modules;
+		}
+	}
+
+	/**
+	 * Registers sub-modules in the current module.
+	 *
+	 * Each sub-module should be specified as a name-value pair, where
+	 * name refers to the ID of the module and value the module or a configuration
+	 * array that can be used to create the module. In the latter case, [[Yii::createObject()]]
+	 * will be used to create the module.
+	 *
+	 * If a new sub-module has the same ID as an existing one, the existing one will be overwritten silently.
+	 *
+	 * The following is an example for registering two sub-modules:
+	 *
+	 * ~~~
+	 * array(
+	 *     'comment' => array(
+	 *         'class' => 'app\modules\CommentModule',
+	 *         'db' => 'db',
+	 *     ),
+	 *     'booking' => array(
+	 *         'class' => 'app\modules\BookingModule',
+	 *     ),
+	 * )
+	 * ~~~
+	 *
+	 * @param array $modules modules (id => module configuration or instances)
+	 */
+	public function setModules($modules)
+	{
+		foreach ($modules as $id => $module) {
+			$this->_modules[$id] = $module;
+		}
+	}
+
+	/**
+	 * Checks whether the named component exists.
+	 * @param string $id component ID
+	 * @return boolean whether the named component exists. Both loaded and unloaded components
+	 * are considered.
+	 */
+	public function hasComponent($id)
+	{
+		return isset($this->_components[$id]);
+	}
+
+	/**
+	 * Retrieves the named component.
+	 * @param string $id component ID (case-sensitive)
+	 * @param boolean $load whether to load the component if it is not yet loaded.
+	 * @return Component|null the component instance, null if the component does not exist.
+	 * @see hasComponent()
+	 */
+	public function getComponent($id, $load = true)
+	{
+		if (isset($this->_components[$id])) {
+			if ($this->_components[$id] instanceof Component) {
+				return $this->_components[$id];
+			} elseif ($load) {
+				Yii::trace("Loading component: $id", __METHOD__);
+				return $this->_components[$id] = Yii::createObject($this->_components[$id]);
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Registers a component with this module.
+	 * @param string $id component ID
+	 * @param Component|array|null $component the component to be registered with the module. This can
+	 * be one of the followings:
+	 *
+	 * - a [[Component]] object
+	 * - a configuration array: when [[getComponent()]] is called initially for this component, the array
+	 *   will be used to instantiate the component via [[Yii::createObject()]].
+	 * - null: the named component will be removed from the module
+	 */
+	public function setComponent($id, $component)
+	{
+		if ($component === null) {
+			unset($this->_components[$id]);
+		} else {
+			$this->_components[$id] = $component;
+		}
+	}
+
+	/**
+	 * Returns the registered components.
+	 * @param boolean $loadedOnly whether to return the loaded components only. If this is set false,
+	 * then all components specified in the configuration will be returned, whether they are loaded or not.
+	 * Loaded components will be returned as objects, while unloaded components as configuration arrays.
+	 * @return array the components (indexed by their IDs)
+	 */
+	public function getComponents($loadedOnly = false)
+	{
+		if ($loadedOnly) {
+			$components = array();
+			foreach ($this->_components as $component) {
+				if ($component instanceof Component) {
+					$components[] = $component;
+				}
+			}
+			return $components;
+		} else {
+			return $this->_components;
+		}
+	}
+
+	/**
+	 * Registers a set of components in this module.
+	 *
+	 * Each component should be specified as a name-value pair, where
+	 * name refers to the ID of the component and value the component or a configuration
+	 * array that can be used to create the component. In the latter case, [[Yii::createObject()]]
+	 * will be used to create the component.
+	 *
+	 * If a new component has the same ID as an existing one, the existing one will be overwritten silently.
+	 *
+	 * The following is an example for setting two components:
+	 *
+	 * ~~~
+	 * array(
+	 *     'db' => array(
+	 *         'class' => 'yii\db\Connection',
+	 *         'dsn' => 'sqlite:path/to/file.db',
+	 *     ),
+	 *     'cache' => array(
+	 *         'class' => 'yii\caching\DbCache',
+	 *         'db' => 'db',
+	 *     ),
+	 * )
+	 * ~~~
+	 *
+	 * @param array $components components (id => component configuration or instance)
+	 */
+	public function setComponents($components)
+	{
+		foreach ($components as $id => $component) {
+			if (isset($this->_components[$id]['class']) && !isset($component['class'])) {
+				$component['class'] = $this->_components[$id]['class'];
+			}
+			$this->_components[$id] = $component;
+		}
+	}
+
+	/**
+	 * Loads components that are declared in [[preload]].
+	 */
+	public function preloadComponents()
+	{
+		foreach ($this->preload as $id) {
+			$this->getComponent($id);
+		}
+	}
+
+	/**
+	 * Runs a controller action specified by a route.
+	 * This method parses the specified route and creates the corresponding child module(s), controller and action
+	 * instances. It then calls [[Controller::runAction()]] to run the action with the given parameters.
+	 * If the route is empty, the method will use [[defaultRoute]].
+	 * @param string $route the route that specifies the action.
+	 * @param array $params the parameters to be passed to the action
+	 * @return integer the status code returned by the action execution. 0 means normal, and other values mean abnormal.
+	 * @throws InvalidRouteException if the requested route cannot be resolved into an action successfully
+	 */
+	public function runAction($route, $params = array())
+	{
+		$result = $this->createController($route);
+		if (is_array($result)) {
+			/** @var $controller Controller */
+			list($controller, $actionID) = $result;
+			$oldController = Yii::$app->controller;
+			Yii::$app->controller = $controller;
+			$status = $controller->runAction($actionID, $params);
+			Yii::$app->controller = $oldController;
+			return $status;
+		} else {
+			throw new InvalidRouteException('Unable to resolve the request "' . trim($this->getUniqueId() . '/' . $route, '/') . '".');
+		}
+	}
+
+	/**
+	 * Creates a controller instance based on the controller ID.
+	 *
+	 * The controller is created within this module. The method first attempts to
+	 * create the controller based on the [[controllerMap]] of the module. If not available,
+	 * it will look for the controller class under the [[controllerPath]] and create an
+	 * instance of it.
+	 *
+	 * @param string $route the route consisting of module, controller and action IDs.
+	 * @return array|boolean If the controller is created successfully, it will be returned together
+	 * with the requested action ID. Otherwise false will be returned.
+	 * @throws InvalidConfigException if the controller class and its file do not match.
+	 */
+	public function createController($route)
+	{
+		if ($route === '') {
+			$route = $this->defaultRoute;
+		}
+		if (($pos = strpos($route, '/')) !== false) {
+			$id = substr($route, 0, $pos);
+			$route = substr($route, $pos + 1);
+		} else {
+			$id = $route;
+			$route = '';
+		}
+
+		$module = $this->getModule($id);
+		if ($module !== null) {
+			return $module->createController($route);
+		}
+
+		if (isset($this->controllerMap[$id])) {
+			$controller = Yii::createObject($this->controllerMap[$id], $id, $this);
+		} elseif (preg_match('/^[a-z0-9\\-_]+$/', $id)) {
+			$className = StringHelper::id2camel($id) . 'Controller';
+			$classFile = $this->controllerPath . DIRECTORY_SEPARATOR . $className . '.php';
+			if (!is_file($classFile)) {
+				return false;
+			}
+			$className = ltrim($this->controllerNamespace . '\\' . $className, '\\');
+			Yii::$classMap[$className] = $classFile;
+			if (is_subclass_of($className, 'yii\base\Controller')) {
+				$controller = new $className($id, $this);
+			} elseif (YII_DEBUG) {
+				throw new InvalidConfigException("Controller class must extend from \\yii\\base\\Controller.");
+			}
+		}
+
+		return isset($controller) ? array($controller, $route) : false;
+	}
+
+	/**
+	 * This method is invoked right before an action is to be executed (after all possible filters.)
+	 * You may override this method to do last-minute preparation for the action.
+	 * @param Action $action the action to be executed.
+	 * @return boolean whether the action should continue to be executed.
+	 */
+	public function beforeAction($action)
+	{
+		$event = new ActionEvent($action);
+		$this->trigger(self::EVENT_BEFORE_ACTION, $event);
+		return $event->isValid;
+	}
+
+	/**
+	 * This method is invoked right after an action is executed.
+	 * You may override this method to do some postprocessing for the action.
+	 * @param Action $action the action just executed.
+	 */
+	public function afterAction($action)
+	{
+		$this->trigger(self::EVENT_AFTER_ACTION, new ActionEvent($action));
+	}
+}
diff --git a/yii/base/NotSupportedException.php b/yii/base/NotSupportedException.php
new file mode 100644
index 0000000..2f08891
--- /dev/null
+++ b/yii/base/NotSupportedException.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+/**
+ * NotSupportedException represents an exception caused by accessing features that are not supported.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class NotSupportedException extends Exception
+{
+	/**
+	 * @return string the user-friendly name of this exception
+	 */
+	public function getName()
+	{
+		return \Yii::t('yii|Not Supported');
+	}
+}
+
diff --git a/yii/base/Object.php b/yii/base/Object.php
new file mode 100644
index 0000000..a90a231
--- /dev/null
+++ b/yii/base/Object.php
@@ -0,0 +1,219 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+/**
+ * @include @yii/base/Object.md
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Object
+{
+	/**
+	 * @return string the fully qualified name of this class.
+	 */
+	public static function className()
+	{
+		return get_called_class();
+	}
+
+	/**
+	 * Constructor.
+	 * The default implementation does two things:
+	 *
+	 * - Initializes the object with the given configuration `$config`.
+	 * - Call [[init()]].
+	 *
+	 * If this method is overridden in a child class, it is recommended that
+	 *
+	 * - the last parameter of the constructor is a configuration array, like `$config` here.
+	 * - call the parent implementation at the end of the constructor.
+	 *
+	 * @param array $config name-value pairs that will be used to initialize the object properties
+	 */
+	public function __construct($config = array())
+	{
+		foreach ($config as $name => $value) {
+			$this->$name = $value;
+		}
+		$this->init();
+	}
+
+	/**
+	 * Initializes the object.
+	 * This method is invoked at the end of the constructor after the object is initialized with the
+	 * given configuration.
+	 */
+	public function init()
+	{
+	}
+
+	/**
+	 * Returns the value of an object property.
+	 *
+	 * Do not call this method directly as it is a PHP magic method that
+	 * will be implicitly called when executing `$value = $object->property;`.
+	 * @param string $name the property name
+	 * @return mixed the property value, event handlers attached to the event,
+	 * the named behavior, or the value of a behavior's property
+	 * @throws UnknownPropertyException if the property is not defined
+	 * @see __set
+	 */
+	public function __get($name)
+	{
+		$getter = 'get' . $name;
+		if (method_exists($this, $getter)) {
+			return $this->$getter();
+		} else {
+			throw new UnknownPropertyException('Getting unknown property: ' . get_class($this) . '::' . $name);
+		}
+	}
+
+	/**
+	 * Sets value of an object property.
+	 *
+	 * Do not call this method directly as it is a PHP magic method that
+	 * will be implicitly called when executing `$object->property = $value;`.
+	 * @param string $name the property name or the event name
+	 * @param mixed $value the property value
+	 * @throws UnknownPropertyException if the property is not defined
+	 * @throws InvalidCallException if the property is read-only.
+	 * @see __get
+	 */
+	public function __set($name, $value)
+	{
+		$setter = 'set' . $name;
+		if (method_exists($this, $setter)) {
+			$this->$setter($value);
+		} elseif (method_exists($this, 'get' . $name)) {
+			throw new InvalidCallException('Setting read-only property: ' . get_class($this) . '::' . $name);
+		} else {
+			throw new UnknownPropertyException('Setting unknown property: ' . get_class($this) . '::' . $name);
+		}
+	}
+
+	/**
+	 * Checks if the named property is set (not null).
+	 *
+	 * Do not call this method directly as it is a PHP magic method that
+	 * will be implicitly called when executing `isset($object->property)`.
+	 *
+	 * Note that if the property is not defined, false will be returned.
+	 * @param string $name the property name or the event name
+	 * @return boolean whether the named property is set (not null).
+	 */
+	public function __isset($name)
+	{
+		$getter = 'get' . $name;
+		if (method_exists($this, $getter)) {
+			return $this->$getter() !== null;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Sets an object property to null.
+	 *
+	 * Do not call this method directly as it is a PHP magic method that
+	 * will be implicitly called when executing `unset($object->property)`.
+	 *
+	 * Note that if the property is not defined, this method will do nothing.
+	 * If the property is read-only, it will throw an exception.
+	 * @param string $name the property name
+	 * @throws InvalidCallException if the property is read only.
+	 */
+	public function __unset($name)
+	{
+		$setter = 'set' . $name;
+		if (method_exists($this, $setter)) {
+			$this->$setter(null);
+		} elseif (method_exists($this, 'get' . $name)) {
+			throw new InvalidCallException('Unsetting read-only property: ' . get_class($this) . '::' . $name);
+		}
+	}
+
+	/**
+	 * Calls the named method which is not a class method.
+	 * If the name refers to a component property whose value is
+	 * an anonymous function, the method will execute the function.
+	 *
+	 * Do not call this method directly as it is a PHP magic method that
+	 * will be implicitly called when an unknown method is being invoked.
+	 * @param string $name the method name
+	 * @param array $params method parameters
+	 * @throws UnknownMethodException when calling unknown method
+	 * @return mixed the method return value
+	 */
+	public function __call($name, $params)
+	{
+		$getter = 'get' . $name;
+		if (method_exists($this, $getter)) {
+			$func = $this->$getter();
+			if ($func instanceof \Closure) {
+				return call_user_func_array($func, $params);
+			}
+		}
+		throw new UnknownMethodException('Unknown method: ' . get_class($this) . "::$name()");
+	}
+
+	/**
+	 * Returns a value indicating whether a property is defined.
+	 * A property is defined if:
+	 *
+	 * - the class has a getter or setter method associated with the specified name
+	 *   (in this case, property name is case-insensitive);
+	 * - the class has a member variable with the specified name (when `$checkVar` is true);
+	 *
+	 * @param string $name the property name
+	 * @param boolean $checkVar whether to treat member variables as properties
+	 * @return boolean whether the property is defined
+	 * @see canGetProperty
+	 * @see canSetProperty
+	 */
+	public function hasProperty($name, $checkVar = true)
+	{
+		return $this->canGetProperty($name, $checkVar) || $this->canSetProperty($name, false);
+	}
+
+	/**
+	 * Returns a value indicating whether a property can be read.
+	 * A property is readable if:
+	 *
+	 * - the class has a getter method associated with the specified name
+	 *   (in this case, property name is case-insensitive);
+	 * - the class has a member variable with the specified name (when `$checkVar` is true);
+	 *
+	 * @param string $name the property name
+	 * @param boolean $checkVar whether to treat member variables as properties
+	 * @return boolean whether the property can be read
+	 * @see canSetProperty
+	 */
+	public function canGetProperty($name, $checkVar = true)
+	{
+		return method_exists($this, 'get' . $name) || $checkVar && property_exists($this, $name);
+	}
+
+	/**
+	 * Returns a value indicating whether a property can be set.
+	 * A property is writable if:
+	 *
+	 * - the class has a setter method associated with the specified name
+	 *   (in this case, property name is case-insensitive);
+	 * - the class has a member variable with the specified name (when `$checkVar` is true);
+	 *
+	 * @param string $name the property name
+	 * @param boolean $checkVar whether to treat member variables as properties
+	 * @return boolean whether the property can be written
+	 * @see canGetProperty
+	 */
+	public function canSetProperty($name, $checkVar = true)
+	{
+		return method_exists($this, 'set' . $name) || $checkVar && property_exists($this, $name);
+	}
+}
diff --git a/yii/base/Request.php b/yii/base/Request.php
new file mode 100644
index 0000000..45556ab
--- /dev/null
+++ b/yii/base/Request.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+abstract class Request extends Component
+{
+	private $_scriptFile;
+	private $_isConsoleRequest;
+
+	/**
+	 * Resolves the current request into a route and the associated parameters.
+	 * @return array the first element is the route, and the second is the associated parameters.
+	 */
+	abstract public function resolve();
+
+	/**
+	 * Returns a value indicating whether the current request is made via command line
+	 * @return boolean the value indicating whether the current request is made via console
+	 */
+	public function getIsConsoleRequest()
+	{
+		return $this->_isConsoleRequest !== null ? $this->_isConsoleRequest : PHP_SAPI === 'cli';
+	}
+
+	/**
+	 * Sets the value indicating whether the current request is made via command line
+	 * @param boolean $value the value indicating whether the current request is made via command line
+	 */
+	public function setIsConsoleRequest($value)
+	{
+		$this->_isConsoleRequest = $value;
+	}
+
+	/**
+	 * Returns entry script file path.
+	 * @return string entry script file path (processed w/ realpath())
+	 * @throws InvalidConfigException if the entry script file path cannot be determined automatically.
+	 */
+	public function getScriptFile()
+	{
+		if ($this->_scriptFile === null) {
+			if (isset($_SERVER['SCRIPT_FILENAME'])) {
+				$this->setScriptFile($_SERVER['SCRIPT_FILENAME']);
+			} else {
+				throw new InvalidConfigException('Unable to determine the entry script file path.');
+			}
+		}
+		return $this->_scriptFile;
+	}
+
+	/**
+	 * Sets the entry script file path.
+	 * The entry script file path can normally be determined based on the `SCRIPT_FILENAME` SERVER variable.
+	 * However, for some server configurations, this may not be correct or feasible.
+	 * This setter is provided so that the entry script file path can be manually specified.
+	 * @param string $value the entry script file path. This can be either a file path or a path alias.
+	 * @throws InvalidConfigException if the provided entry script file path is invalid.
+	 */
+	public function setScriptFile($value)
+	{
+		$scriptFile = realpath(\Yii::getAlias($value));
+		if ($scriptFile !== false && is_file($scriptFile)) {
+			$this->_scriptFile = $scriptFile;
+		} else {
+			throw new InvalidConfigException('Unable to determine the entry script file path.');
+		}
+	}
+}
diff --git a/yii/base/Response.php b/yii/base/Response.php
new file mode 100644
index 0000000..396b073
--- /dev/null
+++ b/yii/base/Response.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Response extends Component
+{
+	/**
+	 * Starts output buffering
+	 */
+	public function beginOutput()
+	{
+		ob_start();
+		ob_implicit_flush(false);
+	}
+
+	/**
+	 * Returns contents of the output buffer and discards it
+	 * @return string output buffer contents
+	 */
+	public function endOutput()
+	{
+		return ob_get_clean();
+	}
+
+	/**
+	 * Returns contents of the output buffer
+	 * @return string output buffer contents
+	 */
+	public function getOutput()
+	{
+		return ob_get_contents();
+	}
+
+	/**
+	 * Discards the output buffer
+	 * @param boolean $all if true recursively discards all output buffers used
+	 */
+	public function cleanOutput($all = true)
+	{
+		if ($all) {
+			for ($level = ob_get_level(); $level > 0; --$level) {
+				if (!@ob_end_clean()) {
+					ob_clean();
+				}
+			}
+		} else {
+			ob_end_clean();
+		}
+	}
+}
diff --git a/yii/base/Theme.php b/yii/base/Theme.php
new file mode 100644
index 0000000..a60d56e
--- /dev/null
+++ b/yii/base/Theme.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+use Yii;
+use yii\base\InvalidConfigException;
+use yii\helpers\FileHelper;
+
+/**
+ * Theme represents an application theme.
+ *
+ * A theme is directory consisting of view and layout files which are meant to replace their
+ * non-themed counterparts.
+ *
+ * Theme uses [[pathMap]] to achieve the file replacement. A view or layout file will be replaced
+ * with its themed version if part of its path matches one of the keys in [[pathMap]].
+ * Then the matched part will be replaced with the corresponding array value.
+ *
+ * For example, if [[pathMap]] is `array('/www/views' => '/www/themes/basic')`,
+ * then the themed version for a view file `/www/views/site/index.php` will be
+ * `/www/themes/basic/site/index.php`.
+ *
+ * @property string $baseUrl the base URL for this theme. This is mainly used by [[getUrl()]].
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Theme extends Component
+{
+	/**
+	 * @var string the root path or path alias of this theme. All resources of this theme are located
+	 * under this directory. This property must be set if [[pathMap]] is not set.
+	 * @see pathMap
+	 */
+	public $basePath;
+	/**
+	 * @var string the base URL (or path alias) for this theme. All resources of this theme are considered
+	 * to be under this base URL. This property must be set. It is mainly used by [[getUrl()]].
+	 */
+	public $baseUrl;
+	/**
+	 * @var array the mapping between view directories and their corresponding themed versions.
+	 * If not set, it will be initialized as a mapping from [[Application::basePath]] to [[basePath]].
+	 * This property is used by [[applyTo()]] when a view is trying to apply the theme.
+	 * Path aliases can be used when specifying directories.
+	 */
+	public $pathMap;
+
+
+	/**
+	 * Initializes the theme.
+	 * @throws InvalidConfigException if [[basePath]] is not set.
+	 */
+	public function init()
+	{
+	 	parent::init();
+		if (empty($this->pathMap)) {
+			if ($this->basePath !== null) {
+				$this->basePath = Yii::getAlias($this->basePath);
+				$this->pathMap = array(Yii::$app->getBasePath() => $this->basePath);
+			} else {
+				throw new InvalidConfigException('The "basePath" property must be set.');
+			}
+		}
+		$paths = array();
+		foreach ($this->pathMap as $from => $to) {
+			$from = FileHelper::normalizePath(Yii::getAlias($from));
+			$to = FileHelper::normalizePath(Yii::getAlias($to));
+			$paths[$from . DIRECTORY_SEPARATOR] = $to . DIRECTORY_SEPARATOR;
+		}
+		$this->pathMap = $paths;
+		if ($this->baseUrl === null) {
+			throw new InvalidConfigException('The "baseUrl" property must be set.');
+		} else {
+			$this->baseUrl = rtrim(Yii::getAlias($this->baseUrl), '/');
+		}
+	}
+
+	/**
+	 * Converts a file to a themed file if possible.
+	 * If there is no corresponding themed file, the original file will be returned.
+	 * @param string $path the file to be themed
+	 * @return string the themed file, or the original file if the themed version is not available.
+	 */
+	public function applyTo($path)
+	{
+		$path = FileHelper::normalizePath($path);
+		foreach ($this->pathMap as $from => $to) {
+			if (strpos($path, $from) === 0) {
+				$n = strlen($from);
+				$file = $to . substr($path, $n);
+				if (is_file($file)) {
+					return $file;
+				}
+			}
+		}
+		return $path;
+	}
+
+	/**
+	 * Converts a relative URL into an absolute URL using [[baseUrl]].
+	 * @param string $url the relative URL to be converted.
+	 * @return string the absolute URL
+	 */
+	public function getUrl($url)
+	{
+		return $this->baseUrl . '/' . ltrim($url, '/');
+	}
+}
diff --git a/yii/base/UnknownClassException.php b/yii/base/UnknownClassException.php
new file mode 100644
index 0000000..ac44746
--- /dev/null
+++ b/yii/base/UnknownClassException.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+/**
+ * UnknownClassException represents an exception caused by accessing an unknown class.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class UnknownClassException extends Exception
+{
+	/**
+	 * @return string the user-friendly name of this exception
+	 */
+	public function getName()
+	{
+		return \Yii::t('yii|Unknown Class');
+	}
+}
+
diff --git a/yii/base/UnknownMethodException.php b/yii/base/UnknownMethodException.php
new file mode 100644
index 0000000..440e76e
--- /dev/null
+++ b/yii/base/UnknownMethodException.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+/**
+ * UnknownMethodException represents an exception caused by accessing an unknown object method.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class UnknownMethodException extends Exception
+{
+	/**
+	 * @return string the user-friendly name of this exception
+	 */
+	public function getName()
+	{
+		return \Yii::t('yii|Unknown Method');
+	}
+}
+
diff --git a/yii/base/UnknownPropertyException.php b/yii/base/UnknownPropertyException.php
new file mode 100644
index 0000000..5ec3814
--- /dev/null
+++ b/yii/base/UnknownPropertyException.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+/**
+ * UnknownPropertyException represents an exception caused by accessing unknown object properties.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class UnknownPropertyException extends Exception
+{
+	/**
+	 * @return string the user-friendly name of this exception
+	 */
+	public function getName()
+	{
+		return \Yii::t('yii|Unknown Property');
+	}
+}
+
diff --git a/yii/base/UserException.php b/yii/base/UserException.php
new file mode 100644
index 0000000..01ca602
--- /dev/null
+++ b/yii/base/UserException.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+/**
+ * UserException is the base class for exceptions that are meant to be shown to end users.
+ * Such exceptions are often caused by mistakes of end users.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class UserException extends Exception
+{
+}
diff --git a/yii/base/Vector.php b/yii/base/Vector.php
new file mode 100644
index 0000000..6418077
--- /dev/null
+++ b/yii/base/Vector.php
@@ -0,0 +1,341 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+/**
+ * Vector implements an integer-indexed collection class.
+ *
+ * You can access, append, insert, remove an item from the vector
+ * by calling methods such as [[itemAt()]], [[add()]], [[insertAt()]],
+ * [[remove()]] and [[removeAt()]].
+ *
+ * To get the number of the items in the vector, use [[getCount()]].
+ *
+ * Because Vector implements a set of SPL interfaces, it can be used
+ * like a regular PHP array as follows,
+ *
+ * ~~~
+ * $vector[] = $item;				// append new item at the end
+ * $vector[$index] = $item;			// set new item at $index
+ * unset($vector[$index]);			// remove the item at $index
+ * if (isset($vector[$index]))		// if the vector has an item at $index
+ * foreach ($vector as $index=>$item) // traverse each item in the vector
+ * $n = count($vector);				// count the number of items
+ * ~~~
+ *
+ * Note that if you plan to extend Vector by performing additional operations
+ * with each addition or removal of an item (e.g. performing type check),
+ * please make sure you override [[insertAt()]] and [[removeAt()]].
+ *
+ * @property integer $count the number of items in the vector
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Vector extends Object implements \IteratorAggregate, \ArrayAccess, \Countable
+{
+	/**
+	 * @var array internal data storage
+	 */
+	private $_d = array();
+	/**
+	 * @var integer number of items
+	 */
+	private $_c = 0;
+
+	/**
+	 * Constructor.
+	 * Initializes the vector with an array or an iterable object.
+	 * @param mixed $data the initial data to be populated into the vector.
+	 * This can be an array or an iterable object.
+	 * @param array $config name-value pairs that will be used to initialize the object properties
+	 * @throws Exception if data is not well formed (neither an array nor an iterable object)
+	 */
+	public function __construct($data = array(), $config = array())
+	{
+		if (!empty($data)) {
+			$this->copyFrom($data);
+		}
+		parent::__construct($config);
+	}
+
+	/**
+	 * Returns an iterator for traversing the items in the vector.
+	 * This method is required by the SPL interface `IteratorAggregate`.
+	 * It will be implicitly called when you use `foreach` to traverse the vector.
+	 * @return VectorIterator an iterator for traversing the items in the vector.
+	 */
+	public function getIterator()
+	{
+		return new VectorIterator($this->_d);
+	}
+
+	/**
+	 * Returns the number of items in the vector.
+	 * This method is required by the SPL `Countable` interface.
+	 * It will be implicitly called when you use `count($vector)`.
+	 * @return integer number of items in the vector.
+	 */
+	public function count()
+	{
+		return $this->getCount();
+	}
+
+	/**
+	 * Returns the number of items in the vector.
+	 * @return integer the number of items in the vector
+	 */
+	public function getCount()
+	{
+		return $this->_c;
+	}
+
+	/**
+	 * Returns the item at the specified index.
+	 * @param integer $index the index of the item
+	 * @return mixed the item at the index
+	 * @throws InvalidParamException if the index is out of range
+	 */
+	public function itemAt($index)
+	{
+		if (isset($this->_d[$index])) {
+			return $this->_d[$index];
+		} elseif ($index >= 0 && $index < $this->_c) { // in case the value is null
+			return $this->_d[$index];
+		} else {
+			throw new InvalidParamException('Index out of range: ' . $index);
+		}
+	}
+
+	/**
+	 * Appends an item at the end of the vector.
+	 * @param mixed $item new item
+	 * @return integer the zero-based index at which the item is added
+	 * @throws Exception if the vector is read-only.
+	 */
+	public function add($item)
+	{
+		$this->insertAt($this->_c, $item);
+		return $this->_c - 1;
+	}
+
+	/**
+	 * Inserts an item at the specified position.
+	 * Original item at the position and the following items will be moved
+	 * one step towards the end.
+	 * @param integer $index the specified position.
+	 * @param mixed $item new item to be inserted into the vector
+	 * @throws InvalidParamException if the index specified is out of range, or the vector is read-only.
+	 */
+	public function insertAt($index, $item)
+	{
+		if ($index === $this->_c) {
+			$this->_d[$this->_c++] = $item;
+		} elseif ($index >= 0 && $index < $this->_c) {
+			array_splice($this->_d, $index, 0, array($item));
+			$this->_c++;
+		} else {
+			throw new InvalidParamException('Index out of range: ' . $index);
+		}
+	}
+
+	/**
+	 * Removes an item from the vector.
+	 * The vector will search for the item, and the first item found
+	 * will be removed from the vector.
+	 * @param mixed $item the item to be removed.
+	 * @return mixed the index at which the item is being removed, or false
+	 * if the item cannot be found in the vector.
+	 * @throws Exception if the vector is read only.
+	 */
+	public function remove($item)
+	{
+		if (($index = $this->indexOf($item)) >= 0) {
+			$this->removeAt($index);
+			return $index;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Removes an item at the specified position.
+	 * @param integer $index the index of the item to be removed.
+	 * @return mixed the removed item.
+	 * @throws InvalidParamException if the index is out of range, or the vector is read only.
+	 */
+	public function removeAt($index)
+	{
+		if ($index >= 0 && $index < $this->_c) {
+			$this->_c--;
+			if ($index === $this->_c) {
+				return array_pop($this->_d);
+			} else {
+				$item = $this->_d[$index];
+				array_splice($this->_d, $index, 1);
+				return $item;
+			}
+		} else {
+			throw new InvalidParamException('Index out of range: ' . $index);
+		}
+	}
+
+	/**
+	 * Removes all items from the vector.
+	 * @param boolean $safeClear whether to clear every item by calling [[removeAt]].
+	 * Defaults to false, meaning all items in the vector will be cleared directly
+	 * without calling [[removeAt]].
+	 */
+	public function removeAll($safeClear = false)
+	{
+		if ($safeClear) {
+			for ($i = $this->_c - 1; $i >= 0; --$i) {
+				$this->removeAt($i);
+			}
+		} else {
+			$this->_d = array();
+			$this->_c = 0;
+		}
+	}
+
+	/**
+	 * Returns a value indicating whether the vector contains the specified item.
+	 * Note that the search is based on strict PHP comparison.
+	 * @param mixed $item the item
+	 * @return boolean whether the vector contains the item
+	 */
+	public function has($item)
+	{
+		return $this->indexOf($item) >= 0;
+	}
+
+	/**
+	 * Returns the index of the specified item in the vector.
+	 * The index is zero-based. If the item is not found in the vector, -1 will be returned.
+	 * Note that the search is based on strict PHP comparison.
+	 * @param mixed $item the item
+	 * @return integer the index of the item in the vector (0 based), -1 if not found.
+	 */
+	public function indexOf($item)
+	{
+		$index = array_search($item, $this->_d, true);
+		return $index === false ? -1 : $index;
+	}
+
+	/**
+	 * Returns the vector as a PHP array.
+	 * @return array the items in the vector.
+	 */
+	public function toArray()
+	{
+		return $this->_d;
+	}
+
+	/**
+	 * Copies iterable data into the vector.
+	 * Note, existing data in the vector will be cleared first.
+	 * @param mixed $data the data to be copied from, must be an array or an object implementing `Traversable`
+	 * @throws InvalidParamException if data is neither an array nor an object implementing `Traversable`.
+	 */
+	public function copyFrom($data)
+	{
+		if (is_array($data) || $data instanceof \Traversable) {
+			if ($this->_c > 0) {
+				$this->removeAll();
+			}
+			if ($data instanceof self) {
+				$data = $data->_d;
+			}
+			foreach ($data as $item) {
+				$this->add($item);
+			}
+		} else {
+			throw new InvalidParamException('Data must be either an array or an object implementing Traversable.');
+		}
+	}
+
+	/**
+	 * Merges iterable data into the vector.
+	 * New items will be appended to the end of the existing items.
+	 * @param array|\Traversable $data the data to be merged with. It must be an array or object implementing Traversable
+	 * @throws InvalidParamException if data is neither an array nor an object implementing `Traversable`.
+	 */
+	public function mergeWith($data)
+	{
+		if (is_array($data) || ($data instanceof \Traversable)) {
+			if ($data instanceof Vector) {
+				$data = $data->_d;
+			}
+			foreach ($data as $item) {
+				$this->add($item);
+			}
+		} else {
+			throw new InvalidParamException('The data to be merged with must be an array or an object implementing Traversable.');
+		}
+	}
+
+	/**
+	 * Returns a value indicating whether there is an item at the specified offset.
+	 * This method is required by the SPL interface `ArrayAccess`.
+	 * It is implicitly called when you use something like `isset($vector[$offset])`.
+	 * @param integer $offset the offset to be checked
+	 * @return boolean whether there is an item at the specified offset.
+	 */
+	public function offsetExists($offset)
+	{
+		return $offset >= 0 && $offset < $this->_c;
+	}
+
+	/**
+	 * Returns the item at the specified offset.
+	 * This method is required by the SPL interface `ArrayAccess`.
+	 * It is implicitly called when you use something like `$value = $vector[$offset];`.
+	 * This is equivalent to [[itemAt]].
+	 * @param integer $offset the offset to retrieve item.
+	 * @return mixed the item at the offset
+	 * @throws Exception if the offset is out of range
+	 */
+	public function offsetGet($offset)
+	{
+		return $this->itemAt($offset);
+	}
+
+	/**
+	 * Sets the item at the specified offset.
+	 * This method is required by the SPL interface `ArrayAccess`.
+	 * It is implicitly called when you use something like `$vector[$offset] = $item;`.
+	 * If the offset is null or equal to the number of the existing items,
+	 * the new item will be appended to the vector.
+	 * Otherwise, the existing item at the offset will be replaced with the new item.
+	 * @param integer $offset the offset to set item
+	 * @param mixed $item the item value
+	 * @throws Exception if the offset is out of range, or the vector is read only.
+	 */
+	public function offsetSet($offset, $item)
+	{
+		if ($offset === null || $offset === $this->_c) {
+			$this->insertAt($this->_c, $item);
+		} else {
+			$this->removeAt($offset);
+			$this->insertAt($offset, $item);
+		}
+	}
+
+	/**
+	 * Unsets the item at the specified offset.
+	 * This method is required by the SPL interface `ArrayAccess`.
+	 * It is implicitly called when you use something like `unset($vector[$offset])`.
+	 * This is equivalent to [[removeAt]].
+	 * @param integer $offset the offset to unset item
+	 * @throws Exception if the offset is out of range, or the vector is read only.
+	 */
+	public function offsetUnset($offset)
+	{
+		$this->removeAt($offset);
+	}
+}
diff --git a/yii/base/VectorIterator.php b/yii/base/VectorIterator.php
new file mode 100644
index 0000000..f83d42d
--- /dev/null
+++ b/yii/base/VectorIterator.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+/**
+ * VectorIterator implements the SPL `Iterator` interface for [[Vector]].
+ *
+ * It allows [[Vector]] to return a new iterator for data traversing purpose.
+ * You normally do not use this class directly.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class VectorIterator implements \Iterator
+{
+	/**
+	 * @var array the data to be iterated through
+	 */
+	private $_d;
+	/**
+	 * @var integer index of the current item
+	 */
+	private $_i;
+	/**
+	 * @var integer count of the data items
+	 */
+	private $_c;
+
+	/**
+	 * Constructor.
+	 * @param array $data the data to be iterated through
+	 */
+	public function __construct(&$data)
+	{
+		$this->_d = &$data;
+		$this->_i = 0;
+		$this->_c = count($this->_d);
+	}
+
+	/**
+	 * Rewinds the index of the current item.
+	 * This method is required by the SPL interface `Iterator`.
+	 */
+	public function rewind()
+	{
+		$this->_i = 0;
+	}
+
+	/**
+	 * Returns the key of the current item.
+	 * This method is required by the SPL interface `Iterator`.
+	 * @return integer the key of the current item
+	 */
+	public function key()
+	{
+		return $this->_i;
+	}
+
+	/**
+	 * Returns the current item.
+	 * This method is required by the SPL interface `Iterator`.
+	 * @return mixed the current item
+	 */
+	public function current()
+	{
+		return $this->_d[$this->_i];
+	}
+
+	/**
+	 * Moves the internal pointer to the next item.
+	 * This method is required by the SPL interface `Iterator`.
+	 */
+	public function next()
+	{
+		$this->_i++;
+	}
+
+	/**
+	 * Returns a value indicating whether there is an item at current position.
+	 * This method is required by the SPL interface `Iterator`.
+	 * @return boolean whether there is an item at current position.
+	 */
+	public function valid()
+	{
+		return $this->_i < $this->_c;
+	}
+}
diff --git a/yii/base/View.php b/yii/base/View.php
new file mode 100644
index 0000000..af65c49
--- /dev/null
+++ b/yii/base/View.php
@@ -0,0 +1,810 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+use Yii;
+use yii\base\Application;
+use yii\helpers\FileHelper;
+use yii\helpers\Html;
+
+/**
+ * View represents a view object in the MVC pattern.
+ *
+ * View provides a set of methods (e.g. [[render()]]) for rendering purpose.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class View extends Component
+{
+	/**
+	 * @event ViewEvent an event that is triggered by [[beginPage()]].
+	 */
+	const EVENT_BEGIN_PAGE = 'beginPage';
+	/**
+	 * @event ViewEvent an event that is triggered by [[endPage()]].
+	 */
+	const EVENT_END_PAGE = 'endPage';
+	/**
+	 * @event ViewEvent an event that is triggered by [[renderFile()]] right before it renders a view file.
+	 */
+	const EVENT_BEFORE_RENDER = 'beforeRender';
+	/**
+	 * @event ViewEvent an event that is triggered by [[renderFile()]] right after it renders a view file.
+	 */
+	const EVENT_AFTER_RENDER = 'afterRender';
+
+	/**
+	 * The location of registered JavaScript code block or files.
+	 * This means the location is in the head section.
+	 */
+	const POS_HEAD = 1;
+	/**
+	 * The location of registered JavaScript code block or files.
+	 * This means the location is at the beginning of the body section.
+	 */
+	const POS_BEGIN = 2;
+	/**
+	 * The location of registered JavaScript code block or files.
+	 * This means the location is at the end of the body section.
+	 */
+	const POS_END = 3;
+	/**
+	 * This is internally used as the placeholder for receiving the content registered for the head section.
+	 */
+	const PL_HEAD = '<![CDATA[YII-BLOCK-HEAD]]>';
+	/**
+	 * This is internally used as the placeholder for receiving the content registered for the beginning of the body section.
+	 */
+	const PL_BODY_BEGIN = '<![CDATA[YII-BLOCK-BODY-BEGIN]]>';
+	/**
+	 * This is internally used as the placeholder for receiving the content registered for the end of the body section.
+	 */
+	const PL_BODY_END = '<![CDATA[YII-BLOCK-BODY-END]]>';
+
+
+	/**
+	 * @var object the context under which the [[renderFile()]] method is being invoked.
+	 * This can be a controller, a widget, or any other object.
+	 */
+	public $context;
+	/**
+	 * @var mixed custom parameters that are shared among view templates.
+	 */
+	public $params;
+	/**
+	 * @var array a list of available renderers indexed by their corresponding supported file extensions.
+	 * Each renderer may be a view renderer object or the configuration for creating the renderer object.
+	 * The default setting supports both Smarty and Twig (their corresponding file extension is "tpl"
+	 * and "twig" respectively. Please refer to [[SmartyRenderer]] and [[TwigRenderer]] on how to install
+	 * the needed libraries for these template engines.
+	 *
+	 * If no renderer is available for the given view file, the view file will be treated as a normal PHP
+	 * and rendered via [[renderPhpFile()]].
+	 */
+	public $renderers = array(
+		'tpl' => array(
+			'class' => 'yii\renderers\SmartyRenderer',
+		),
+		'twig' => array(
+			'class' => 'yii\renderers\TwigRenderer',
+		),
+	);
+	/**
+	 * @var Theme|array the theme object or the configuration array for creating the theme object.
+	 * If not set, it means theming is not enabled.
+	 */
+	public $theme;
+	/**
+	 * @var array a list of named output blocks. The keys are the block names and the values
+	 * are the corresponding block content. You can call [[beginBlock()]] and [[endBlock()]]
+	 * to capture small fragments of a view. They can be later accessed somewhere else
+	 * through this property.
+	 */
+	public $blocks;
+	/**
+	 * @var Widget[] the widgets that are currently being rendered (not ended). This property
+	 * is maintained by [[beginWidget()]] and [[endWidget()]] methods. Do not modify it directly.
+	 * @internal
+	 */
+	public $widgetStack = array();
+	/**
+	 * @var array a list of currently active fragment cache widgets. This property
+	 * is used internally to implement the content caching feature. Do not modify it directly.
+	 * @internal
+	 */
+	public $cacheStack = array();
+	/**
+	 * @var array a list of placeholders for embedding dynamic contents. This property
+	 * is used internally to implement the content caching feature. Do not modify it directly.
+	 * @internal
+	 */
+	public $dynamicPlaceholders = array();
+	/**
+	 * @var array the registered asset bundles. The keys are the bundle names, and the values
+	 * are the corresponding [[AssetBundle]] objects.
+	 * @see registerAssetBundle
+	 */
+	public $assetBundles;
+	/**
+	 * @var string the page title
+	 */
+	public $title;
+	/**
+	 * @var array the registered meta tags.
+	 * @see registerMetaTag
+	 */
+	public $metaTags;
+	/**
+	 * @var array the registered link tags.
+	 * @see registerLinkTag
+	 */
+	public $linkTags;
+	/**
+	 * @var array the registered CSS code blocks.
+	 * @see registerCss
+	 */
+	public $css;
+	/**
+	 * @var array the registered CSS files.
+	 * @see registerCssFile
+	 */
+	public $cssFiles;
+	/**
+	 * @var array the registered JS code blocks
+	 * @see registerJs
+	 */
+	public $js;
+	/**
+	 * @var array the registered JS files.
+	 * @see registerJsFile
+	 */
+	public $jsFiles;
+
+
+	/**
+	 * Initializes the view component.
+	 */
+	public function init()
+	{
+		parent::init();
+		if (is_array($this->theme)) {
+			$this->theme = Yii::createObject($this->theme);
+		}
+	}
+
+	/**
+	 * Renders a view.
+	 *
+	 * This method delegates the call to the [[context]] object:
+	 *
+	 * - If [[context]] is a controller, the [[Controller::renderPartial()]] method will be called;
+	 * - If [[context]] is a widget, the [[Widget::render()]] method will be called;
+	 * - Otherwise, an InvalidCallException exception will be thrown.
+	 *
+	 * @param string $view the view name. Please refer to [[Controller::findViewFile()]]
+	 * and [[Widget::findViewFile()]] on how to specify this parameter.
+	 * @param array $params the parameters (name-value pairs) that will be extracted and made available in the view file.
+	 * @return string the rendering result
+	 * @throws InvalidCallException if [[context]] is neither a controller nor a widget.
+	 * @throws InvalidParamException if the view cannot be resolved or the view file does not exist.
+	 * @see renderFile
+	 */
+	public function render($view, $params = array())
+	{
+		if ($this->context instanceof Controller) {
+			return $this->context->renderPartial($view, $params);
+		} elseif ($this->context instanceof Widget) {
+			return $this->context->render($view, $params);
+		} else {
+			throw new InvalidCallException('View::render() is not supported for the current context.');
+		}
+	}
+
+	/**
+	 * Renders a view file.
+	 *
+	 * If [[theme]] is enabled (not null), it will try to render the themed version of the view file as long
+	 * as it is available.
+	 *
+	 * The method will call [[FileHelper::localize()]] to localize the view file.
+	 *
+	 * If [[renderer]] is enabled (not null), the method will use it to render the view file.
+	 * Otherwise, it will simply include the view file as a normal PHP file, capture its output and
+	 * return it as a string.
+	 *
+	 * @param string $viewFile the view file. This can be either a file path or a path alias.
+	 * @param array $params the parameters (name-value pairs) that will be extracted and made available in the view file.
+	 * @param object $context the context that the view should use for rendering the view. If null,
+	 * existing [[context]] will be used.
+	 * @return string the rendering result
+	 * @throws InvalidParamException if the view file does not exist
+	 */
+	public function renderFile($viewFile, $params = array(), $context = null)
+	{
+		$viewFile = Yii::getAlias($viewFile);
+		if (is_file($viewFile)) {
+			if ($this->theme !== null) {
+				$viewFile = $this->theme->applyTo($viewFile);
+			}
+			$viewFile = FileHelper::localize($viewFile);
+		} else {
+			throw new InvalidParamException("The view file does not exist: $viewFile");
+		}
+
+		$oldContext = $this->context;
+		if ($context !== null) {
+			$this->context = $context;
+		}
+
+		$output = '';
+		if ($this->beforeRender($viewFile)) {
+			$ext = pathinfo($viewFile, PATHINFO_EXTENSION);
+			if (isset($this->renderers[$ext])) {
+				if (is_array($this->renderers[$ext])) {
+					$this->renderers[$ext] = Yii::createObject($this->renderers[$ext]);
+				}
+				/** @var ViewRenderer $renderer */
+				$renderer = $this->renderers[$ext];
+				$output = $renderer->render($this, $viewFile, $params);
+			} else {
+				$output = $this->renderPhpFile($viewFile, $params);
+			}
+			$this->afterRender($viewFile, $output);
+		}
+
+		$this->context = $oldContext;
+
+		return $output;
+	}
+
+	/**
+	 * This method is invoked right before [[renderFile()]] renders a view file.
+	 * The default implementation will trigger the [[EVENT_BEFORE_RENDER]] event.
+	 * If you override this method, make sure you call the parent implementation first.
+	 * @param string $viewFile the view file to be rendered
+	 * @return boolean whether to continue rendering the view file.
+	 */
+	public function beforeRender($viewFile)
+	{
+		$event = new ViewEvent($viewFile);
+		$this->trigger(self::EVENT_BEFORE_RENDER, $event);
+		return $event->isValid;
+	}
+
+	/**
+	 * This method is invoked right after [[renderFile()]] renders a view file.
+	 * The default implementation will trigger the [[EVENT_AFTER_RENDER]] event.
+	 * If you override this method, make sure you call the parent implementation first.
+	 * @param string $viewFile the view file to be rendered
+	 * @param string $output the rendering result of the view file. Updates to this parameter
+	 * will be passed back and returned by [[renderFile()]].
+	 */
+	public function afterRender($viewFile, &$output)
+	{
+		if ($this->hasEventHandlers(self::EVENT_AFTER_RENDER)) {
+			$event = new ViewEvent($viewFile);
+			$event->output = $output;
+			$this->trigger(self::EVENT_AFTER_RENDER, $event);
+			$output = $event->output;
+		}
+	}
+
+	/**
+	 * Renders a view file as a PHP script.
+	 *
+	 * This method treats the view file as a PHP script and includes the file.
+	 * It extracts the given parameters and makes them available in the view file.
+	 * The method captures the output of the included view file and returns it as a string.
+	 *
+	 * This method should mainly be called by view renderer or [[renderFile()]].
+	 *
+	 * @param string $_file_ the view file.
+	 * @param array $_params_ the parameters (name-value pairs) that will be extracted and made available in the view file.
+	 * @return string the rendering result
+	 */
+	public function renderPhpFile($_file_, $_params_ = array())
+	{
+		ob_start();
+		ob_implicit_flush(false);
+		extract($_params_, EXTR_OVERWRITE);
+		require($_file_);
+		return ob_get_clean();
+	}
+
+	/**
+	 * Renders dynamic content returned by the given PHP statements.
+	 * This method is mainly used together with content caching (fragment caching and page caching)
+	 * when some portions of the content (called *dynamic content*) should not be cached.
+	 * The dynamic content must be returned by some PHP statements.
+	 * @param string $statements the PHP statements for generating the dynamic content.
+	 * @return string the placeholder of the dynamic content, or the dynamic content if there is no
+	 * active content cache currently.
+	 */
+	public function renderDynamic($statements)
+	{
+		if (!empty($this->cacheStack)) {
+			$n = count($this->dynamicPlaceholders);
+			$placeholder = "<![CDATA[YII-DYNAMIC-$n]]>";
+			$this->addDynamicPlaceholder($placeholder, $statements);
+			return $placeholder;
+		} else {
+			return $this->evaluateDynamicContent($statements);
+		}
+	}
+
+	/**
+	 * Adds a placeholder for dynamic content.
+	 * This method is internally used.
+	 * @param string $placeholder the placeholder name
+	 * @param string $statements the PHP statements for generating the dynamic content
+	 */
+	public function addDynamicPlaceholder($placeholder, $statements)
+	{
+		foreach ($this->cacheStack as $cache) {
+			$cache->dynamicPlaceholders[$placeholder] = $statements;
+		}
+		$this->dynamicPlaceholders[$placeholder] = $statements;
+	}
+
+	/**
+	 * Evaluates the given PHP statements.
+	 * This method is mainly used internally to implement dynamic content feature.
+	 * @param string $statements the PHP statements to be evaluated.
+	 * @return mixed the return value of the PHP statements.
+	 */
+	public function evaluateDynamicContent($statements)
+	{
+		return eval($statements);
+	}
+
+	/**
+	 * Creates a widget.
+	 * This method will use [[Yii::createObject()]] to create the widget.
+	 * @param string $class the widget class name or path alias
+	 * @param array $properties the initial property values of the widget.
+	 * @return Widget the newly created widget instance
+	 */
+	public function createWidget($class, $properties = array())
+	{
+		$properties['class'] = $class;
+		if (!isset($properties['view'])) {
+			$properties['view'] = $this;
+		}
+		return Yii::createObject($properties);
+	}
+
+	/**
+	 * Creates and runs a widget.
+	 * Compared with [[createWidget()]], this method does one more thing: it will
+	 * run the widget after it is created.
+	 * @param string $class the widget class name or path alias
+	 * @param array $properties the initial property values of the widget.
+	 * @param boolean $captureOutput whether to capture the output of the widget and return it as a string
+	 * @return string|Widget if $captureOutput is true, the output of the widget will be returned;
+	 * otherwise the widget object will be returned.
+	 */
+	public function widget($class, $properties = array(), $captureOutput = false)
+	{
+		if ($captureOutput) {
+			ob_start();
+			ob_implicit_flush(false);
+			$widget = $this->createWidget($class, $properties);
+			$widget->run();
+			return ob_get_clean();
+		} else {
+			$widget = $this->createWidget($class, $properties);
+			$widget->run();
+			return $widget;
+		}
+	}
+
+	/**
+	 * Begins a widget.
+	 * This method is similar to [[createWidget()]] except that it will expect a matching
+	 * [[endWidget()]] call after this.
+	 * @param string $class the widget class name or path alias
+	 * @param array $properties the initial property values of the widget.
+	 * @return Widget the widget instance
+	 */
+	public function beginWidget($class, $properties = array())
+	{
+		$widget = $this->createWidget($class, $properties);
+		$this->widgetStack[] = $widget;
+		return $widget;
+	}
+
+	/**
+	 * Ends a widget.
+	 * Note that the rendering result of the widget is directly echoed out.
+	 * If you want to capture the rendering result of a widget, you may use
+	 * [[createWidget()]] and [[Widget::run()]].
+	 * @return Widget the widget instance
+	 * @throws InvalidCallException if [[beginWidget()]] and [[endWidget()]] calls are not properly nested
+	 */
+	public function endWidget()
+	{
+		$widget = array_pop($this->widgetStack);
+		if ($widget instanceof Widget) {
+			$widget->run();
+			return $widget;
+		} else {
+			throw new InvalidCallException("Unmatched beginWidget() and endWidget() calls.");
+		}
+	}
+
+	/**
+	 * Begins recording a block.
+	 * This method is a shortcut to beginning [[yii\widgets\Block]]
+	 * @param string $id the block ID.
+	 * @param boolean $renderInPlace whether to render the block content in place.
+	 * Defaults to false, meaning the captured block will not be displayed.
+	 * @return \yii\widgets\Block the Block widget instance
+	 */
+	public function beginBlock($id, $renderInPlace = false)
+	{
+		return $this->beginWidget('yii\widgets\Block', array(
+			'id' => $id,
+			'renderInPlace' => $renderInPlace,
+		));
+	}
+
+	/**
+	 * Ends recording a block.
+	 */
+	public function endBlock()
+	{
+		$this->endWidget();
+	}
+
+	/**
+	 * Begins the rendering of content that is to be decorated by the specified view.
+	 * This method can be used to implement nested layout. For example, a layout can be embedded
+	 * in another layout file specified as '@app/view/layouts/base' like the following:
+	 *
+	 * ~~~
+	 * <?php $this->beginContent('@app/view/layouts/base'); ?>
+	 * ...layout content here...
+	 * <?php $this->endContent(); ?>
+	 * ~~~
+	 *
+	 * @param string $viewFile the view file that will be used to decorate the content enclosed by this widget.
+	 * This can be specified as either the view file path or path alias.
+	 * @param array $params the variables (name=>value) to be extracted and made available in the decorative view.
+	 * @return \yii\widgets\ContentDecorator the ContentDecorator widget instance
+	 * @see \yii\widgets\ContentDecorator
+	 */
+	public function beginContent($viewFile, $params = array())
+	{
+		return $this->beginWidget('yii\widgets\ContentDecorator', array(
+			'viewFile' => $viewFile,
+			'params' => $params,
+		));
+	}
+
+	/**
+	 * Ends the rendering of content.
+	 */
+	public function endContent()
+	{
+		$this->endWidget();
+	}
+
+	/**
+	 * Begins fragment caching.
+	 * This method will display cached content if it is available.
+	 * If not, it will start caching and would expect an [[endCache()]]
+	 * call to end the cache and save the content into cache.
+	 * A typical usage of fragment caching is as follows,
+	 *
+	 * ~~~
+	 * if($this->beginCache($id)) {
+	 *     // ...generate content here
+	 *     $this->endCache();
+	 * }
+	 * ~~~
+	 *
+	 * @param string $id a unique ID identifying the fragment to be cached.
+	 * @param array $properties initial property values for [[\yii\widgets\FragmentCache]]
+	 * @return boolean whether you should generate the content for caching.
+	 * False if the cached version is available.
+	 */
+	public function beginCache($id, $properties = array())
+	{
+		$properties['id'] = $id;
+		/** @var $cache \yii\widgets\FragmentCache */
+		$cache = $this->beginWidget('yii\widgets\FragmentCache', $properties);
+		if ($cache->getCachedContent() !== false) {
+			$this->endCache();
+			return false;
+		} else {
+			return true;
+		}
+	}
+
+	/**
+	 * Ends fragment caching.
+	 */
+	public function endCache()
+	{
+		$this->endWidget();
+	}
+
+
+	private $_assetManager;
+
+	/**
+	 * Registers the asset manager being used by this view object.
+	 * @return \yii\web\AssetManager the asset manager. Defaults to the "assetManager" application component.
+	 */
+	public function getAssetManager()
+	{
+		return $this->_assetManager ?: Yii::$app->getAssetManager();
+	}
+
+	/**
+	 * Sets the asset manager.
+	 * @param \yii\web\AssetManager $value the asset manager
+	 */
+	public function setAssetManager($value)
+	{
+		$this->_assetManager = $value;
+	}
+
+	/**
+	 * Marks the beginning of an HTML page.
+	 */
+	public function beginPage()
+	{
+		ob_start();
+		ob_implicit_flush(false);
+
+		$this->trigger(self::EVENT_BEGIN_PAGE);
+	}
+
+	/**
+	 * Marks the ending of an HTML page.
+	 */
+	public function endPage()
+	{
+		$this->trigger(self::EVENT_END_PAGE);
+
+		$content = ob_get_clean();
+		echo strtr($content, array(
+			self::PL_HEAD => $this->renderHeadHtml(),
+			self::PL_BODY_BEGIN => $this->renderBodyBeginHtml(),
+			self::PL_BODY_END => $this->renderBodyEndHtml(),
+		));
+
+		unset(
+			$this->assetBundles,
+			$this->metaTags,
+			$this->linkTags,
+			$this->css,
+			$this->cssFiles,
+			$this->js,
+			$this->jsFiles
+		);
+	}
+
+	/**
+	 * Marks the beginning of an HTML body section.
+	 */
+	public function beginBody()
+	{
+		echo self::PL_BODY_BEGIN;
+	}
+
+	/**
+	 * Marks the ending of an HTML body section.
+	 */
+	public function endBody()
+	{
+		echo self::PL_BODY_END;
+	}
+
+	/**
+	 * Marks the position of an HTML head section.
+	 */
+	public function head()
+	{
+		echo self::PL_HEAD;
+	}
+
+	/**
+	 * Registers the named asset bundle.
+	 * All dependent asset bundles will be registered.
+	 * @param string $name the name of the asset bundle.
+	 * @throws InvalidConfigException if the asset bundle does not exist or a circular dependency is detected
+	 */
+	public function registerAssetBundle($name)
+	{
+		if (!isset($this->assetBundles[$name])) {
+			$am = $this->getAssetManager();
+			$bundle = $am->getBundle($name);
+			if ($bundle !== null) {
+				$this->assetBundles[$name] = false;
+				$bundle->registerAssets($this);
+				$this->assetBundles[$name] = true;
+			} else {
+				throw new InvalidConfigException("Unknown asset bundle: $name");
+			}
+		} elseif ($this->assetBundles[$name] === false) {
+			throw new InvalidConfigException("A circular dependency is detected for bundle '$name'.");
+		}
+	}
+
+	/**
+	 * Registers a meta tag.
+	 * @param array $options the HTML attributes for the meta tag.
+	 * @param string $key the key that identifies the meta tag. If two meta tags are registered
+	 * with the same key, the latter will overwrite the former. If this is null, the new meta tag
+	 * will be appended to the existing ones.
+	 */
+	public function registerMetaTag($options, $key = null)
+	{
+		if ($key === null) {
+			$this->metaTags[] = Html::tag('meta', '', $options);
+		} else {
+			$this->metaTags[$key] = Html::tag('meta', '', $options);
+		}
+	}
+
+	/**
+	 * Registers a link tag.
+	 * @param array $options the HTML attributes for the link tag.
+	 * @param string $key the key that identifies the link tag. If two link tags are registered
+	 * with the same key, the latter will overwrite the former. If this is null, the new link tag
+	 * will be appended to the existing ones.
+	 */
+	public function registerLinkTag($options, $key = null)
+	{
+		if ($key === null) {
+			$this->linkTags[] = Html::tag('link', '', $options);
+		} else {
+			$this->linkTags[$key] = Html::tag('link', '', $options);
+		}
+	}
+
+	/**
+	 * Registers a CSS code block.
+	 * @param string $css the CSS code block to be registered
+	 * @param array $options the HTML attributes for the style tag.
+	 * @param string $key the key that identifies the CSS code block. If null, it will use
+	 * $css as the key. If two CSS code blocks are registered with the same key, the latter
+	 * will overwrite the former.
+	 */
+	public function registerCss($css, $options = array(), $key = null)
+	{
+		$key = $key ?: $css;
+		$this->css[$key] = Html::style($css, $options);
+	}
+
+	/**
+	 * Registers a CSS file.
+	 * @param string $url the CSS file to be registered.
+	 * @param array $options the HTML attributes for the link tag.
+	 * @param string $key the key that identifies the CSS script file. If null, it will use
+	 * $url as the key. If two CSS files are registered with the same key, the latter
+	 * will overwrite the former.
+	 */
+	public function registerCssFile($url, $options = array(), $key = null)
+	{
+		$key = $key ?: $url;
+		$this->cssFiles[$key] = Html::cssFile($url, $options);
+	}
+
+	/**
+	 * Registers a JS code block.
+	 * @param string $js the JS code block to be registered
+	 * @param array $options the HTML attributes for the script tag. A special option
+	 * named "position" is supported which specifies where the JS script tag should be inserted
+	 * in a page. The possible values of "position" are:
+	 *
+	 * - [[POS_HEAD]]: in the head section
+	 * - [[POS_BEGIN]]: at the beginning of the body section
+	 * - [[POS_END]]: at the end of the body section
+	 *
+	 * @param string $key the key that identifies the JS code block. If null, it will use
+	 * $js as the key. If two JS code blocks are registered with the same key, the latter
+	 * will overwrite the former.
+	 */
+	public function registerJs($js, $options = array(), $key = null)
+	{
+		$position = isset($options['position']) ? $options['position'] : self::POS_END;
+		unset($options['position']);
+		$key = $key ?: $js;
+		$this->js[$position][$key] = Html::script($js, $options);
+	}
+
+	/**
+	 * Registers a JS file.
+	 * @param string $url the JS file to be registered.
+	 * @param array $options the HTML attributes for the script tag. A special option
+	 * named "position" is supported which specifies where the JS script tag should be inserted
+	 * in a page. The possible values of "position" are:
+	 *
+	 * - [[POS_HEAD]]: in the head section
+	 * - [[POS_BEGIN]]: at the beginning of the body section
+	 * - [[POS_END]]: at the end of the body section
+	 *
+	 * @param string $key the key that identifies the JS script file. If null, it will use
+	 * $url as the key. If two JS files are registered with the same key, the latter
+	 * will overwrite the former.
+	 */
+	public function registerJsFile($url, $options = array(), $key = null)
+	{
+		$position = isset($options['position']) ? $options['position'] : self::POS_END;
+		unset($options['position']);
+		$key = $key ?: $url;
+		$this->jsFiles[$position][$key] = Html::jsFile($url, $options);
+	}
+
+	/**
+	 * Renders the content to be inserted in the head section.
+	 * The content is rendered using the registered meta tags, link tags, CSS/JS code blocks and files.
+	 * @return string the rendered content
+	 */
+	protected function renderHeadHtml()
+	{
+		$lines = array();
+		if (!empty($this->metaTags)) {
+			$lines[] = implode("\n", $this->metaTags);
+		}
+		if (!empty($this->linkTags)) {
+			$lines[] = implode("\n", $this->linkTags);
+		}
+		if (!empty($this->cssFiles)) {
+			$lines[] = implode("\n", $this->cssFiles);
+		}
+		if (!empty($this->css)) {
+			$lines[] = implode("\n", $this->css);
+		}
+		if (!empty($this->jsFiles[self::POS_HEAD])) {
+			$lines[] = implode("\n", $this->jsFiles[self::POS_HEAD]);
+		}
+		if (!empty($this->js[self::POS_HEAD])) {
+			$lines[] = implode("\n", $this->js[self::POS_HEAD]);
+		}
+		return implode("\n", $lines);
+	}
+
+	/**
+	 * Renders the content to be inserted at the beginning of the body section.
+	 * The content is rendered using the registered JS code blocks and files.
+	 * @return string the rendered content
+	 */
+	protected function renderBodyBeginHtml()
+	{
+		$lines = array();
+		if (!empty($this->jsFiles[self::POS_BEGIN])) {
+			$lines[] = implode("\n", $this->jsFiles[self::POS_BEGIN]);
+		}
+		if (!empty($this->js[self::POS_BEGIN])) {
+			$lines[] = implode("\n", $this->js[self::POS_BEGIN]);
+		}
+		return implode("\n", $lines);
+	}
+
+	/**
+	 * Renders the content to be inserted at the end of the body section.
+	 * The content is rendered using the registered JS code blocks and files.
+	 * @return string the rendered content
+	 */
+	protected function renderBodyEndHtml()
+	{
+		$lines = array();
+		if (!empty($this->jsFiles[self::POS_END])) {
+			$lines[] = implode("\n", $this->jsFiles[self::POS_END]);
+		}
+		if (!empty($this->js[self::POS_END])) {
+			$lines[] = implode("\n", $this->js[self::POS_END]);
+		}
+		return implode("\n", $lines);
+	}
+}
diff --git a/yii/base/ViewEvent.php b/yii/base/ViewEvent.php
new file mode 100644
index 0000000..f1ee7b9
--- /dev/null
+++ b/yii/base/ViewEvent.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class ViewEvent extends Event
+{
+	/**
+	 * @var string the rendering result of [[View::renderFile()]].
+	 * Event handlers may modify this property and the modified output will be
+	 * returned by [[View::renderFile()]]. This property is only used
+	 * by [[View::EVENT_AFTER_RENDER]] event.
+	 */
+	public $output;
+	/**
+	 * @var string the view file path that is being rendered by [[View::renderFile()]].
+	 */
+	public $viewFile;
+	/**
+	 * @var boolean whether to continue rendering the view file. Event handlers of
+	 * [[View::EVENT_BEFORE_RENDER]] may set this property to decide whether
+	 * to continue rendering the current view file.
+	 */
+	public $isValid = true;
+
+	/**
+	 * Constructor.
+	 * @param string $viewFile the view file path that is being rendered by [[View::renderFile()]].
+	 * @param array $config name-value pairs that will be used to initialize the object properties
+	 */
+	public function __construct($viewFile, $config = array())
+	{
+		$this->viewFile = $viewFile;
+		parent::__construct($config);
+	}
+}
diff --git a/yii/base/ViewRenderer.php b/yii/base/ViewRenderer.php
new file mode 100644
index 0000000..576bbe8
--- /dev/null
+++ b/yii/base/ViewRenderer.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+/**
+ * ViewRenderer is the base class for view renderer classes.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+abstract class ViewRenderer extends Component
+{
+	/**
+	 * Renders a view file.
+	 *
+	 * This method is invoked by [[View]] whenever it tries to render a view.
+	 * Child classes must implement this method to render the given view file.
+	 *
+	 * @param View $view the view object used for rendering the file.
+	 * @param string $file the view file.
+	 * @param array $params the parameters to be passed to the view file.
+	 * @return string the rendering result
+	 */
+	abstract public function render($view, $file, $params);
+}
diff --git a/yii/base/Widget.php b/yii/base/Widget.php
new file mode 100644
index 0000000..c0c524f
--- /dev/null
+++ b/yii/base/Widget.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+use Yii;
+use yii\helpers\FileHelper;
+
+/**
+ * Widget is the base class for widgets.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Widget extends Component
+{
+	/**
+	 * @var View the view object that is used to create this widget.
+	 * This property is automatically set by [[View::createWidget()]].
+	 * This property is required by [[render()]] and [[renderFile()]].
+	 */
+	public $view;
+	/**
+	 * @var string id of the widget.
+	 */
+	private $_id;
+	/**
+	 * @var integer a counter used to generate IDs for widgets.
+	 */
+	private static $_counter = 0;
+
+	/**
+	 * Returns the ID of the widget.
+	 * @param boolean $autoGenerate whether to generate an ID if it is not set previously
+	 * @return string ID of the widget.
+	 */
+	public function getId($autoGenerate = true)
+	{
+		if ($autoGenerate && $this->_id === null) {
+			$this->_id = 'w' . self::$_counter++;
+		}
+		return $this->_id;
+	}
+
+	/**
+	 * Sets the ID of the widget.
+	 * @param string $value id of the widget.
+	 */
+	public function setId($value)
+	{
+		$this->_id = $value;
+	}
+
+	/**
+	 * Executes the widget.
+	 */
+	public function run()
+	{
+	}
+
+	/**
+	 * Renders a view.
+	 * The view to be rendered can be specified in one of the following formats:
+	 *
+	 * - path alias (e.g. "@app/views/site/index");
+	 * - absolute path within application (e.g. "//site/index"): the view name starts with double slashes.
+	 *   The actual view file will be looked for under the [[Application::viewPath|view path]] of the application.
+	 * - absolute path within module (e.g. "/site/index"): the view name starts with a single slash.
+	 *   The actual view file will be looked for under the [[Module::viewPath|view path]] of the currently
+	 *   active module.
+	 * - relative path (e.g. "index"): the actual view file will be looked for under [[viewPath]].
+	 *
+	 * If the view name does not contain a file extension, it will use the default one `.php`.
+
+	 * @param string $view the view name. Please refer to [[findViewFile()]] on how to specify a view name.
+	 * @param array $params the parameters (name-value pairs) that should be made available in the view.
+	 * @return string the rendering result.
+	 * @throws InvalidParamException if the view file does not exist.
+	 */
+	public function render($view, $params = array())
+	{
+		$viewFile = $this->findViewFile($view);
+		return $this->view->renderFile($viewFile, $params, $this);
+	}
+
+	/**
+	 * Renders a view file.
+	 * @param string $file the view file to be rendered. This can be either a file path or a path alias.
+	 * @param array $params the parameters (name-value pairs) that should be made available in the view.
+	 * @return string the rendering result.
+	 * @throws InvalidParamException if the view file does not exist.
+	 */
+	public function renderFile($file, $params = array())
+	{
+		return $this->view->renderFile($file, $params, $this);
+	}
+
+	/**
+	 * Returns the directory containing the view files for this widget.
+	 * The default implementation returns the 'views' subdirectory under the directory containing the widget class file.
+	 * @return string the directory containing the view files for this widget.
+	 */
+	public function getViewPath()
+	{
+		$className = get_class($this);
+		$class = new \ReflectionClass($className);
+		return dirname($class->getFileName()) . DIRECTORY_SEPARATOR . 'views';
+	}
+
+	/**
+	 * Finds the view file based on the given view name.
+	 * @param string $view the view name or the path alias of the view file. Please refer to [[render()]]
+	 * on how to specify this parameter.
+	 * @return string the view file path. Note that the file may not exist.
+	 */
+	protected function findViewFile($view)
+	{
+		if (strncmp($view, '@', 1) === 0) {
+			// e.g. "@app/views/main"
+			$file = Yii::getAlias($view);
+		} elseif (strncmp($view, '//', 2) === 0) {
+			// e.g. "//layouts/main"
+			$file = Yii::$app->getViewPath() . DIRECTORY_SEPARATOR . ltrim($view, '/');
+		} elseif (strncmp($view, '/', 1) === 0 && Yii::$app->controller !== null) {
+			// e.g. "/site/index"
+			$file = Yii::$app->controller->module->getViewPath() . DIRECTORY_SEPARATOR . ltrim($view, '/');
+		} else {
+			$file = $this->getViewPath() . DIRECTORY_SEPARATOR . ltrim($view, '/');
+		}
+
+		return pathinfo($file, PATHINFO_EXTENSION) === '' ? $file . '.php' : $file;
+	}
+}
diff --git a/yii/caching/ApcCache.php b/yii/caching/ApcCache.php
new file mode 100644
index 0000000..391851d
--- /dev/null
+++ b/yii/caching/ApcCache.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\caching;
+
+/**
+ * ApcCache provides APC caching in terms of an application component.
+ *
+ * To use this application component, the [APC PHP extension](http://www.php.net/apc) must be loaded.
+ * In order to enable APC for CLI you should add "apc.enable_cli = 1" to your php.ini.
+ *
+ * See [[Cache]] for common cache operations that ApcCache supports.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class ApcCache extends Cache
+{
+	/**
+	 * Retrieves a value from cache with a specified key.
+	 * This is the implementation of the method declared in the parent class.
+	 * @param string $key a unique key identifying the cached value
+	 * @return string the value stored in cache, false if the value is not in the cache or expired.
+	 */
+	protected function getValue($key)
+	{
+		return apc_fetch($key);
+	}
+
+	/**
+	 * Retrieves multiple values from cache with the specified keys.
+	 * @param array $keys a list of keys identifying the cached values
+	 * @return array a list of cached values indexed by the keys
+	 */
+	protected function getValues($keys)
+	{
+		return apc_fetch($keys);
+	}
+
+	/**
+	 * Stores a value identified by a key in cache.
+	 * This is the implementation of the method declared in the parent class.
+	 *
+	 * @param string $key the key identifying the value to be cached
+	 * @param string $value the value to be cached
+	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
+	 * @return boolean true if the value is successfully stored into cache, false otherwise
+	 */
+	protected function setValue($key, $value, $expire)
+	{
+		return apc_store($key, $value, $expire);
+	}
+
+	/**
+	 * Stores a value identified by a key into cache if the cache does not contain this key.
+	 * This is the implementation of the method declared in the parent class.
+	 * @param string $key the key identifying the value to be cached
+	 * @param string $value the value to be cached
+	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
+	 * @return boolean true if the value is successfully stored into cache, false otherwise
+	 */
+	protected function addValue($key, $value, $expire)
+	{
+		return apc_add($key, $value, $expire);
+	}
+
+	/**
+	 * Deletes a value with the specified key from cache
+	 * This is the implementation of the method declared in the parent class.
+	 * @param string $key the key of the value to be deleted
+	 * @return boolean if no error happens during deletion
+	 */
+	protected function deleteValue($key)
+	{
+		return apc_delete($key);
+	}
+
+	/**
+	 * Deletes all values from cache.
+	 * This is the implementation of the method declared in the parent class.
+	 * @return boolean whether the flush operation was successful.
+	 */
+	protected function flushValues()
+	{
+		return apc_clear_cache('user');
+	}
+}
diff --git a/yii/caching/Cache.php b/yii/caching/Cache.php
new file mode 100644
index 0000000..78f2854
--- /dev/null
+++ b/yii/caching/Cache.php
@@ -0,0 +1,352 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\caching;
+
+use yii\base\Component;
+use yii\helpers\StringHelper;
+
+/**
+ * Cache is the base class for cache classes supporting different cache storage implementation.
+ *
+ * A data item can be stored in cache by calling [[set()]] and be retrieved back
+ * later (in the same or different request) by [[get()]]. In both operations,
+ * a key identifying the data item is required. An expiration time and/or a [[Dependency|dependency]]
+ * can also be specified when calling [[set()]]. If the data item expires or the dependency
+ * changes at the time of calling [[get()]], the cache will return no data.
+ *
+ * A typical usage pattern of cache is like the following:
+ *
+ * ~~~
+ * $key = 'demo';
+ * $data = $cache->get($key);
+ * if ($data === false) {
+ *     // ...generate $data here...
+ *     $cache->set($key, $data, $expire, $dependency);
+ * }
+ * ~~~
+ *
+ * Because Cache implements the ArrayAccess interface, it can be used like an array. For example,
+ *
+ * ~~~
+ * $cache['foo'] = 'some data';
+ * echo $cache['foo'];
+ * ~~~
+ *
+ * Derived classes should implement the following methods:
+ *
+ * - [[getValue()]]: retrieve the value with a key (if any) from cache
+ * - [[setValue()]]: store the value with a key into cache
+ * - [[addValue()]]: store the value only if the cache does not have this key before
+ * - [[deleteValue()]]: delete the value with the specified key from cache
+ * - [[flushValues()]]: delete all values from cache
+ *
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+abstract class Cache extends Component implements \ArrayAccess
+{
+	/**
+	 * @var string a string prefixed to every cache key so that it is unique. Defaults to null, meaning using
+	 * the value of [[Application::id]] as the key prefix. You may set this property to be an empty string
+	 * if you don't want to use key prefix. It is recommended that you explicitly set this property to some
+	 * static value if the cached data needs to be shared among multiple applications.
+	 */
+	public $keyPrefix;
+	/**
+	 * @var array|boolean the functions used to serialize and unserialize cached data. Defaults to null, meaning
+	 * using the default PHP `serialize()` and `unserialize()` functions. If you want to use some more efficient
+	 * serializer (e.g. [igbinary](http://pecl.php.net/package/igbinary)), you may configure this property with
+	 * a two-element array. The first element specifies the serialization function, and the second the deserialization
+	 * function. If this property is set false, data will be directly sent to and retrieved from the underlying
+	 * cache component without any serialization or deserialization. You should not turn off serialization if
+	 * you are using [[Dependency|cache dependency]], because it relies on data serialization.
+	 */
+	public $serializer;
+
+
+	/**
+	 * Initializes the application component.
+	 * This method overrides the parent implementation by setting default cache key prefix.
+	 */
+	public function init()
+	{
+		parent::init();
+		if ($this->keyPrefix === null) {
+			$this->keyPrefix = \Yii::$app->id;
+		}
+	}
+
+	/**
+	 * Builds a normalized cache key from a given key.
+	 *
+	 * The generated key contains letters and digits only, and its length is no more than 32.
+	 * 
+	 * If the given key is a string containing alphanumeric characters only and no more than 32 characters,
+	 * then the key will be returned back without change. Otherwise, a normalized key
+	 * is generated by serializing the given key and applying MD5 hashing.
+	 * 
+	 * The following example builds a cache key using three parameters:
+	 *
+	 * ~~~
+	 * $key = $cache->buildKey($className, $method, $id);
+	 * ~~~
+	 *
+	 * @param array|string $key the key to be normalized
+	 * @return string the generated cache key
+	 */
+	public function buildKey($key)
+	{
+		if (is_string($key)) {
+			return ctype_alnum($key) && StringHelper::strlen($key) <= 32 ? $key : md5($key);
+		} else {
+			return md5(json_encode($key));
+		}
+	}
+
+	/**
+	 * Retrieves a value from cache with a specified key.
+	 * @param string $key a key identifying the cached value
+	 * @return mixed the value stored in cache, false if the value is not in the cache, expired,
+	 * or the dependency associated with the cached data has changed.
+	 */
+	public function get($key)
+	{
+		$key = $this->keyPrefix . $this->buildKey($key);
+		$value = $this->getValue($key);
+		if ($value === false || $this->serializer === false) {
+			return $value;
+		} elseif ($this->serializer === null) {
+			$value = unserialize($value);
+		} else {
+			$value = call_user_func($this->serializer[1], $value);
+		}
+		if (is_array($value) && !($value[1] instanceof Dependency && $value[1]->getHasChanged())) {
+			return $value[0];
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Retrieves multiple values from cache with the specified keys.
+	 * Some caches (such as memcache, apc) allow retrieving multiple cached values at the same time,
+	 * which may improve the performance. In case a cache does not support this feature natively,
+	 * this method will try to simulate it.
+	 * @param array $keys list of keys identifying the cached values
+	 * @return array list of cached values corresponding to the specified keys. The array
+	 * is returned in terms of (key,value) pairs.
+	 * If a value is not cached or expired, the corresponding array value will be false.
+	 */
+	public function mget($keys)
+	{
+		$keyMap = array();
+		foreach ($keys as $key) {
+			$keyMap[$key] = $this->keyPrefix . $this->buildKey($key);
+		}
+		$values = $this->getValues(array_values($keyMap));
+		$results = array();
+		foreach ($keyMap as $key => $newKey) {
+			$results[$key] = false;
+			if (isset($values[$newKey])) {
+				if ($this->serializer === false) {
+					$results[$key] = $values[$newKey];
+				} else {
+					$value = $this->serializer === null ? unserialize($values[$newKey])
+							: call_user_func($this->serializer[1], $values[$newKey]);
+
+					if (is_array($value) && !($value[1] instanceof Dependency && $value[1]->getHasChanged())) {
+						$results[$key] = $value[0];
+					}
+				}
+			}
+		}
+		return $results;
+	}
+
+	/**
+	 * Stores a value identified by a key into cache.
+	 * If the cache already contains such a key, the existing value and
+	 * expiration time will be replaced with the new ones, respectively.
+	 *
+	 * @param string $key the key identifying the value to be cached
+	 * @param mixed $value the value to be cached
+	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
+	 * @param Dependency $dependency dependency of the cached item. If the dependency changes,
+	 * the corresponding value in the cache will be invalidated when it is fetched via [[get()]].
+	 * This parameter is ignored if [[serializer]] is false.
+	 * @return boolean whether the value is successfully stored into cache
+	 */
+	public function set($key, $value, $expire = 0, $dependency = null)
+	{
+		if ($dependency !== null && $this->serializer !== false) {
+			$dependency->evaluateDependency();
+		}
+		if ($this->serializer === null) {
+			$value = serialize(array($value, $dependency));
+		} elseif ($this->serializer !== false) {
+			$value = call_user_func($this->serializer[0], array($value, $dependency));
+		}
+		$key = $this->keyPrefix . $this->buildKey($key);
+		return $this->setValue($key, $value, $expire);
+	}
+
+	/**
+	 * Stores a value identified by a key into cache if the cache does not contain this key.
+	 * Nothing will be done if the cache already contains the key.
+	 * @param string $key the key identifying the value to be cached
+	 * @param mixed $value the value to be cached
+	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
+	 * @param Dependency $dependency dependency of the cached item. If the dependency changes,
+	 * the corresponding value in the cache will be invalidated when it is fetched via [[get()]].
+	 * This parameter is ignored if [[serializer]] is false.
+	 * @return boolean whether the value is successfully stored into cache
+	 */
+	public function add($key, $value, $expire = 0, $dependency = null)
+	{
+		if ($dependency !== null && $this->serializer !== false) {
+			$dependency->evaluateDependency();
+		}
+		if ($this->serializer === null) {
+			$value = serialize(array($value, $dependency));
+		} elseif ($this->serializer !== false) {
+			$value = call_user_func($this->serializer[0], array($value, $dependency));
+		}
+		$key = $this->keyPrefix . $this->buildKey($key);
+		return $this->addValue($key, $value, $expire);
+	}
+
+	/**
+	 * Deletes a value with the specified key from cache
+	 * @param string $key the key of the value to be deleted
+	 * @return boolean if no error happens during deletion
+	 */
+	public function delete($key)
+	{
+		$key = $this->keyPrefix . $this->buildKey($key);
+		return $this->deleteValue($key);
+	}
+
+	/**
+	 * Deletes all values from cache.
+	 * Be careful of performing this operation if the cache is shared among multiple applications.
+	 * @return boolean whether the flush operation was successful.
+	 */
+	public function flush()
+	{
+		return $this->flushValues();
+	}
+
+	/**
+	 * Retrieves a value from cache with a specified key.
+	 * This method should be implemented by child classes to retrieve the data
+	 * from specific cache storage.
+	 * @param string $key a unique key identifying the cached value
+	 * @return string the value stored in cache, false if the value is not in the cache or expired.
+	 */
+	abstract protected function getValue($key);
+
+	/**
+	 * Stores a value identified by a key in cache.
+	 * This method should be implemented by child classes to store the data
+	 * in specific cache storage.
+	 * @param string $key the key identifying the value to be cached
+	 * @param string $value the value to be cached
+	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
+	 * @return boolean true if the value is successfully stored into cache, false otherwise
+	 */
+	abstract protected function setValue($key, $value, $expire);
+
+	/**
+	 * Stores a value identified by a key into cache if the cache does not contain this key.
+	 * This method should be implemented by child classes to store the data
+	 * in specific cache storage.
+	 * @param string $key the key identifying the value to be cached
+	 * @param string $value the value to be cached
+	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
+	 * @return boolean true if the value is successfully stored into cache, false otherwise
+	 */
+	abstract protected function addValue($key, $value, $expire);
+
+	/**
+	 * Deletes a value with the specified key from cache
+	 * This method should be implemented by child classes to delete the data from actual cache storage.
+	 * @param string $key the key of the value to be deleted
+	 * @return boolean if no error happens during deletion
+	 */
+	abstract protected function deleteValue($key);
+
+	/**
+	 * Deletes all values from cache.
+	 * Child classes may implement this method to realize the flush operation.
+	 * @return boolean whether the flush operation was successful.
+	 */
+	abstract protected function flushValues();
+
+	/**
+	 * Retrieves multiple values from cache with the specified keys.
+	 * The default implementation calls [[getValue()]] multiple times to retrieve
+	 * the cached values one by one. If the underlying cache storage supports multiget,
+	 * this method should be overridden to exploit that feature.
+	 * @param array $keys a list of keys identifying the cached values
+	 * @return array a list of cached values indexed by the keys
+	 */
+	protected function getValues($keys)
+	{
+		$results = array();
+		foreach ($keys as $key) {
+			$results[$key] = $this->getValue($key);
+		}
+		return $results;
+	}
+
+	/**
+	 * Returns whether there is a cache entry with a specified key.
+	 * This method is required by the interface ArrayAccess.
+	 * @param string $key a key identifying the cached value
+	 * @return boolean
+	 */
+	public function offsetExists($key)
+	{
+		return $this->get($key) !== false;
+	}
+
+	/**
+	 * Retrieves the value from cache with a specified key.
+	 * This method is required by the interface ArrayAccess.
+	 * @param string $key a key identifying the cached value
+	 * @return mixed the value stored in cache, false if the value is not in the cache or expired.
+	 */
+	public function offsetGet($key)
+	{
+		return $this->get($key);
+	}
+
+	/**
+	 * Stores the value identified by a key into cache.
+	 * If the cache already contains such a key, the existing value will be
+	 * replaced with the new ones. To add expiration and dependencies, use the [[set()]] method.
+	 * This method is required by the interface ArrayAccess.
+	 * @param string $key the key identifying the value to be cached
+	 * @param mixed $value the value to be cached
+	 */
+	public function offsetSet($key, $value)
+	{
+		$this->set($key, $value);
+	}
+
+	/**
+	 * Deletes the value with the specified key from cache
+	 * This method is required by the interface ArrayAccess.
+	 * @param string $key the key of the value to be deleted
+	 */
+	public function offsetUnset($key)
+	{
+		$this->delete($key);
+	}
+}
diff --git a/yii/caching/ChainedDependency.php b/yii/caching/ChainedDependency.php
new file mode 100644
index 0000000..7c7058e
--- /dev/null
+++ b/yii/caching/ChainedDependency.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\caching;
+
+/**
+ * ChainedDependency represents a dependency which is composed of a list of other dependencies.
+ *
+ * When [[dependOnAll]] is true, if any of the dependencies has changed, this dependency is
+ * considered changed; When [[dependOnAll]] is false, if one of the dependencies has NOT changed,
+ * this dependency is considered NOT changed.
+ *
+ * @property boolean $hasChanged Whether the dependency is changed or not.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class ChainedDependency extends Dependency
+{
+	/**
+	 * @var Dependency[] list of dependencies that this dependency is composed of.
+	 * Each array element must be a dependency object.
+	 */
+	public $dependencies;
+	/**
+	 * @var boolean whether this dependency is depending on every dependency in [[dependencies]].
+	 * Defaults to true, meaning if any of the dependencies has changed, this dependency is considered changed.
+	 * When it is set false, it means if one of the dependencies has NOT changed, this dependency
+	 * is considered NOT changed.
+	 */
+	public $dependOnAll = true;
+
+	/**
+	 * Constructor.
+	 * @param Dependency[] $dependencies list of dependencies that this dependency is composed of.
+	 * Each array element should be a dependency object.
+	 * @param array $config name-value pairs that will be used to initialize the object properties
+	 */
+	public function __construct($dependencies = array(), $config = array())
+	{
+		$this->dependencies = $dependencies;
+		parent::__construct($config);
+	}
+
+	/**
+	 * Evaluates the dependency by generating and saving the data related with dependency.
+	 */
+	public function evaluateDependency()
+	{
+		foreach ($this->dependencies as $dependency) {
+			$dependency->evaluateDependency();
+		}
+	}
+
+	/**
+	 * Generates the data needed to determine if dependency has been changed.
+	 * This method does nothing in this class.
+	 * @return mixed the data needed to determine if dependency has been changed.
+	 */
+	protected function generateDependencyData()
+	{
+		return null;
+	}
+
+	/**
+	 * Performs the actual dependency checking.
+	 * This method returns true if any of the dependency objects
+	 * reports a dependency change.
+	 * @return boolean whether the dependency is changed or not.
+	 */
+	public function getHasChanged()
+	{
+		foreach ($this->dependencies as $dependency) {
+			if ($this->dependOnAll && $dependency->getHasChanged()) {
+				return true;
+			} elseif (!$this->dependOnAll && !$dependency->getHasChanged()) {
+				return false;
+			}
+		}
+		return !$this->dependOnAll;
+	}
+}
diff --git a/yii/caching/DbCache.php b/yii/caching/DbCache.php
new file mode 100644
index 0000000..dee8c7a
--- /dev/null
+++ b/yii/caching/DbCache.php
@@ -0,0 +1,247 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\caching;
+
+use Yii;
+use yii\base\InvalidConfigException;
+use yii\db\Connection;
+use yii\db\Query;
+
+/**
+ * DbCache implements a cache application component by storing cached data in a database.
+ *
+ * By default, DbCache stores session data in a DB table named 'tbl_cache'. This table
+ * must be pre-created. The table name can be changed by setting [[cacheTable]].
+ *
+ * Please refer to [[Cache]] for common cache operations that are supported by DbCache.
+ *
+ * The following example shows how you can configure the application to use DbCache:
+ *
+ * ~~~
+ * 'cache' => array(
+ *     'class' => 'yii\caching\DbCache',
+ *     // 'db' => 'mydb',
+ *     // 'cacheTable' => 'my_cache',
+ * )
+ * ~~~
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class DbCache extends Cache
+{
+	/**
+	 * @var Connection|string the DB connection object or the application component ID of the DB connection.
+	 * After the DbCache object is created, if you want to change this property, you should only assign it
+	 * with a DB connection object.
+	 */
+	public $db = 'db';
+	/**
+	 * @var string name of the DB table to store cache content.
+	 * The table should be pre-created as follows:
+	 *
+	 * ~~~
+	 * CREATE TABLE tbl_cache (
+	 *     id char(128) NOT NULL PRIMARY KEY,
+	 *     expire int(11),
+	 *     data BLOB
+	 * );
+	 * ~~~
+	 *
+	 * where 'BLOB' refers to the BLOB-type of your preferred DBMS. Below are the BLOB type
+	 * that can be used for some popular DBMS:
+	 *
+	 * - MySQL: LONGBLOB
+	 * - PostgreSQL: BYTEA
+	 * - MSSQL: BLOB
+	 *
+	 * When using DbCache in a production server, we recommend you create a DB index for the 'expire'
+	 * column in the cache table to improve the performance.
+	 */
+	public $cacheTable = 'tbl_cache';
+	/**
+	 * @var integer the probability (parts per million) that garbage collection (GC) should be performed
+	 * when storing a piece of data in the cache. Defaults to 100, meaning 0.01% chance.
+	 * This number should be between 0 and 1000000. A value 0 meaning no GC will be performed at all.
+	 **/
+	public $gcProbability = 100;
+
+
+	/**
+	 * Initializes the DbCache component.
+	 * This method will initialize the [[db]] property to make sure it refers to a valid DB connection.
+	 * @throws InvalidConfigException if [[db]] is invalid.
+	 */
+	public function init()
+	{
+		parent::init();
+		if (is_string($this->db)) {
+			$this->db = Yii::$app->getComponent($this->db);
+		}
+		if (!$this->db instanceof Connection) {
+			throw new InvalidConfigException("DbCache::db must be either a DB connection instance or the application component ID of a DB connection.");
+		}
+	}
+
+	/**
+	 * Retrieves a value from cache with a specified key.
+	 * This is the implementation of the method declared in the parent class.
+	 * @param string $key a unique key identifying the cached value
+	 * @return string the value stored in cache, false if the value is not in the cache or expired.
+	 */
+	protected function getValue($key)
+	{
+		$query = new Query;
+		$query->select(array('data'))
+			->from($this->cacheTable)
+			->where('[[id]] = :id AND ([[expire]] = 0 OR [[expire]] >' . time() . ')', array(':id' => $key));
+		if ($this->db->enableQueryCache) {
+			// temporarily disable and re-enable query caching
+			$this->db->enableQueryCache = false;
+			$result = $query->createCommand($this->db)->queryScalar();
+			$this->db->enableQueryCache = true;
+			return $result;
+		} else {
+			return $query->createCommand($this->db)->queryScalar();
+		}
+	}
+
+	/**
+	 * Retrieves multiple values from cache with the specified keys.
+	 * @param array $keys a list of keys identifying the cached values
+	 * @return array a list of cached values indexed by the keys
+	 */
+	protected function getValues($keys)
+	{
+		if (empty($keys)) {
+			return array();
+		}
+		$query = new Query;
+		$query->select(array('id', 'data'))
+			->from($this->cacheTable)
+			->where(array('id' => $keys))
+			->andWhere('([[expire]] = 0 OR [[expire]] > ' . time() . ')');
+
+		if ($this->db->enableQueryCache) {
+			$this->db->enableQueryCache = false;
+			$rows = $query->createCommand($this->db)->queryAll();
+			$this->db->enableQueryCache = true;
+		} else {
+			$rows = $query->createCommand($this->db)->queryAll();
+		}
+
+		$results = array();
+		foreach ($keys as $key) {
+			$results[$key] = false;
+		}
+		foreach ($rows as $row) {
+			$results[$row['id']] = $row['data'];
+		}
+		return $results;
+	}
+
+	/**
+	 * Stores a value identified by a key in cache.
+	 * This is the implementation of the method declared in the parent class.
+	 *
+	 * @param string $key the key identifying the value to be cached
+	 * @param string $value the value to be cached
+	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
+	 * @return boolean true if the value is successfully stored into cache, false otherwise
+	 */
+	protected function setValue($key, $value, $expire)
+	{
+		$command = $this->db->createCommand()
+			->update($this->cacheTable, array(
+				'expire' => $expire > 0 ? $expire + time() : 0,
+				'data' => array($value, \PDO::PARAM_LOB),
+			), array(
+				'id' => $key,
+			));
+
+		if ($command->execute()) {
+			$this->gc();
+			return true;
+		} else {
+			return $this->addValue($key, $value, $expire);
+		}
+ 	}
+
+	/**
+	 * Stores a value identified by a key into cache if the cache does not contain this key.
+	 * This is the implementation of the method declared in the parent class.
+	 *
+	 * @param string $key the key identifying the value to be cached
+	 * @param string $value the value to be cached
+	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
+	 * @return boolean true if the value is successfully stored into cache, false otherwise
+	 */
+	protected function addValue($key, $value, $expire)
+	{
+		$this->gc();
+
+		if ($expire > 0) {
+			$expire += time();
+		} else {
+			$expire = 0;
+		}
+
+		try {
+			$this->db->createCommand()
+				->insert($this->cacheTable, array(
+					'id' => $key,
+					'expire' => $expire,
+					'data' => array($value, \PDO::PARAM_LOB),
+				))->execute();
+			return true;
+		} catch (\Exception $e) {
+			return false;
+		}
+	}
+
+	/**
+	 * Deletes a value with the specified key from cache
+	 * This is the implementation of the method declared in the parent class.
+	 * @param string $key the key of the value to be deleted
+	 * @return boolean if no error happens during deletion
+	 */
+	protected function deleteValue($key)
+	{
+		$this->db->createCommand()
+			->delete($this->cacheTable, array('id' => $key))
+			->execute();
+		return true;
+	}
+
+	/**
+	 * Removes the expired data values.
+	 * @param boolean $force whether to enforce the garbage collection regardless of [[gcProbability]].
+	 * Defaults to false, meaning the actual deletion happens with the probability as specified by [[gcProbability]].
+	 */
+	public function gc($force = false)
+	{
+		if ($force || mt_rand(0, 1000000) < $this->gcProbability) {
+			$this->db->createCommand()
+				->delete($this->cacheTable, '[[expire]] > 0 AND [[expire]] < ' . time())
+				->execute();
+		}
+	}
+
+	/**
+	 * Deletes all values from cache.
+	 * This is the implementation of the method declared in the parent class.
+	 * @return boolean whether the flush operation was successful.
+	 */
+	protected function flushValues()
+	{
+		$this->db->createCommand()
+			->delete($this->cacheTable)
+			->execute();
+		return true;
+	}
+}
diff --git a/yii/caching/DbDependency.php b/yii/caching/DbDependency.php
new file mode 100644
index 0000000..7d45223
--- /dev/null
+++ b/yii/caching/DbDependency.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\caching;
+
+use Yii;
+use yii\base\InvalidConfigException;
+use yii\db\Connection;
+
+/**
+ * DbDependency represents a dependency based on the query result of a SQL statement.
+ *
+ * If the query result changes, the dependency is considered as changed.
+ * The query is specified via the [[sql]] property.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class DbDependency extends Dependency
+{
+	/**
+	 * @var string the application component ID of the DB connection.
+	 */
+	public $db = 'db';
+	/**
+	 * @var string the SQL query whose result is used to determine if the dependency has been changed.
+	 * Only the first row of the query result will be used.
+	 */
+	public $sql;
+	/**
+	 * @var array the parameters (name=>value) to be bound to the SQL statement specified by [[sql]].
+	 */
+	public $params;
+
+	/**
+	 * Constructor.
+	 * @param string $sql the SQL query whose result is used to determine if the dependency has been changed.
+	 * @param array $params the parameters (name=>value) to be bound to the SQL statement specified by [[sql]].
+	 * @param array $config name-value pairs that will be used to initialize the object properties
+	 */
+	public function __construct($sql, $params = array(), $config = array())
+	{
+		$this->sql = $sql;
+		$this->params = $params;
+		parent::__construct($config);
+	}
+
+	/**
+	 * Generates the data needed to determine if dependency has been changed.
+	 * This method returns the value of the global state.
+	 * @throws InvalidConfigException
+	 * @return mixed the data needed to determine if dependency has been changed.
+	 */
+	protected function generateDependencyData()
+	{
+		$db = Yii::$app->getComponent($this->db);
+		if (!$db instanceof Connection) {
+			throw new InvalidConfigException("DbDependency::db must be the application component ID of a DB connection.");
+		}
+
+		if ($db->enableQueryCache) {
+			// temporarily disable and re-enable query caching
+			$db->enableQueryCache = false;
+			$result = $db->createCommand($this->sql, $this->params)->queryRow();
+			$db->enableQueryCache = true;
+		} else {
+			$result = $db->createCommand($this->sql, $this->params)->queryRow();
+		}
+		return $result;
+	}
+}
diff --git a/yii/caching/Dependency.php b/yii/caching/Dependency.php
new file mode 100644
index 0000000..d1428fc
--- /dev/null
+++ b/yii/caching/Dependency.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\caching;
+
+/**
+ * Dependency is the base class for cache dependency classes.
+ *
+ * Child classes should override its [[generateDependencyData()]] for generating
+ * the actual dependency data.
+ *
+ * @property boolean $hasChanged Whether the dependency has changed.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+abstract class Dependency extends \yii\base\Object
+{
+	/**
+	 * @var mixed the dependency data that is saved in cache and later is compared with the
+	 * latest dependency data.
+	 */
+	public $data;
+
+	/**
+	 * Evaluates the dependency by generating and saving the data related with dependency.
+	 * This method is invoked by cache before writing data into it.
+	 */
+	public function evaluateDependency()
+	{
+		$this->data = $this->generateDependencyData();
+	}
+
+	/**
+	 * @return boolean whether the dependency has changed.
+	 */
+	public function getHasChanged()
+	{
+		return $this->generateDependencyData() !== $this->data;
+	}
+
+	/**
+	 * Generates the data needed to determine if dependency has been changed.
+	 * Derived classes should override this method to generate the actual dependency data.
+	 * @return mixed the data needed to determine if dependency has been changed.
+	 */
+	abstract protected function generateDependencyData();
+}
diff --git a/yii/caching/DummyCache.php b/yii/caching/DummyCache.php
new file mode 100644
index 0000000..359fa7c
--- /dev/null
+++ b/yii/caching/DummyCache.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\caching;
+
+/**
+ * DummyCache is a placeholder cache component.
+ *
+ * DummyCache does not cache anything. It is provided so that one can always configure
+ * a 'cache' application component and save the check of existence of `\Yii::$app->cache`.
+ * By replacing DummyCache with some other cache component, one can quickly switch from
+ * non-caching mode to caching mode.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class DummyCache extends Cache
+{
+	/**
+	 * Retrieves a value from cache with a specified key.
+	 * This is the implementation of the method declared in the parent class.
+	 * @param string $key a unique key identifying the cached value
+	 * @return string the value stored in cache, false if the value is not in the cache or expired.
+	 */
+	protected function getValue($key)
+	{
+		return false;
+	}
+
+	/**
+	 * Stores a value identified by a key in cache.
+	 * This is the implementation of the method declared in the parent class.
+	 *
+	 * @param string $key the key identifying the value to be cached
+	 * @param string $value the value to be cached
+	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
+	 * @return boolean true if the value is successfully stored into cache, false otherwise
+	 */
+	protected function setValue($key, $value, $expire)
+	{
+		return true;
+	}
+
+	/**
+	 * Stores a value identified by a key into cache if the cache does not contain this key.
+	 * This is the implementation of the method declared in the parent class.
+	 * @param string $key the key identifying the value to be cached
+	 * @param string $value the value to be cached
+	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
+	 * @return boolean true if the value is successfully stored into cache, false otherwise
+	 */
+	protected function addValue($key, $value, $expire)
+	{
+		return true;
+	}
+
+	/**
+	 * Deletes a value with the specified key from cache
+	 * This is the implementation of the method declared in the parent class.
+	 * @param string $key the key of the value to be deleted
+	 * @return boolean if no error happens during deletion
+	 */
+	protected function deleteValue($key)
+	{
+		return true;
+	}
+
+	/**
+	 * Deletes all values from cache.
+	 * This is the implementation of the method declared in the parent class.
+	 * @return boolean whether the flush operation was successful.
+	 */
+	protected function flushValues()
+	{
+		return true;
+	}
+}
diff --git a/yii/caching/ExpressionDependency.php b/yii/caching/ExpressionDependency.php
new file mode 100644
index 0000000..ec4736c
--- /dev/null
+++ b/yii/caching/ExpressionDependency.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\caching;
+
+/**
+ * ExpressionDependency represents a dependency based on the result of a PHP expression.
+ *
+ * ExpressionDependency will use `eval()` to evaluate the PHP expression.
+ * The dependency is reported as unchanged if and only if the result of the expression is
+ * the same as the one evaluated when storing the data to cache.
+ *
+ * A PHP expression can be any PHP code that has a value. To learn more about what an expression is,
+ * please refer to the [php manual](http://www.php.net/manual/en/language.expressions.php).
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class ExpressionDependency extends Dependency
+{
+	/**
+	 * @var string the string representation of a PHP expression whose result is used to determine the dependency.
+	 * A PHP expression can be any PHP code that has a value. To learn more about what an expression is,
+	 * please refer to the [php manual](http://www.php.net/manual/en/language.expressions.php).
+	 */
+	public $expression;
+	/**
+	 * @var mixed custom data associated with this dependency. In [[expression]], you may compare the value of
+	 * this property with the latest data to determine if the dependency has changed or not.
+	 */
+	public $data;
+
+	/**
+	 * Constructor.
+	 * @param string $expression the PHP expression whose result is used to determine the dependency.
+	 * @param mixed $data the custom data associated with this dependency
+	 * @param array $config name-value pairs that will be used to initialize the object properties
+	 */
+	public function __construct($expression = 'true', $data = null, $config = array())
+	{
+		$this->expression = $expression;
+		$this->data = $data;
+		parent::__construct($config);
+	}
+
+	/**
+	 * Generates the data needed to determine if dependency has been changed.
+	 * This method returns the result of the PHP expression.
+	 * @return mixed the data needed to determine if dependency has been changed.
+	 */
+	protected function generateDependencyData()
+	{
+		return eval("return {$this->expression};");
+	}
+}
diff --git a/yii/caching/FileCache.php b/yii/caching/FileCache.php
new file mode 100644
index 0000000..cc1a871
--- /dev/null
+++ b/yii/caching/FileCache.php
@@ -0,0 +1,206 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\caching;
+
+use Yii;
+
+/**
+ * FileCache implements a cache component using files.
+ *
+ * For each data value being cached, FileCache will store it in a separate file.
+ * The cache files are placed under [[cachePath]]. FileCache will perform garbage collection
+ * automatically to remove expired cache files.
+ *
+ * Please refer to [[Cache]] for common cache operations that are supported by FileCache.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class FileCache extends Cache
+{
+	/**
+	 * @var string the directory to store cache files. You may use path alias here.
+	 */
+	public $cachePath = '@app/runtime/cache';
+	/**
+	 * @var string cache file suffix. Defaults to '.bin'.
+	 */
+	public $cacheFileSuffix = '.bin';
+	/**
+	 * @var integer the level of sub-directories to store cache files. Defaults to 1.
+	 * If the system has huge number of cache files (e.g. one million), you may use a bigger value
+	 * (usually no bigger than 3). Using sub-directories is mainly to ensure the file system
+	 * is not over burdened with a single directory having too many files.
+	 */
+	public $directoryLevel = 1;
+	/**
+	 * @var integer the probability (parts per million) that garbage collection (GC) should be performed
+	 * when storing a piece of data in the cache. Defaults to 10, meaning 0.001% chance.
+	 * This number should be between 0 and 1000000. A value 0 means no GC will be performed at all.
+	 **/
+	public $gcProbability = 10;
+
+	/**
+	 * Initializes this component by ensuring the existence of the cache path.
+	 */
+	public function init()
+	{
+		parent::init();
+		$this->cachePath = Yii::getAlias($this->cachePath);
+		if (!is_dir($this->cachePath)) {
+			mkdir($this->cachePath, 0777, true);
+		}
+	}
+
+	/**
+	 * Retrieves a value from cache with a specified key.
+	 * This is the implementation of the method declared in the parent class.
+	 * @param string $key a unique key identifying the cached value
+	 * @return string the value stored in cache, false if the value is not in the cache or expired.
+	 */
+	protected function getValue($key)
+	{
+		$cacheFile = $this->getCacheFile($key);
+		if (($time = @filemtime($cacheFile)) > time()) {
+			return @file_get_contents($cacheFile);
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Stores a value identified by a key in cache.
+	 * This is the implementation of the method declared in the parent class.
+	 *
+	 * @param string $key the key identifying the value to be cached
+	 * @param string $value the value to be cached
+	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
+	 * @return boolean true if the value is successfully stored into cache, false otherwise
+	 */
+	protected function setValue($key, $value, $expire)
+	{
+		if ($expire <= 0) {
+			$expire = 31536000; // 1 year
+		}
+		$expire += time();
+
+		$cacheFile = $this->getCacheFile($key);
+		if ($this->directoryLevel > 0) {
+			@mkdir(dirname($cacheFile), 0777, true);
+		}
+		if (@file_put_contents($cacheFile, $value, LOCK_EX) !== false) {
+			@chmod($cacheFile, 0777);
+			return @touch($cacheFile, $expire);
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Stores a value identified by a key into cache if the cache does not contain this key.
+	 * This is the implementation of the method declared in the parent class.
+	 *
+	 * @param string $key the key identifying the value to be cached
+	 * @param string $value the value to be cached
+	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
+	 * @return boolean true if the value is successfully stored into cache, false otherwise
+	 */
+	protected function addValue($key, $value, $expire)
+	{
+		$cacheFile = $this->getCacheFile($key);
+		if (@filemtime($cacheFile) > time()) {
+			return false;
+		}
+		return $this->setValue($key, $value, $expire);
+	}
+
+	/**
+	 * Deletes a value with the specified key from cache
+	 * This is the implementation of the method declared in the parent class.
+	 * @param string $key the key of the value to be deleted
+	 * @return boolean if no error happens during deletion
+	 */
+	protected function deleteValue($key)
+	{
+		$cacheFile = $this->getCacheFile($key);
+		return @unlink($cacheFile);
+	}
+
+	/**
+	 * Returns the cache file path given the cache key.
+	 * @param string $key cache key
+	 * @return string the cache file path
+	 */
+	protected function getCacheFile($key)
+	{
+		if ($this->directoryLevel > 0) {
+			$base = $this->cachePath;
+			for ($i = 0; $i < $this->directoryLevel; ++$i) {
+				if (($prefix = substr($key, $i + $i, 2)) !== false) {
+					$base .= DIRECTORY_SEPARATOR . $prefix;
+				}
+			}
+			return $base . DIRECTORY_SEPARATOR . $key . $this->cacheFileSuffix;
+		} else {
+			return $this->cachePath . DIRECTORY_SEPARATOR . $key . $this->cacheFileSuffix;
+		}
+	}
+
+	/**
+	 * Deletes all values from cache.
+	 * This is the implementation of the method declared in the parent class.
+	 * @return boolean whether the flush operation was successful.
+	 */
+	protected function flushValues()
+	{
+		$this->gc(true, false);
+		return true;
+	}
+
+	/**
+	 * Removes expired cache files.
+	 * @param boolean $force whether to enforce the garbage collection regardless of [[gcProbability]].
+	 * Defaults to false, meaning the actual deletion happens with the probability as specified by [[gcProbability]].
+	 * @param boolean $expiredOnly whether to removed expired cache files only.
+	 * If true, all cache files under [[cachePath]] will be removed.
+	 */
+	public function gc($force = false, $expiredOnly = true)
+	{
+		if ($force || mt_rand(0, 1000000) < $this->gcProbability) {
+			$this->gcRecursive($this->cachePath, $expiredOnly);
+		}
+	}
+
+	/**
+	 * Recursively removing expired cache files under a directory.
+	 * This method is mainly used by [[gc()]].
+	 * @param string $path the directory under which expired cache files are removed.
+	 * @param boolean $expiredOnly whether to only remove expired cache files. If false, all files
+	 * under `$path` will be removed.
+	 */
+	protected function gcRecursive($path, $expiredOnly)
+	{
+		if (($handle = opendir($path)) !== false) {
+			while (($file = readdir($handle)) !== false) {
+				if ($file[0] === '.') {
+					continue;
+				}
+				$fullPath = $path . DIRECTORY_SEPARATOR . $file;
+				if (is_dir($fullPath)) {
+					$this->gcRecursive($fullPath, $expiredOnly);
+					if (!$expiredOnly) {
+						@rmdir($fullPath);
+					}
+				} elseif (!$expiredOnly || $expiredOnly && @filemtime($fullPath) < time()) {
+					@unlink($fullPath);
+				}
+			}
+			closedir($handle);
+		}
+	}
+}
diff --git a/yii/caching/FileDependency.php b/yii/caching/FileDependency.php
new file mode 100644
index 0000000..3797dde
--- /dev/null
+++ b/yii/caching/FileDependency.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\caching;
+
+/**
+ * FileDependency represents a dependency based on a file's last modification time.
+ *
+ * If th last modification time of the file specified via [[fileName]] is changed,
+ * the dependency is considered as changed.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class FileDependency extends Dependency
+{
+	/**
+	 * @var string the name of the file whose last modification time is used to
+	 * check if the dependency has been changed.
+	 */
+	public $fileName;
+
+	/**
+	 * Constructor.
+	 * @param string $fileName name of the file whose change is to be checked.
+	 * @param array $config name-value pairs that will be used to initialize the object properties
+	 */
+	public function __construct($fileName = null, $config = array())
+	{
+		$this->fileName = $fileName;
+		parent::__construct($config);
+	}
+
+	/**
+	 * Generates the data needed to determine if dependency has been changed.
+	 * This method returns the file's last modification time.
+	 * @return mixed the data needed to determine if dependency has been changed.
+	 */
+	protected function generateDependencyData()
+	{
+		return @filemtime($this->fileName);
+	}
+}
diff --git a/yii/caching/MemCache.php b/yii/caching/MemCache.php
new file mode 100644
index 0000000..20aff21
--- /dev/null
+++ b/yii/caching/MemCache.php
@@ -0,0 +1,225 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\caching;
+
+use yii\base\Exception;
+use yii\base\InvalidConfigException;
+
+/**
+ * MemCache implements a cache application component based on [memcache](http://pecl.php.net/package/memcache)
+ * and [memcached](http://pecl.php.net/package/memcached).
+ *
+ * MemCache supports both [memcache](http://pecl.php.net/package/memcache) and
+ * [memcached](http://pecl.php.net/package/memcached). By setting [[useMemcached]] to be true or false,
+ * one can let MemCache to use either memcached or memcache, respectively.
+ *
+ * MemCache can be configured with a list of memcache servers by settings its [[servers]] property.
+ * By default, MemCache assumes there is a memcache server running on localhost at port 11211.
+ *
+ * See [[Cache]] for common cache operations that ApcCache supports.
+ *
+ * Note, there is no security measure to protected data in memcache.
+ * All data in memcache can be accessed by any process running in the system.
+ *
+ * To use MemCache as the cache application component, configure the application as follows,
+ *
+ * ~~~
+ * array(
+ *     'components'=>array(
+ *         'cache'=>array(
+ *             'class'=>'MemCache',
+ *             'servers'=>array(
+ *                 array(
+ *                     'host'=>'server1',
+ *                     'port'=>11211,
+ *                     'weight'=>60,
+ *                 ),
+ *                 array(
+ *                     'host'=>'server2',
+ *                     'port'=>11211,
+ *                     'weight'=>40,
+ *                 ),
+ *             ),
+ *         ),
+ *     ),
+ * )
+ * ~~~
+ *
+ * In the above, two memcache servers are used: server1 and server2. You can configure more properties of
+ * each server, such as `persistent`, `weight`, `timeout`. Please see [[MemCacheServer]] for available options.
+ *
+ * @property \Memcache|\Memcached $memCache The memcache instance (or memcached if [[useMemcached]] is true) used by this component.
+ * @property MemCacheServer[] $servers List of memcache server configurations.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class MemCache extends Cache
+{
+	/**
+	 * @var boolean whether to use memcached or memcache as the underlying caching extension.
+	 * If true, [memcached](http://pecl.php.net/package/memcached) will be used.
+	 * If false, [memcache](http://pecl.php.net/package/memcache) will be used.
+	 * Defaults to false.
+	 */
+	public $useMemcached = false;
+	/**
+	 * @var \Memcache|\Memcached the Memcache instance
+	 */
+	private $_cache = null;
+	/**
+	 * @var array list of memcache server configurations
+	 */
+	private $_servers = array();
+
+	/**
+	 * Initializes this application component.
+	 * It creates the memcache instance and adds memcache servers.
+	 */
+	public function init()
+	{
+		parent::init();
+		$servers = $this->getServers();
+		$cache = $this->getMemCache();
+		if (count($servers)) {
+			foreach ($servers as $server) {
+				if ($server->host === null) {
+					throw new Exception("The 'host' property must be specified for every memcache server.");
+				}
+				if ($this->useMemcached) {
+					$cache->addServer($server->host, $server->port, $server->weight);
+				} else {
+					$cache->addServer($server->host, $server->port, $server->persistent,
+						$server->weight, $server->timeout, $server->retryInterval, $server->status);
+				}
+			}
+		} else {
+			$cache->addServer('127.0.0.1', 11211);
+		}
+	}
+
+	/**
+	 * Returns the underlying memcache (or memcached) object.
+	 * @return \Memcache|\Memcached the memcache (or memcached) object used by this cache component.
+	 * @throws InvalidConfigException if memcache or memcached extension is not loaded
+	 */
+	public function getMemcache()
+	{
+		if ($this->_cache === null) {
+			$extension = $this->useMemcached ? 'memcached' : 'memcache';
+			if (!extension_loaded($extension)) {
+				throw new InvalidConfigException("MemCache requires PHP $extension extension to be loaded.");
+			}
+			$this->_cache = $this->useMemcached ? new \Memcached : new \Memcache;
+		}
+		return $this->_cache;
+	}
+
+	/**
+	 * Returns the memcache server configurations.
+	 * @return MemCacheServer[] list of memcache server configurations.
+	 */
+	public function getServers()
+	{
+		return $this->_servers;
+	}
+
+	/**
+	 * @param array $config list of memcache server configurations. Each element must be an array
+	 * with the following keys: host, port, persistent, weight, timeout, retryInterval, status.
+	 * @see http://www.php.net/manual/en/function.Memcache-addServer.php
+	 */
+	public function setServers($config)
+	{
+		foreach ($config as $c) {
+			$this->_servers[] = new MemCacheServer($c);
+		}
+	}
+
+	/**
+	 * Retrieves a value from cache with a specified key.
+	 * This is the implementation of the method declared in the parent class.
+	 * @param string $key a unique key identifying the cached value
+	 * @return string the value stored in cache, false if the value is not in the cache or expired.
+	 */
+	protected function getValue($key)
+	{
+		return $this->_cache->get($key);
+	}
+
+	/**
+	 * Retrieves multiple values from cache with the specified keys.
+	 * @param array $keys a list of keys identifying the cached values
+	 * @return array a list of cached values indexed by the keys
+	 */
+	protected function getValues($keys)
+	{
+		return $this->useMemcached ? $this->_cache->getMulti($keys) : $this->_cache->get($keys);
+	}
+
+	/**
+	 * Stores a value identified by a key in cache.
+	 * This is the implementation of the method declared in the parent class.
+	 *
+	 * @param string $key the key identifying the value to be cached
+	 * @param string $value the value to be cached
+	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
+	 * @return boolean true if the value is successfully stored into cache, false otherwise
+	 */
+	protected function setValue($key, $value, $expire)
+	{
+		if ($expire > 0) {
+			$expire += time();
+		} else {
+			$expire = 0;
+		}
+
+		return $this->useMemcached ? $this->_cache->set($key, $value, $expire) : $this->_cache->set($key, $value, 0, $expire);
+	}
+
+	/**
+	 * Stores a value identified by a key into cache if the cache does not contain this key.
+	 * This is the implementation of the method declared in the parent class.
+	 *
+	 * @param string $key the key identifying the value to be cached
+	 * @param string $value the value to be cached
+	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
+	 * @return boolean true if the value is successfully stored into cache, false otherwise
+	 */
+	protected function addValue($key, $value, $expire)
+	{
+		if ($expire > 0) {
+			$expire += time();
+		} else {
+			$expire = 0;
+		}
+
+		return $this->useMemcached ? $this->_cache->add($key, $value, $expire) : $this->_cache->add($key, $value, 0, $expire);
+	}
+
+	/**
+	 * Deletes a value with the specified key from cache
+	 * This is the implementation of the method declared in the parent class.
+	 * @param string $key the key of the value to be deleted
+	 * @return boolean if no error happens during deletion
+	 */
+	protected function deleteValue($key)
+	{
+		return $this->_cache->delete($key, 0);
+	}
+
+	/**
+	 * Deletes all values from cache.
+	 * This is the implementation of the method declared in the parent class.
+	 * @return boolean whether the flush operation was successful.
+	 */
+	protected function flushValues()
+	{
+		return $this->_cache->flush();
+	}
+}
diff --git a/yii/caching/MemCacheServer.php b/yii/caching/MemCacheServer.php
new file mode 100644
index 0000000..dc0de08
--- /dev/null
+++ b/yii/caching/MemCacheServer.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\caching;
+
+/**
+ * MemCacheServer represents the configuration data for a single memcache or memcached server.
+ *
+ * See [PHP manual](http://www.php.net/manual/en/function.Memcache-addServer.php) for detailed explanation
+ * of each configuration property.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class MemCacheServer extends \yii\base\Object
+{
+	/**
+	 * @var string memcache server hostname or IP address
+	 */
+	public $host;
+	/**
+	 * @var integer memcache server port
+	 */
+	public $port = 11211;
+	/**
+	 * @var integer probability of using this server among all servers.
+	 */
+	public $weight = 1;
+	/**
+	 * @var boolean whether to use a persistent connection. This is used by memcache only.
+	 */
+	public $persistent = true;
+	/**
+	 * @var integer value in seconds which will be used for connecting to the server. This is used by memcache only.
+	 */
+	public $timeout = 15;
+	/**
+	 * @var integer how often a failed server will be retried (in seconds). This is used by memcache only.
+	 */
+	public $retryInterval = 15;
+	/**
+	 * @var boolean if the server should be flagged as online upon a failure. This is used by memcache only.
+	 */
+	public $status = true;
+}
diff --git a/yii/caching/WinCache.php b/yii/caching/WinCache.php
new file mode 100644
index 0000000..4e07c7f
--- /dev/null
+++ b/yii/caching/WinCache.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\caching;
+
+/**
+ * WinCache provides XCache caching in terms of an application component.
+ *
+ * To use this application component, the [WinCache PHP extension](http://www.iis.net/expand/wincacheforphp)
+ * must be loaded. Also note that "wincache.ucenabled" should be set to "On" in your php.ini file.
+ *
+ * See {@link CCache} manual for common cache operations that are supported by WinCache.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class WinCache extends Cache
+{
+	/**
+	 * Retrieves a value from cache with a specified key.
+	 * This is the implementation of the method declared in the parent class.
+	 * @param string $key a unique key identifying the cached value
+	 * @return string the value stored in cache, false if the value is not in the cache or expired.
+	 */
+	protected function getValue($key)
+	{
+		return wincache_ucache_get($key);
+	}
+
+	/**
+	 * Retrieves multiple values from cache with the specified keys.
+	 * @param array $keys a list of keys identifying the cached values
+	 * @return array a list of cached values indexed by the keys
+	 */
+	protected function getValues($keys)
+	{
+		return wincache_ucache_get($keys);
+	}
+
+	/**
+	 * Stores a value identified by a key in cache.
+	 * This is the implementation of the method declared in the parent class.
+	 *
+	 * @param string $key the key identifying the value to be cached
+	 * @param string $value the value to be cached
+	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
+	 * @return boolean true if the value is successfully stored into cache, false otherwise
+	 */
+	protected function setValue($key, $value, $expire)
+	{
+		return wincache_ucache_set($key, $value, $expire);
+	}
+
+	/**
+	 * Stores a value identified by a key into cache if the cache does not contain this key.
+	 * This is the implementation of the method declared in the parent class.
+	 *
+	 * @param string $key the key identifying the value to be cached
+	 * @param string $value the value to be cached
+	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
+	 * @return boolean true if the value is successfully stored into cache, false otherwise
+	 */
+	protected function addValue($key, $value, $expire)
+	{
+		return wincache_ucache_add($key, $value, $expire);
+	}
+
+	/**
+	 * Deletes a value with the specified key from cache
+	 * This is the implementation of the method declared in the parent class.
+	 * @param string $key the key of the value to be deleted
+	 * @return boolean if no error happens during deletion
+	 */
+	protected function deleteValue($key)
+	{
+		return wincache_ucache_delete($key);
+	}
+
+	/**
+	 * Deletes all values from cache.
+	 * This is the implementation of the method declared in the parent class.
+	 * @return boolean whether the flush operation was successful.
+	 */
+	protected function flushValues()
+	{
+		return wincache_ucache_clear();
+	}
+}
diff --git a/yii/caching/XCache.php b/yii/caching/XCache.php
new file mode 100644
index 0000000..2108c4f
--- /dev/null
+++ b/yii/caching/XCache.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\caching;
+
+/**
+ * XCache provides XCache caching in terms of an application component.
+ *
+ * To use this application component, the [XCache PHP extension](http://xcache.lighttpd.net/) must be loaded.
+ * Also note that the [[flush()]] functionality will work correctly only if "xcache.admin.enable_auth"
+ * is set to "Off" in php.ini.
+ *
+ * See [[Cache]] for common cache operations that XCache supports.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class XCache extends Cache
+{
+	/**
+	 * Retrieves a value from cache with a specified key.
+	 * This is the implementation of the method declared in the parent class.
+	 * @param string $key a unique key identifying the cached value
+	 * @return string the value stored in cache, false if the value is not in the cache or expired.
+	 */
+	protected function getValue($key)
+	{
+		return xcache_isset($key) ? xcache_get($key) : false;
+	}
+
+	/**
+	 * Stores a value identified by a key in cache.
+	 * This is the implementation of the method declared in the parent class.
+	 *
+	 * @param string $key the key identifying the value to be cached
+	 * @param string $value the value to be cached
+	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
+	 * @return boolean true if the value is successfully stored into cache, false otherwise
+	 */
+	protected function setValue($key, $value, $expire)
+	{
+		return xcache_set($key, $value, $expire);
+	}
+
+	/**
+	 * Stores a value identified by a key into cache if the cache does not contain this key.
+	 * This is the implementation of the method declared in the parent class.
+	 *
+	 * @param string $key the key identifying the value to be cached
+	 * @param string $value the value to be cached
+	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
+	 * @return boolean true if the value is successfully stored into cache, false otherwise
+	 */
+	protected function addValue($key, $value, $expire)
+	{
+		return !xcache_isset($key) ? $this->setValue($key, $value, $expire) : false;
+	}
+
+	/**
+	 * Deletes a value with the specified key from cache
+	 * This is the implementation of the method declared in the parent class.
+	 * @param string $key the key of the value to be deleted
+	 * @return boolean if no error happens during deletion
+	 */
+	protected function deleteValue($key)
+	{
+		return xcache_unset($key);
+	}
+
+	/**
+	 * Deletes all values from cache.
+	 * This is the implementation of the method declared in the parent class.
+	 * @return boolean whether the flush operation was successful.
+	 */
+	protected function flushValues()
+	{
+		for ($i = 0, $max = xcache_count(XC_TYPE_VAR); $i < $max; $i++) {
+			if (xcache_clear_cache(XC_TYPE_VAR, $i) === false) {
+				return false;
+			}
+		}
+		return true;
+	}
+}
+
diff --git a/yii/caching/ZendDataCache.php b/yii/caching/ZendDataCache.php
new file mode 100644
index 0000000..5b41a8d
--- /dev/null
+++ b/yii/caching/ZendDataCache.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\caching;
+
+/**
+ * ZendDataCache provides Zend data caching in terms of an application component.
+ *
+ * To use this application component, the [Zend Data Cache PHP extension](http://www.zend.com/en/products/server/)
+ * must be loaded.
+ *
+ * See [[Cache]] for common cache operations that ZendDataCache supports.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class ZendDataCache extends Cache
+{
+	/**
+	 * Retrieves a value from cache with a specified key.
+	 * This is the implementation of the method declared in the parent class.
+	 * @param string $key a unique key identifying the cached value
+	 * @return string the value stored in cache, false if the value is not in the cache or expired.
+	 */
+	protected function getValue($key)
+	{
+		$result = zend_shm_cache_fetch($key);
+		return $result === null ? false : $result;
+	}
+
+	/**
+	 * Stores a value identified by a key in cache.
+	 * This is the implementation of the method declared in the parent class.
+	 *
+	 * @param string $key the key identifying the value to be cached
+	 * @param string $value the value to be cached
+	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
+	 * @return boolean true if the value is successfully stored into cache, false otherwise
+	 */
+	protected function setValue($key, $value, $expire)
+	{
+		return zend_shm_cache_store($key, $value, $expire);
+	}
+
+	/**
+	 * Stores a value identified by a key into cache if the cache does not contain this key.
+	 * This is the implementation of the method declared in the parent class.
+	 *
+	 * @param string $key the key identifying the value to be cached
+	 * @param string $value the value to be cached
+	 * @param integer $expire the number of seconds in which the cached value will expire. 0 means never expire.
+	 * @return boolean true if the value is successfully stored into cache, false otherwise
+	 */
+	protected function addValue($key, $value, $expire)
+	{
+		return zend_shm_cache_fetch($key) === null ? $this->setValue($key, $value, $expire) : false;
+	}
+
+	/**
+	 * Deletes a value with the specified key from cache
+	 * This is the implementation of the method declared in the parent class.
+	 * @param string $key the key of the value to be deleted
+	 * @return boolean if no error happens during deletion
+	 */
+	protected function deleteValue($key)
+	{
+		return zend_shm_cache_delete($key);
+	}
+
+	/**
+	 * Deletes all values from cache.
+	 * This is the implementation of the method declared in the parent class.
+	 * @return boolean whether the flush operation was successful.
+	 */
+	protected function flushValues()
+	{
+		return zend_shm_cache_clear();
+	}
+}
diff --git a/yii/console/Application.php b/yii/console/Application.php
new file mode 100644
index 0000000..2f28cac
--- /dev/null
+++ b/yii/console/Application.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ * Console Application class file.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\console;
+
+use yii\base\InvalidRouteException;
+
+/**
+ * Application represents a console application.
+ *
+ * Application extends from [[yii\base\Application]] by providing functionalities that are
+ * specific to console requests. In particular, it deals with console requests
+ * through a command-based approach:
+ *
+ * - A console application consists of one or several possible user commands;
+ * - Each user command is implemented as a class extending [[\yii\console\Controller]];
+ * - User specifies which command to run on the command line;
+ * - The command processes the user request with the specified parameters.
+ *
+ * The command classes reside in the directory specified by [[controllerPath]].
+ * Their naming should follow the same naming convention as controllers. For example, the `help` command
+ * is implemented using the `HelpController` class.
+ *
+ * To run the console application, enter the following on the command line:
+ *
+ * ~~~
+ * yiic <route> [--param1=value1 --param2 ...]
+ * ~~~
+ *
+ * where `<route>` refers to a controller route in the form of `ModuleID/ControllerID/ActionID`
+ * (e.g. `sitemap/create`), and `param1`, `param2` refers to a set of named parameters that
+ * will be used to initialize the controller action (e.g. `--since=0` specifies a `since` parameter
+ * whose value is 0 and a corresponding `$since` parameter is passed to the action method).
+ *
+ * A `help` command is provided by default, which lists available commands and shows their usage.
+ * To use this command, simply type:
+ *
+ * ~~~
+ * yiic help
+ * ~~~
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Application extends \yii\base\Application
+{
+	/**
+	 * @var string the default route of this application. Defaults to 'help',
+	 * meaning the `help` command.
+	 */
+	public $defaultRoute = 'help';
+	/**
+	 * @var boolean whether to enable the commands provided by the core framework.
+	 * Defaults to true.
+	 */
+	public $enableCoreCommands = true;
+
+	/**
+	 * Initialize the application.
+	 */
+	public function init()
+	{
+		parent::init();
+		if ($this->enableCoreCommands) {
+			foreach ($this->coreCommands() as $id => $command) {
+				if (!isset($this->controllerMap[$id])) {
+					$this->controllerMap[$id] = $command;
+				}
+			}
+		}
+		// ensure we have the 'help' command so that we can list the available commands
+		if (!isset($this->controllerMap['help'])) {
+			$this->controllerMap['help'] = 'yii\console\controllers\HelpController';
+		}
+	}
+
+	/**
+	 * Processes the request.
+	 * The request is represented in terms of a controller route and action parameters.
+	 * @return integer the exit status of the controller action (0 means normal, non-zero values mean abnormal)
+	 * @throws Exception if the script is not running from the command line
+	 */
+	public function processRequest()
+	{
+		/** @var $request Request */
+		$request = $this->getRequest();
+		if ($request->getIsConsoleRequest()) {
+			list ($route, $params) = $request->resolve();
+			return $this->runAction($route, $params);
+		} else {
+			throw new Exception(\Yii::t('yii|This script must be run from the command line.'));
+		}
+	}
+
+	/**
+	 * Runs a controller action specified by a route.
+	 * This method parses the specified route and creates the corresponding child module(s), controller and action
+	 * instances. It then calls [[Controller::runAction()]] to run the action with the given parameters.
+	 * If the route is empty, the method will use [[defaultRoute]].
+	 * @param string $route the route that specifies the action.
+	 * @param array $params the parameters to be passed to the action
+	 * @return integer the status code returned by the action execution. 0 means normal, and other values mean abnormal.
+	 * @throws Exception if the route is invalid
+	 */
+	public function runAction($route, $params = array())
+	{
+		try {
+			return parent::runAction($route, $params);
+		} catch (InvalidRouteException $e) {
+			throw new Exception(\Yii::t('yii|Unknown command "{command}".', array('{command}' => $route)));
+		}
+	}
+
+	/**
+	 * Returns the configuration of the built-in commands.
+	 * @return array the configuration of the built-in commands.
+	 */
+	public function coreCommands()
+	{
+		return array(
+			'message' => 'yii\console\controllers\MessageController',
+			'help' => 'yii\console\controllers\HelpController',
+			'migrate' => 'yii\console\controllers\MigrateController',
+			'app' => 'yii\console\controllers\AppController',
+			'cache' => 'yii\console\controllers\CacheController',
+			'asset' => 'yii\console\controllers\AssetController',
+		);
+	}
+
+	/**
+	 * Registers the core application components.
+	 * @see setComponents
+	 */
+	public function registerCoreComponents()
+	{
+		parent::registerCoreComponents();
+		$this->setComponents(array(
+			'request' => array(
+				'class' => 'yii\console\Request',
+			),
+			'response' => array(
+				'class' => 'yii\console\Response',
+			),
+		));
+	}
+}
diff --git a/yii/console/Controller.php b/yii/console/Controller.php
new file mode 100644
index 0000000..c07d92d
--- /dev/null
+++ b/yii/console/Controller.php
@@ -0,0 +1,264 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\console;
+
+use Yii;
+use yii\base\Action;
+use yii\base\InlineAction;
+use yii\base\InvalidRouteException;
+use yii\helpers\Console;
+
+/**
+ * Controller is the base class of console command classes.
+ *
+ * A controller consists of one or several actions known as sub-commands.
+ * Users call a console command by specifying the corresponding route which identifies a controller action.
+ * The `yiic` program is used when calling a console command, like the following:
+ *
+ * ~~~
+ * yiic <route> [--param1=value1 --param2 ...]
+ * ~~~
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Controller extends \yii\base\Controller
+{
+	/**
+	 * @var boolean whether the call of [[confirm()]] requires a user input.
+	 * If false, [[confirm()]] will always return true no matter what user enters or not.
+	 */
+	public $interactive = true;
+
+	/**
+	 * @var bool whether to enable ANSI style in output.
+	 * Setting this will affect [[ansiFormat()]], [[stdout()]] and [[stderr()]].
+	 * If not set it will be auto detected using [[yii\helpers\Console::streamSupportsAnsiColors()]] with STDOUT
+	 * for [[ansiFormat()]] and [[stdout()]] and STDERR for [[stderr()]].
+	 */
+	public $colors;
+
+	/**
+	 * Runs an action with the specified action ID and parameters.
+	 * If the action ID is empty, the method will use [[defaultAction]].
+	 * @param string $id the ID of the action to be executed.
+	 * @param array $params the parameters (name-value pairs) to be passed to the action.
+	 * @return integer the status of the action execution. 0 means normal, other values mean abnormal.
+	 * @throws InvalidRouteException if the requested action ID cannot be resolved into an action successfully.
+	 * @see createAction
+	 */
+	public function runAction($id, $params = array())
+	{
+		if (!empty($params)) {
+			$options = $this->globalOptions();
+			foreach ($params as $name => $value) {
+				if (in_array($name, $options, true)) {
+					$this->$name = $value;
+					unset($params[$name]);
+				}
+			}
+		}
+		return parent::runAction($id, $params);
+	}
+
+	/**
+	 * Binds the parameters to the action.
+	 * This method is invoked by [[Action]] when it begins to run with the given parameters.
+	 * This method will first bind the parameters with the [[globalOptions()|global options]]
+	 * available to the action. It then validates the given arguments.
+	 * @param Action $action the action to be bound with parameters
+	 * @param array $params the parameters to be bound to the action
+	 * @return array the valid parameters that the action can run with.
+	 * @throws Exception if there are unknown options or missing arguments
+	 */
+	public function bindActionParams($action, $params)
+	{
+		if (!empty($params)) {
+			$options = $this->globalOptions();
+			foreach ($params as $name => $value) {
+				if (in_array($name, $options, true)) {
+					$this->$name = $value;
+					unset($params[$name]);
+				}
+			}
+		}
+
+		$args = isset($params[Request::ANONYMOUS_PARAMS]) ? $params[Request::ANONYMOUS_PARAMS] : array();
+		unset($params[Request::ANONYMOUS_PARAMS]);
+		if (!empty($params)) {
+			throw new Exception(Yii::t('yii|Unknown options: {params}', array(
+				'{params}' => implode(', ', array_keys($params)),
+			)));
+		}
+
+		if ($action instanceof InlineAction) {
+			$method = new \ReflectionMethod($this, $action->actionMethod);
+		} else {
+			$method = new \ReflectionMethod($action, 'run');
+		}
+
+		$missing = array();
+		foreach ($method->getParameters() as $i => $param) {
+			$name = $param->getName();
+			if (!isset($args[$i])) {
+				if ($param->isDefaultValueAvailable()) {
+					$args[$i] = $param->getDefaultValue();
+				} else {
+					$missing[] = $name;
+				}
+			}
+		}
+
+		if (!empty($missing)) {
+			throw new Exception(Yii::t('yii|Missing required arguments: {params}', array(
+				'{params}' => implode(', ', $missing),
+			)));
+		}
+
+		return $args;
+	}
+
+	/**
+	 * Formats a string with ANSI codes
+	 *
+	 * You may pass additional parameters using the constants defined in [[yii\helpers\base\Console]].
+	 *
+	 * Example:
+	 * ~~~
+	 * $this->ansiFormat('This will be red and underlined.', Console::FG_RED, Console::UNDERLINE);
+	 * ~~~
+	 *
+	 * @param string $string the string to be formatted
+	 * @return string
+	 */
+	public function ansiFormat($string)
+	{
+		if ($this->ansi === true || $this->ansi === null && Console::streamSupportsAnsiColors(STDOUT)) {
+			$args = func_get_args();
+			array_shift($args);
+			$string = Console::ansiFormat($string, $args);
+		}
+		return $string;
+	}
+
+	/**
+	 * Prints a string to STDOUT
+	 *
+	 * You may optionally format the string with ANSI codes by
+	 * passing additional parameters using the constants defined in [[yii\helpers\base\Console]].
+	 *
+	 * Example:
+	 * ~~~
+	 * $this->stdout('This will be red and underlined.', Console::FG_RED, Console::UNDERLINE);
+	 * ~~~
+	 *
+	 * @param string $string the string to print
+	 * @return int|boolean Number of bytes printed or false on error
+	 */
+	public function stdout($string)
+	{
+		if ($this->ansi === true || $this->ansi === null && Console::streamSupportsAnsiColors(STDOUT)) {
+			$args = func_get_args();
+			array_shift($args);
+			$string = Console::ansiFormat($string, $args);
+		}
+		return Console::stdout($string);
+	}
+
+	/**
+	 * Prints a string to STDERR
+	 *
+	 * You may optionally format the string with ANSI codes by
+	 * passing additional parameters using the constants defined in [[yii\helpers\base\Console]].
+	 *
+	 * Example:
+	 * ~~~
+	 * $this->stderr('This will be red and underlined.', Console::FG_RED, Console::UNDERLINE);
+	 * ~~~
+	 *
+	 * @param string $string the string to print
+	 * @return int|boolean Number of bytes printed or false on error
+	 */
+	public function stderr($string)
+	{
+		if ($this->ansi === true || $this->ansi === null && Console::streamSupportsAnsiColors(STDERR)) {
+			$args = func_get_args();
+			array_shift($args);
+			$string = Console::ansiFormat($string, $args);
+		}
+		return fwrite(STDERR, $string);
+	}
+
+	/**
+	 * Prompts the user for input and validates it
+	 *
+	 * @param string $text prompt string
+	 * @param array $options the options to validate the input:
+	 *  - required: whether it is required or not
+	 *  - default: default value if no input is inserted by the user
+	 *  - pattern: regular expression pattern to validate user input
+	 *  - validator: a callable function to validate input. The function must accept two parameters:
+	 *      - $input: the user input to validate
+	 *      - $error: the error value passed by reference if validation failed.
+	 * @return string the user input
+	 */
+	public function prompt($text, $options = array())
+	{
+		if ($this->interactive) {
+			return Console::prompt($text, $options);
+		} else {
+			return isset($options['default']) ? $options['default'] : '';
+		}
+	}
+
+	/**
+	 * Asks user to confirm by typing y or n.
+	 *
+	 * @param string $message to echo out before waiting for user input
+	 * @param boolean $default this value is returned if no selection is made.
+	 * @return boolean whether user confirmed
+	 */
+	public function confirm($message, $default = false)
+	{
+		if ($this->interactive) {
+			return Console::confirm($message, $default);
+		} else {
+			return true;
+		}
+	}
+
+	/**
+	 * Gives the user an option to choose from. Giving '?' as an input will show
+	 * a list of options to choose from and their explanations.
+	 *
+	 * @param string $prompt the prompt message
+	 * @param array  $options Key-value array of options to choose from
+	 *
+	 * @return string An option character the user chose
+	 */
+	public function select($prompt, $options = array())
+	{
+		return Console::select($prompt, $options);
+	}
+
+	/**
+	 * Returns the names of the global options for this command.
+	 * A global option requires the existence of a public member variable whose
+	 * name is the option name.
+	 * Child classes may override this method to specify possible global options.
+	 *
+	 * Note that the values setting via global options are not available
+	 * until [[beforeAction()]] is being called.
+	 *
+	 * @return array the names of the global options for this command.
+	 */
+	public function globalOptions()
+	{
+		return array();
+	}
+}
diff --git a/yii/console/Exception.php b/yii/console/Exception.php
new file mode 100644
index 0000000..cb10c19
--- /dev/null
+++ b/yii/console/Exception.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\console;
+
+use yii\base\UserException;
+
+/**
+ * Exception represents an exception caused by incorrect usage of a console command.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Exception extends UserException
+{
+	/**
+	 * @return string the user-friendly name of this exception
+	 */
+	public function getName()
+	{
+		return \Yii::t('yii|Error');
+	}
+}
+
diff --git a/yii/console/Request.php b/yii/console/Request.php
new file mode 100644
index 0000000..ed477e9
--- /dev/null
+++ b/yii/console/Request.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\console;
+
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Request extends \yii\base\Request
+{
+	const ANONYMOUS_PARAMS = '-args';
+
+	public function getRawParams()
+	{
+		return isset($_SERVER['argv']) ? $_SERVER['argv'] : array();
+	}
+
+	/**
+	 * Resolves the current request into a route and the associated parameters.
+	 * @return array the first element is the route, and the second is the associated parameters.
+	 */
+	public function resolve()
+	{
+		$rawParams = $this->getRawParams();
+		array_shift($rawParams);  // the 1st argument is the yiic script name
+
+		if (isset($rawParams[0])) {
+			$route = $rawParams[0];
+			array_shift($rawParams);
+		} else {
+			$route = '';
+		}
+
+		$params = array(self::ANONYMOUS_PARAMS => array());
+		foreach ($rawParams as $param) {
+			if (preg_match('/^--(\w+)(=(.*))?$/', $param, $matches)) {
+				$name = $matches[1];
+				$params[$name] = isset($matches[3]) ? $matches[3] : true;
+			} else {
+				$params[self::ANONYMOUS_PARAMS][] = $param;
+			}
+		}
+
+		return array($route, $params);
+	}
+}
diff --git a/yii/console/controllers/AppController.php b/yii/console/controllers/AppController.php
new file mode 100644
index 0000000..17f7420
--- /dev/null
+++ b/yii/console/controllers/AppController.php
@@ -0,0 +1,324 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\console\controllers;
+
+use yii\console\Controller;
+use yii\helpers\FileHelper;
+use yii\base\Exception;
+
+/**
+ * This command creates an Yii Web application at the specified location.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Alexander Makarov <sam@rmcreative.ru>
+ * @since 2.0
+ */
+class AppController extends Controller
+{
+	private $_rootPath;
+	private $_config;
+
+	/**
+	 * @var string custom template path. If specified, templates will be
+	 * searched there additionally to `framework/console/webapp`.
+	 */
+	public $templatesPath;
+
+	/**
+	 * @var string application type. If not specified default application
+	 * skeleton will be used.
+	 */
+	public $type = 'default';
+
+	public function init()
+	{
+		parent::init();
+
+		if($this->templatesPath && !is_dir($this->templatesPath)) {
+			throw new Exception('--templatesPath "'.$this->templatesPath.'" does not exist or can not be read.');
+		}
+	}
+
+	public function globalOptions()
+	{
+		return array('templatesPath', 'type');
+	}
+
+	public function actionIndex()
+	{
+		$this->forward('help/index', array('-args' => array('app/create')));
+	}
+
+	/**
+	 * Generates Yii application at the path specified via appPath parameter.
+	 *
+	 * @param string $path the directory where the new application will be created.
+	 * If the directory does not exist, it will be created. After the application
+	 * is created, please make sure the directory has enough permissions.
+	 *
+	 * @throws \yii\base\Exception if path specified is not valid
+	 * @return integer the exit status
+	 */
+	public function actionCreate($path)
+	{
+		$path = strtr($path, '/\\', DIRECTORY_SEPARATOR);
+		if(strpos($path, DIRECTORY_SEPARATOR) === false) {
+			$path = '.'.DIRECTORY_SEPARATOR.$path;
+		}
+		$dir = rtrim(realpath(dirname($path)), '\\/');
+		if($dir === false || !is_dir($dir)) {
+			throw new Exception("The directory '$path' is not valid. Please make sure the parent directory exists.");
+		}
+
+		if(basename($path) === '.') {
+			$this->_rootPath = $path = $dir;
+		}
+		else {
+			$this->_rootPath = $path = $dir.DIRECTORY_SEPARATOR.basename($path);
+		}
+
+		if($this->confirm("Create \"$this->type\" application under '$path'?")) {
+			$sourceDir = $this->getSourceDir();
+			$config = $this->getConfig();
+
+			$list = $this->buildFileList($sourceDir, $path);
+
+			if(is_array($config)) {
+				foreach($config as $file => $settings) {
+					if(isset($settings['handler'])) {
+						$list[$file]['callback'] = $settings['handler'];
+					}
+				}
+			}
+
+			$this->copyFiles($list);
+
+			if(is_array($config)) {
+				foreach($config as $file => $settings) {
+					if(isset($settings['permissions'])) {
+						@chmod($path.'/'.$file, $settings['permissions']);
+					}
+				}
+			}
+
+			echo "\nYour application has been created successfully under {$path}.\n";
+		}
+	}
+
+	/**
+	 * @throws \yii\base\Exception if source directory wasn't located
+	 * @return string
+	 */
+	protected function getSourceDir()
+	{
+		$customSource = realpath($this->templatesPath.'/'.$this->type);
+		$defaultSource = realpath($this->getDefaultTemplatesPath().'/'.$this->type);
+
+		if($customSource) {
+			return $customSource;
+		}
+		elseif($defaultSource) {
+			return $defaultSource;
+		}
+		else {
+			throw new Exception('Unable to locate the source directory for "'.$this->type.'".');
+		}
+	}
+
+	/**
+	 * @return string default templates path
+	 */
+	protected function getDefaultTemplatesPath()
+	{
+		return realpath(__DIR__.'/../webapp');
+	}
+
+	/**
+	 * @return array|null template configuration
+	 */
+	protected function getConfig()
+	{
+		if($this->_config===null) {
+			$this->_config = require $this->getDefaultTemplatesPath().'/config.php';
+			if($this->templatesPath && file_exists($this->templatesPath)) {
+				$this->_config = array_merge($this->_config, require $this->templatesPath.'/config.php');
+			}
+		}
+		if(isset($this->_config[$this->type])) {
+			return $this->_config[$this->type];
+		}
+	}
+
+	/**
+	 * @param string $source path to source file
+	 * @param string $pathTo path to file we want to get relative path for
+	 * @param string $varName variable name w/o $ to replace value with relative path for
+	 *
+	 * @return string target file contents
+	 */
+	public function replaceRelativePath($source, $pathTo, $varName)
+	{
+		$content = file_get_contents($source);
+		$relativeFile = str_replace($this->getSourceDir(), '', $source);
+
+		$relativePath = $this->getRelativePath($pathTo, $this->_rootPath.$relativeFile);
+		$relativePath = str_replace('\\', '\\\\', $relativePath);
+
+		return preg_replace('/\$'.$varName.'\s*=(.*?);/', "\$".$varName."=$relativePath;", $content);
+	}
+
+	/**
+	 * @param string $path1 absolute path
+	 * @param string $path2 absolute path
+	 *
+	 * @return string relative path
+	 */
+	protected function getRelativePath($path1, $path2)
+	{
+		$segs1 = explode(DIRECTORY_SEPARATOR, $path1);
+		$segs2 = explode(DIRECTORY_SEPARATOR, $path2);
+		$n1 = count($segs1);
+		$n2 = count($segs2);
+
+		for($i=0; $i<$n1 && $i<$n2; ++$i) {
+			if($segs1[$i] !== $segs2[$i]) {
+				break;
+			}
+		}
+
+		if($i===0) {
+			return "'".$path1."'";
+		}
+		$up='';
+		for($j=$i;$j<$n2-1;++$j) {
+			$up.='/..';
+		}
+		for(; $i<$n1-1; ++$i) {
+			$up.='/'.$segs1[$i];
+		}
+
+		return '__DIR__.\''.$up.'/'.basename($path1).'\'';
+	}
+
+
+	/**
+	 * Copies a list of files from one place to another.
+	 * @param array $fileList the list of files to be copied (name=>spec).
+	 * The array keys are names displayed during the copy process, and array values are specifications
+	 * for files to be copied. Each array value must be an array of the following structure:
+	 * <ul>
+	 * <li>source: required, the full path of the file/directory to be copied from</li>
+	 * <li>target: required, the full path of the file/directory to be copied to</li>
+	 * <li>callback: optional, the callback to be invoked when copying a file. The callback function
+	 *   should be declared as follows:
+	 *   <pre>
+	 *   function foo($source,$params)
+	 *   </pre>
+	 *   where $source parameter is the source file path, and the content returned
+	 *   by the function will be saved into the target file.</li>
+	 * <li>params: optional, the parameters to be passed to the callback</li>
+	 * </ul>
+	 * @see buildFileList
+	 */
+	protected function copyFiles($fileList)
+	{
+		$overwriteAll = false;
+		foreach($fileList as $name=>$file) {
+			$source = strtr($file['source'], '/\\', DIRECTORY_SEPARATOR);
+			$target = strtr($file['target'], '/\\', DIRECTORY_SEPARATOR);
+			$callback = isset($file['callback']) ? $file['callback'] : null;
+			$params = isset($file['params']) ? $file['params'] : null;
+
+			if(is_dir($source)) {
+				if (!is_dir($target)) {
+					mkdir($target, 0777, true);
+				}
+				continue;
+			}
+
+			if($callback !== null) {
+				$content = call_user_func($callback, $source, $params);
+			}
+			else {
+				$content = file_get_contents($source);
+			}
+			if(is_file($target)) {
+				if($content === file_get_contents($target)) {
+					echo "  unchanged $name\n";
+					continue;
+				}
+				if($overwriteAll) {
+					echo "  overwrite $name\n";
+				}
+				else {
+					echo "      exist $name\n";
+					echo "            ...overwrite? [Yes|No|All|Quit] ";
+					$answer = trim(fgets(STDIN));
+					if(!strncasecmp($answer, 'q', 1)) {
+						return;
+					}
+					elseif(!strncasecmp($answer, 'y', 1)) {
+						echo "  overwrite $name\n";
+					}
+					elseif(!strncasecmp($answer, 'a', 1)) {
+						echo "  overwrite $name\n";
+						$overwriteAll = true;
+					}
+					else {
+						echo "       skip $name\n";
+						continue;
+					}
+				}
+			}
+			else {
+				if (!is_dir(dirname($target))) {
+					mkdir(dirname($target), 0777, true);
+				}
+				echo "   generate $name\n";
+			}
+			file_put_contents($target, $content);
+		}
+	}
+
+	/**
+	 * Builds the file list of a directory.
+	 * This method traverses through the specified directory and builds
+	 * a list of files and subdirectories that the directory contains.
+	 * The result of this function can be passed to {@link copyFiles}.
+	 * @param string $sourceDir the source directory
+	 * @param string $targetDir the target directory
+	 * @param string $baseDir base directory
+	 * @param array $ignoreFiles list of the names of files that should
+	 * be ignored in list building process.
+	 * @param array $renameMap hash array of file names that should be
+	 * renamed. Example value: array('1.old.txt'=>'2.new.txt').
+	 * @return array the file list (see {@link copyFiles})
+	 */
+	protected function buildFileList($sourceDir, $targetDir, $baseDir='', $ignoreFiles=array(), $renameMap=array())
+	{
+		$list = array();
+		$handle = opendir($sourceDir);
+		while(($file = readdir($handle)) !== false) {
+			if(in_array($file, array('.', '..', '.svn', '.gitignore', '.hgignore')) || in_array($file, $ignoreFiles)) {
+				continue;
+			}
+			$sourcePath = $sourceDir.DIRECTORY_SEPARATOR.$file;
+			$targetPath = $targetDir.DIRECTORY_SEPARATOR.strtr($file, $renameMap);
+			$name = $baseDir === '' ? $file : $baseDir.'/'.$file;
+			$list[$name] = array(
+				'source' => $sourcePath,
+				'target' => $targetPath,
+			);
+			if(is_dir($sourcePath)) {
+				$list = array_merge($list, self::buildFileList($sourcePath, $targetPath, $name, $ignoreFiles, $renameMap));
+			}
+		}
+		closedir($handle);
+		return $list;
+	}
+}
diff --git a/yii/console/controllers/AssetController.php b/yii/console/controllers/AssetController.php
new file mode 100644
index 0000000..aab489b
--- /dev/null
+++ b/yii/console/controllers/AssetController.php
@@ -0,0 +1,353 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\console\controllers;
+
+use Yii;
+use yii\console\Exception;
+use yii\console\Controller;
+
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class AssetController extends Controller
+{
+	public $defaultAction = 'compress';
+
+	public $bundles = array();
+	public $extensions = array();
+	/**
+	 * @var array
+	 * ~~~
+	 * 'all' => array(
+	 *     'css' => 'all.css',
+	 *     'js' => 'js.css',
+	 *     'depends' => array( ... ),
+	 * )
+	 * ~~~
+	 */
+	public $targets = array();
+	public $assetManager = array();
+	public $jsCompressor = 'java -jar compiler.jar --js {from} --js_output_file {to}';
+	public $cssCompressor = 'java -jar yuicompressor.jar {from} -o {to}';
+
+	public function actionCompress($configFile, $bundleFile)
+	{
+		$this->loadConfiguration($configFile);
+		$bundles = $this->loadBundles($this->bundles, $this->extensions);
+		$targets = $this->loadTargets($this->targets, $bundles);
+		$this->publishBundles($bundles, $this->publishOptions);
+		$timestamp = time();
+		foreach ($targets as $target) {
+			if (!empty($target->js)) {
+				$this->buildTarget($target, 'js', $bundles, $timestamp);
+			}
+			if (!empty($target->css)) {
+				$this->buildTarget($target, 'css', $bundles, $timestamp);
+			}
+		}
+
+		$targets = $this->adjustDependency($targets, $bundles);
+		$this->saveTargets($targets, $bundleFile);
+	}
+
+	protected function loadConfiguration($configFile)
+	{
+		foreach (require($configFile) as $name => $value) {
+			if (property_exists($this, $name)) {
+				$this->$name = $value;
+			} else {
+				throw new Exception("Unknown configuration option: $name");
+			}
+		}
+
+		if (!isset($this->assetManager['basePath'])) {
+			throw new Exception("Please specify 'basePath' for the 'assetManager' option.");
+		}
+		if (!isset($this->assetManager['baseUrl'])) {
+			throw new Exception("Please specify 'baseUrl' for the 'assetManager' option.");
+		}
+	}
+
+	protected function loadBundles($bundles, $extensions)
+	{
+		$result = array();
+		foreach ($bundles as $name => $bundle) {
+			$bundle['class'] = 'yii\\web\\AssetBundle';
+			$result[$name] = Yii::createObject($bundle);
+		}
+		foreach ($extensions as $path) {
+			$manifest = $path . '/assets.php';
+			if (!is_file($manifest)) {
+				continue;
+			}
+			foreach (require($manifest) as $name => $bundle) {
+				if (!isset($result[$name])) {
+					$bundle['class'] = 'yii\\web\\AssetBundle';
+					$result[$name] = Yii::createObject($bundle);
+				}
+			}
+		}
+		return $result;
+	}
+
+	protected function loadTargets($targets, $bundles)
+	{
+		// build the dependency order of bundles
+		$registered = array();
+		foreach ($bundles as $name => $bundle) {
+			$this->registerBundle($bundles, $name, $registered);
+		}
+		$bundleOrders = array_combine(array_keys($registered), range(0, count($bundles) - 1));
+
+		// fill up the target which has empty 'depends'.
+		$referenced = array();
+		foreach ($targets as $name => $target) {
+			if (empty($target['depends'])) {
+				if (!isset($all)) {
+					$all = $name;
+				} else {
+					throw new Exception("Only one target can have empty 'depends' option. Found two now: $all, $name");
+				}
+			} else {
+				foreach ($target['depends'] as $bundle) {
+					if (!isset($referenced[$bundle])) {
+						$referenced[$bundle] = $name;
+					} else {
+						throw new Exception("Target '{$referenced[$bundle]}' and '$name' cannot contain the bundle '$bundle' at the same time.");
+					}
+				}
+			}
+		}
+		if (isset($all)) {
+			$targets[$all]['depends'] = array_diff(array_keys($registered), array_keys($referenced));
+		}
+
+		// adjust the 'depends' order for each target according to the dependency order of bundles
+		// create an AssetBundle object for each target
+		foreach ($targets as $name => $target) {
+			if (!isset($target['basePath'])) {
+				throw new Exception("Please specify 'basePath' for the '$name' target.");
+			}
+			if (!isset($target['baseUrl'])) {
+				throw new Exception("Please specify 'baseUrl' for the '$name' target.");
+			}
+			usort($target['depends'], function ($a, $b) use ($bundleOrders) {
+				if ($bundleOrders[$a] == $bundleOrders[$b]) {
+					return 0;
+				} else {
+					return $bundleOrders[$a] > $bundleOrders[$b] ? 1 : -1;
+				}
+			});
+			$target['class'] = 'yii\\web\\AssetBundle';
+			$targets[$name] = Yii::createObject($target);
+		}
+		return $targets;
+	}
+
+	/**
+	 * @param \yii\web\AssetBundle[] $bundles
+	 * @param array $options
+	 */
+	protected function publishBundles($bundles, $options)
+	{
+		if (!isset($options['class'])) {
+			$options['class'] = 'yii\\web\\AssetManager';
+		}
+		$am = Yii::createObject($options);
+		foreach ($bundles as $bundle) {
+			$bundle->publish($am);
+		}
+	}
+
+	/**
+	 * @param \yii\web\AssetBundle $target
+	 * @param string $type either "js" or "css"
+	 * @param \yii\web\AssetBundle[] $bundles
+	 * @param integer $timestamp
+	 * @throws Exception
+	 */
+	protected function buildTarget($target, $type, $bundles, $timestamp)
+	{
+		$outputFile = strtr($target->$type, array(
+			'{ts}' => $timestamp,
+		));
+		$inputFiles = array();
+
+		foreach ($target->depends as $name) {
+			if (isset($bundles[$name])) {
+				foreach ($bundles[$name]->$type as $file) {
+					$inputFiles[] = $bundles[$name]->basePath . '/' . $file;
+				}
+			} else {
+				throw new Exception("Unknown bundle: $name");
+			}
+		}
+		if ($type === 'js') {
+			$this->compressJsFiles($inputFiles, $target->basePath . '/' . $outputFile);
+		} else {
+			$this->compressCssFiles($inputFiles, $target->basePath . '/' . $outputFile);
+		}
+		$target->$type = array($outputFile);
+	}
+
+	protected function adjustDependency($targets, $bundles)
+	{
+		$map = array();
+		foreach ($targets as $name => $target) {
+			foreach ($target->depends as $bundle) {
+				$map[$bundle] = $name;
+			}
+		}
+
+		foreach ($targets as $name => $target) {
+			$depends = array();
+			foreach ($target->depends as $bn) {
+				foreach ($bundles[$bn]->depends as $bundle) {
+					$depends[$map[$bundle]] = true;
+				}
+			}
+			unset($depends[$name]);
+			$target->depends = array_keys($depends);
+		}
+
+		// detect possible circular dependencies
+		foreach ($targets as $name => $target) {
+			$registered = array();
+			$this->registerBundle($targets, $name, $registered);
+		}
+
+		foreach ($map as $bundle => $target) {
+			$targets[$bundle] = Yii::createObject(array(
+				'class' => 'yii\\web\\AssetBundle',
+				'depends' => array($target),
+			));
+		}
+		return $targets;
+	}
+
+	protected function registerBundle($bundles, $name, &$registered)
+	{
+		if (!isset($registered[$name])) {
+			$registered[$name] = false;
+			$bundle = $bundles[$name];
+			foreach ($bundle->depends as $depend) {
+				$this->registerBundle($bundles, $depend, $registered);
+			}
+			unset($registered[$name]);
+			$registered[$name] = true;
+		} elseif ($registered[$name] === false) {
+			throw new Exception("A circular dependency is detected for target '$name'.");
+		}
+	}
+
+	protected function saveTargets($targets, $bundleFile)
+	{
+		$array = array();
+		foreach ($targets as $name => $target) {
+			foreach (array('js', 'css', 'depends', 'basePath', 'baseUrl') as $prop) {
+				if (!empty($target->$prop)) {
+					$array[$name][$prop] = $target->$prop;
+				}
+			}
+		}
+		$array = var_export($array, true);
+		$version = date('Y-m-d H:i:s', time());
+		file_put_contents($bundleFile, <<<EOD
+<?php
+/**
+ * This file is generated by the "yiic script" command.
+ * DO NOT MODIFY THIS FILE DIRECTLY.
+ * @version $version
+ */
+return $array;
+EOD
+		);
+	}
+
+	protected function compressJsFiles($inputFiles, $outputFile)
+	{
+		if (is_string($this->jsCompressor)) {
+			$tmpFile = $outputFile . '.tmp';
+			$this->combineJsFiles($inputFiles, $tmpFile);
+			$log = shell_exec(strtr($this->jsCompressor, array(
+				'{from}' => $tmpFile,
+				'{to}' => $outputFile,
+			)));
+			@unlink($tmpFile);
+		} else {
+			$log = call_user_func($this->jsCompressor, $this, $inputFiles, $outputFile);
+		}
+	}
+
+	protected function compressCssFiles($inputFiles, $outputFile)
+	{
+		if (is_string($this->cssCompressor)) {
+			$tmpFile = $outputFile . '.tmp';
+			$this->combineCssFiles($inputFiles, $tmpFile);
+			$log = shell_exec(strtr($this->cssCompressor, array(
+				'{from}' => $inputFiles,
+				'{to}' => $outputFile,
+			)));
+		} else {
+			$log = call_user_func($this->cssCompressor, $this, $inputFiles, $outputFile);
+		}
+	}
+
+	public function combineJsFiles($files, $tmpFile)
+	{
+		$content = '';
+		foreach ($files as $file) {
+			$content .= "/*** BEGIN FILE: $file ***/\n"
+				. file_get_contents($file)
+				. "/*** END FILE: $file ***/\n";
+		}
+		file_put_contents($tmpFile, $content);
+	}
+
+	public function combineCssFiles($files, $tmpFile)
+	{
+		// todo: adjust url() references in CSS files
+		$content = '';
+		foreach ($files as $file) {
+			$content .= "/*** BEGIN FILE: $file ***/\n"
+				. file_get_contents($file)
+				. "/*** END FILE: $file ***/\n";
+		}
+		file_put_contents($tmpFile, $content);
+	}
+
+	public function actionTemplate($configFile)
+	{
+		$template = <<<EOD
+<?php
+
+return array(
+	//
+	'bundles' => require('path/to/bundles.php'),
+	//
+	'extensions' => require('path/to/namespaces.php'),
+	//
+	'targets' => array(
+		'all' => array(
+			'basePath' => __DIR__,
+			'baseUrl' => '/test',
+			'js' => 'all-{ts}.js',
+			'css' => 'all-{ts}.css',
+		),
+	),
+
+	'assetManager' => array(
+		'basePath' => __DIR__,
+		'baseUrl' => '/test',
+	),
+);
+EOD;
+		file_put_contents($configFile, $template);
+	}
+}
diff --git a/yii/console/controllers/CacheController.php b/yii/console/controllers/CacheController.php
new file mode 100644
index 0000000..6765f9b
--- /dev/null
+++ b/yii/console/controllers/CacheController.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\console\controllers;
+
+use yii\console\Controller;
+use yii\console\Exception;
+use yii\caching\Cache;
+
+/**
+ * This command allows you to flush cache.
+ *
+ * @author Alexander Makarov <sam@rmcreative.ru>
+ * @since 2.0
+ */
+class CacheController extends Controller
+{
+	public function actionIndex()
+	{
+		$this->forward('help/index', array('-args' => array('cache/flush')));
+	}
+
+	/**
+	 * Flushes cache.
+	 * @param string $component Name of the cache application component to use.
+	 *
+	 * @throws \yii\console\Exception
+	 */
+	public function actionFlush($component = 'cache')
+	{
+		/** @var $cache Cache */
+		$cache = \Yii::$app->getComponent($component);
+		if(!$cache || !$cache instanceof Cache) {
+			throw new Exception('Application component "'.$component.'" is not defined or not a cache.');
+		}
+
+		if(!$cache->flush()) {
+			throw new Exception('Unable to flush cache.');
+		}
+
+		echo "\nDone.\n";
+	}
+}
diff --git a/yii/console/controllers/HelpController.php b/yii/console/controllers/HelpController.php
new file mode 100644
index 0000000..6a66fd0
--- /dev/null
+++ b/yii/console/controllers/HelpController.php
@@ -0,0 +1,421 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\console\controllers;
+
+use Yii;
+use yii\base\Application;
+use yii\base\InlineAction;
+use yii\console\Controller;
+use yii\console\Exception;
+use yii\console\Request;
+use yii\helpers\StringHelper;
+
+/**
+ * This command provides help information about console commands.
+ *
+ * This command displays the available command list in
+ * the application or the detailed instructions about using
+ * a specific command.
+ *
+ * This command can be used as follows on command line:
+ *
+ * ~~~
+ * yiic help [command name]
+ * ~~~
+ *
+ * In the above, if the command name is not provided, all
+ * available commands will be displayed.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class HelpController extends Controller
+{
+	/**
+	 * Displays available commands or the detailed information
+	 * about a particular command. For example,
+	 *
+	 * ~~~
+	 * yiic help          # list available commands
+	 * yiic help message  # display help info about "message"
+	 * ~~~
+	 *
+	 * @param string $command The name of the command to show help about.
+	 * If not provided, all available commands will be displayed.
+	 * @return integer the exit status
+	 * @throws Exception if the command for help is unknown
+	 */
+	public function actionIndex($command = null)
+	{
+		if ($command !== null) {
+			$result = Yii::$app->createController($command);
+			if ($result === false) {
+				throw new Exception(Yii::t('yii|No help for unknown command "{command}".', array(
+					'{command}' => $command,
+				)));
+			}
+
+			list($controller, $actionID) = $result;
+
+			$actions = $this->getActions($controller);
+			if ($actionID !== '' || count($actions) === 1 && $actions[0] === $controller->defaultAction) {
+				$this->getActionHelp($controller, $actionID);
+			} else {
+				$this->getControllerHelp($controller);
+			}
+		} else {
+			$this->getHelp();
+		}
+	}
+
+	/**
+	 * Returns all available command names.
+	 * @return array all available command names
+	 */
+	public function getCommands()
+	{
+		$commands = $this->getModuleCommands(Yii::$app);
+		sort($commands);
+		return array_unique($commands);
+	}
+
+	/**
+	 * Returns all available actions of the specified controller.
+	 * @param Controller $controller the controller instance
+	 * @return array all available action IDs.
+	 */
+	public function getActions($controller)
+	{
+		$actions = array_keys($controller->actions());
+		$class = new \ReflectionClass($controller);
+		foreach ($class->getMethods() as $method) {
+			$name = $method->getName();
+			if ($method->isPublic() && !$method->isStatic() && strpos($name, 'action') === 0 && $name !== 'actions') {
+				$actions[] = StringHelper::camel2id(substr($name, 6));
+			}
+		}
+		sort($actions);
+		return array_unique($actions);
+	}
+
+	/**
+	 * Returns available commands of a specified module.
+	 * @param \yii\base\Module $module the module instance
+	 * @return array the available command names
+	 */
+	protected function getModuleCommands($module)
+	{
+		$prefix = $module instanceof Application ? '' : $module->getUniqueID() . '/';
+
+		$commands = array();
+		foreach (array_keys($module->controllerMap) as $id) {
+			$commands[] = $prefix . $id;
+		}
+
+		foreach ($module->getModules() as $id => $child) {
+			if (($child = $module->getModule($id)) === null) {
+				continue;
+			}
+			foreach ($this->getModuleCommands($child) as $command) {
+				$commands[] = $prefix . $id . '/' . $command;
+			}
+		}
+
+		$files = scandir($module->getControllerPath());
+		foreach ($files as $file) {
+			if (strcmp(substr($file, -14), 'Controller.php') === 0) {
+				$commands[] = $prefix . lcfirst(substr(basename($file), 0, -14));
+			}
+		}
+
+		return $commands;
+	}
+
+	/**
+	 * Displays all available commands.
+	 */
+	protected function getHelp()
+	{
+		$commands = $this->getCommands();
+		if (!empty($commands)) {
+			echo "The following commands are available:\n\n";
+			foreach ($commands as $command) {
+				echo "* $command\n";
+			}
+			echo "\nTo see the help of each command, enter:\n";
+			echo "\n  yiic help <command-name>\n\n";
+		} else {
+			echo "\nNo commands are found.\n";
+		}
+	}
+
+	/**
+	 * Displays the overall information of the command.
+	 * @param Controller $controller the controller instance
+	 */
+	protected function getControllerHelp($controller)
+	{
+		$class = new \ReflectionClass($controller);
+		$comment = strtr(trim(preg_replace('/^\s*\**( |\t)?/m', '', trim($class->getDocComment(), '/'))), "\r", '');
+		if (preg_match('/^\s*@\w+/m', $comment, $matches, PREG_OFFSET_CAPTURE)) {
+			$comment = trim(substr($comment, 0, $matches[0][1]));
+		}
+
+		if ($comment !== '') {
+			echo "\nDESCRIPTION\n";
+			echo "\n" . $comment . "\n\n";
+		}
+
+		$actions = $this->getActions($controller);
+		if (!empty($actions)) {
+			echo "\nSUB-COMMANDS\n\n";
+			$prefix = $controller->getUniqueId();
+			foreach ($actions as $action) {
+				if ($action === $controller->defaultAction) {
+					echo "* $prefix/$action (default)";
+				} else {
+					echo "* $prefix/$action";
+				}
+				$summary = $this->getActionSummary($controller, $action);
+				if ($summary !== '') {
+					echo ': ' . $summary;
+				}
+				echo "\n";
+			}
+			echo "\n\nTo see the detailed information about individual sub-commands, enter:\n";
+			echo "\n  yiic help <sub-command>\n\n";
+		}
+	}
+
+	/**
+	 * Returns the short summary of the action.
+	 * @param Controller $controller the controller instance
+	 * @param string $actionID action ID
+	 * @return string the summary about the action
+	 */
+	protected function getActionSummary($controller, $actionID)
+	{
+		$action = $controller->createAction($actionID);
+		if ($action === null) {
+			return '';
+		}
+		if ($action instanceof InlineAction) {
+			$reflection = new \ReflectionMethod($controller, $action->actionMethod);
+		} else {
+			$reflection = new \ReflectionClass($action);
+		}
+		$tags = $this->parseComment($reflection->getDocComment());
+		if ($tags['description'] !== '') {
+			$limit = 73 - strlen($action->getUniqueId());
+			if ($actionID === $controller->defaultAction) {
+				$limit -= 10;
+			}
+			if ($limit < 0) {
+				$limit = 50;
+			}
+			$description = $tags['description'];
+			if (($pos = strpos($tags['description'], "\n")) !== false) {
+				$description = substr($description, 0, $pos);
+			}
+			$text = substr($description, 0, $limit);
+			return strlen($description) > $limit ? $text . '...' : $text;
+		} else {
+			return '';
+		}
+	}
+
+	/**
+	 * Displays the detailed information of a command action.
+	 * @param Controller $controller the controller instance
+	 * @param string $actionID action ID
+	 * @throws Exception if the action does not exist
+	 */
+	protected function getActionHelp($controller, $actionID)
+	{
+		$action = $controller->createAction($actionID);
+		if ($action === null) {
+			throw new Exception(Yii::t('yii|No help for unknown sub-command "{command}".', array(
+				'{command}' => rtrim($controller->getUniqueId() . '/' . $actionID, '/'),
+			)));
+		}
+		if ($action instanceof InlineAction) {
+			$method = new \ReflectionMethod($controller, $action->actionMethod);
+		} else {
+			$method = new \ReflectionMethod($action, 'run');
+		}
+
+		$tags = $this->parseComment($method->getDocComment());
+		$options = $this->getOptionHelps($controller);
+
+		if ($tags['description'] !== '') {
+			echo "\nDESCRIPTION";
+			echo "\n\n" . $tags['description'] . "\n\n";
+		}
+
+		echo "\nUSAGE\n\n";
+		if ($action->id === $controller->defaultAction) {
+			echo 'yiic ' . $controller->getUniqueId();
+		} else {
+			echo "yiic " . $action->getUniqueId();
+		}
+		list ($required, $optional) = $this->getArgHelps($method, isset($tags['param']) ? $tags['param'] : array());
+		if (!empty($required)) {
+			echo ' <' . implode('> <', array_keys($required)) . '>';
+		}
+		if (!empty($optional)) {
+			echo ' [' . implode('] [', array_keys($optional)) . ']';
+		}
+		if (!empty($options)) {
+			echo ' [...options...]';
+		}
+		echo "\n\n";
+
+		if (!empty($required) || !empty($optional)) {
+			echo implode("\n\n", array_merge($required, $optional)) . "\n\n";
+		}
+
+		$options = $this->getOptionHelps($controller);
+		if (!empty($options)) {
+			echo "\nOPTIONS\n\n";
+			echo implode("\n\n", $options) . "\n\n";
+		}
+	}
+
+	/**
+	 * Returns the help information about arguments.
+	 * @param \ReflectionMethod $method
+	 * @param string $tags the parsed comment block related with arguments
+	 * @return array the required and optional argument help information
+	 */
+	protected function getArgHelps($method, $tags)
+	{
+		if (is_string($tags)) {
+			$tags = array($tags);
+		}
+		$params = $method->getParameters();
+		$optional = $required = array();
+		foreach ($params as $i => $param) {
+			$name = $param->getName();
+			$tag = isset($tags[$i]) ? $tags[$i] : '';
+			if (preg_match('/^([^\s]+)\s+(\$\w+\s+)?(.*)/s', $tag, $matches)) {
+				$type = $matches[1];
+				$comment = $matches[3];
+			} else {
+				$type = null;
+				$comment = $tag;
+			}
+			if ($param->isDefaultValueAvailable()) {
+				$optional[$name] = $this->formatOptionHelp('* ' . $name, false, $type, $param->getDefaultValue(), $comment);
+			} else {
+				$required[$name] = $this->formatOptionHelp('* ' . $name, true, $type, null, $comment);
+			}
+		}
+
+		return array($required, $optional);
+	}
+
+	/**
+	 * Returns the help information about the options available for a console controller.
+	 * @param Controller $controller the console controller
+	 * @return array the help information about the options
+	 */
+	protected function getOptionHelps($controller)
+	{
+		$optionNames = $controller->globalOptions();
+		if (empty($optionNames)) {
+			return array();
+		}
+
+		$class = new \ReflectionClass($controller);
+		$options = array();
+		foreach ($class->getProperties() as $property) {
+			$name = $property->getName();
+			if (!in_array($name, $optionNames, true)) {
+				continue;
+			}
+			$defaultValue = $property->getValue($controller);
+			$tags = $this->parseComment($property->getDocComment());
+			if (isset($tags['var']) || isset($tags['property'])) {
+				$doc = isset($tags['var']) ? $tags['var'] : $tags['property'];
+				if (is_array($doc)) {
+					$doc = reset($doc);
+				}
+				if (preg_match('/^([^\s]+)(.*)/s', $doc, $matches)) {
+					$type = $matches[1];
+					$comment = $matches[2];
+				} else {
+					$type = null;
+					$comment = $doc;
+				}
+				$options[$name] = $this->formatOptionHelp('--' . $name, false, $type, $defaultValue, $comment);
+			} else {
+				$options[$name] = $this->formatOptionHelp('--' . $name, false, null, $defaultValue, '');
+			}
+		}
+		ksort($options);
+		return $options;
+	}
+
+	/**
+	 * Parses the comment block into tags.
+	 * @param string $comment the comment block
+	 * @return array the parsed tags
+	 */
+	protected function parseComment($comment)
+	{
+		$tags = array();
+		$comment = "@description \n" . strtr(trim(preg_replace('/^\s*\**( |\t)?/m', '', trim($comment, '/'))), "\r", '');
+		$parts = preg_split('/^\s*@/m', $comment, -1, PREG_SPLIT_NO_EMPTY);
+		foreach ($parts as $part) {
+			if (preg_match('/^(\w+)(.*)/ms', trim($part), $matches)) {
+				$name = $matches[1];
+				if (!isset($tags[$name])) {
+					$tags[$name] = trim($matches[2]);
+				} elseif (is_array($tags[$name])) {
+					$tags[$name][] = trim($matches[2]);
+				} else {
+					$tags[$name] = array($tags[$name], trim($matches[2]));
+				}
+			}
+		}
+		return $tags;
+	}
+
+	/**
+	 * Generates a well-formed string for an argument or option.
+	 * @param string $name the name of the argument or option
+	 * @param boolean $required whether the argument is required
+	 * @param string $type the type of the option or argument
+	 * @param mixed $defaultValue the default value of the option or argument
+	 * @param string $comment comment about the option or argument
+	 * @return string the formatted string for the argument or option
+	 */
+	protected function formatOptionHelp($name, $required, $type, $defaultValue, $comment)
+	{
+		$doc = '';
+		$comment = trim($comment);
+
+		if ($defaultValue !== null && !is_array($defaultValue)) {
+			if ($type === null) {
+				$type = gettype($defaultValue);
+			}
+			$doc = "$type (defaults to " . var_export($defaultValue, true) . ")";
+		} elseif (trim($type) !== '') {
+			$doc = $type;
+		}
+
+		if ($doc === '') {
+			$doc = $comment;
+		} elseif ($comment !== '') {
+			$doc .= "\n" . preg_replace("/^/m", "  ", $comment);
+		}
+
+		$name = $required ? "$name (required)" : $name;
+		return $doc === '' ? $name : "$name: $doc";
+	}
+}
diff --git a/yii/console/controllers/MessageController.php b/yii/console/controllers/MessageController.php
new file mode 100644
index 0000000..e010b55
--- /dev/null
+++ b/yii/console/controllers/MessageController.php
@@ -0,0 +1,206 @@
+<?php
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\console\controllers;
+
+use yii\console\Controller;
+
+/**
+ * This command extracts messages to be translated from source files.
+ * The extracted messages are saved as PHP message source files
+ * under the specified directory.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class MessageController extends Controller
+{
+	/**
+	 * Searches for messages to be translated in the specified
+	 * source files and compiles them into PHP arrays as message source.
+	 *
+	 * @param string $config the path of the configuration file. You can find
+	 * an example in framework/messages/config.php.
+	 *
+	 * The file can be placed anywhere and must be a valid PHP script which
+	 * returns an array of name-value pairs. Each name-value pair represents
+	 * a configuration option.
+	 *
+	 * The following options are available:
+	 *
+	 *  - sourcePath: string, root directory of all source files.
+	 *  - messagePath: string, root directory containing message translations.
+	 *  - languages: array, list of language codes that the extracted messages
+	 *    should be translated to. For example, array('zh_cn','en_au').
+	 *  - fileTypes: array, a list of file extensions (e.g. 'php', 'xml').
+	 *    Only the files whose extension name can be found in this list
+	 *    will be processed. If empty, all files will be processed.
+	 *  - exclude: array, a list of directory and file exclusions. Each
+	 *    exclusion can be either a name or a path. If a file or directory name
+	 *    or path matches the exclusion, it will not be copied. For example,
+	 *    an exclusion of '.svn' will exclude all files and directories whose
+	 *    name is '.svn'. And an exclusion of '/a/b' will exclude file or
+	 *    directory 'sourcePath/a/b'.
+	 *  - translator: the name of the function for translating messages.
+	 *    Defaults to 'Yii::t'. This is used as a mark to find messages to be
+	 *    translated.
+	 *  - overwrite: if message file must be overwritten with the merged messages.
+	 *  - removeOld: if message no longer needs translation it will be removed,
+	 *    instead of being enclosed between a pair of '@@' marks.
+	 *  - sort: sort messages by key when merging, regardless of their translation
+	 *    state (new, obsolete, translated.)
+	 */
+	public function actionIndex($config)
+	{
+		if(!is_file($config))
+			$this->usageError("the configuration file {$config} does not exist.");
+
+		$config=require_once($config);
+
+		$translator='Yii::t';
+		extract($config);
+
+		if(!isset($sourcePath,$messagePath,$languages))
+			$this->usageError('The configuration file must specify "sourcePath", "messagePath" and "languages".');
+		if(!is_dir($sourcePath))
+			$this->usageError("The source path $sourcePath is not a valid directory.");
+		if(!is_dir($messagePath))
+			$this->usageError("The message path $messagePath is not a valid directory.");
+		if(empty($languages))
+			$this->usageError("Languages cannot be empty.");
+
+		if(!isset($overwrite))
+			$overwrite = false;
+
+		if(!isset($removeOld))
+			$removeOld = false;
+
+		if(!isset($sort))
+			$sort = false;
+
+		$options=array();
+		if(isset($fileTypes))
+			$options['fileTypes']=$fileTypes;
+		if(isset($exclude))
+			$options['exclude']=$exclude;
+		$files=CFileHelper::findFiles(realpath($sourcePath),$options);
+
+		$messages=array();
+		foreach($files as $file)
+			$messages=array_merge_recursive($messages,$this->extractMessages($file,$translator));
+
+		foreach($languages as $language)
+		{
+			$dir=$messagePath.DIRECTORY_SEPARATOR.$language;
+			if(!is_dir($dir))
+				@mkdir($dir);
+			foreach($messages as $category=>$msgs)
+			{
+				$msgs=array_values(array_unique($msgs));
+				$this->generateMessageFile($msgs,$dir.DIRECTORY_SEPARATOR.$category.'.php',$overwrite,$removeOld,$sort);
+			}
+		}
+	}
+
+	protected function extractMessages($fileName,$translator)
+	{
+		echo "Extracting messages from $fileName...\n";
+		$subject=file_get_contents($fileName);
+		$n=preg_match_all('/\b'.$translator.'\s*\(\s*(\'.*?(?<!\\\\)\'|".*?(?<!\\\\)")\s*,\s*(\'.*?(?<!\\\\)\'|".*?(?<!\\\\)")\s*[,\)]/s',$subject,$matches,PREG_SET_ORDER);
+		$messages=array();
+		for($i=0;$i<$n;++$i)
+		{
+			if(($pos=strpos($matches[$i][1],'.'))!==false)
+				$category=substr($matches[$i][1],$pos+1,-1);
+			else
+				$category=substr($matches[$i][1],1,-1);
+			$message=$matches[$i][2];
+			$messages[$category][]=eval("return $message;");  // use eval to eliminate quote escape
+		}
+		return $messages;
+	}
+
+	protected function generateMessageFile($messages,$fileName,$overwrite,$removeOld,$sort)
+	{
+		echo "Saving messages to $fileName...";
+		if(is_file($fileName))
+		{
+			$translated=require($fileName);
+			sort($messages);
+			ksort($translated);
+			if(array_keys($translated)==$messages)
+			{
+				echo "nothing new...skipped.\n";
+				return;
+			}
+			$merged=array();
+			$untranslated=array();
+			foreach($messages as $message)
+			{
+				if(!empty($translated[$message]))
+					$merged[$message]=$translated[$message];
+				else
+					$untranslated[]=$message;
+			}
+			ksort($merged);
+			sort($untranslated);
+			$todo=array();
+			foreach($untranslated as $message)
+				$todo[$message]='';
+			ksort($translated);
+			foreach($translated as $message=>$translation)
+			{
+				if(!isset($merged[$message]) && !isset($todo[$message]) && !$removeOld)
+				{
+					if(substr($translation,0,2)==='@@' && substr($translation,-2)==='@@')
+						$todo[$message]=$translation;
+					else
+						$todo[$message]='@@'.$translation.'@@';
+				}
+			}
+			$merged=array_merge($todo,$merged);
+			if($sort)
+				ksort($merged);
+			if($overwrite === false)
+				$fileName.='.merged';
+			echo "translation merged.\n";
+		}
+		else
+		{
+			$merged=array();
+			foreach($messages as $message)
+				$merged[$message]='';
+			ksort($merged);
+			echo "saved.\n";
+		}
+		$array=str_replace("\r",'',var_export($merged,true));
+		$content=<<<EOD
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yiic message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE, this file must be saved in UTF-8 encoding.
+ */
+return $array;
+
+EOD;
+		file_put_contents($fileName, $content);
+	}
+}
diff --git a/yii/console/controllers/MigrateController.php b/yii/console/controllers/MigrateController.php
new file mode 100644
index 0000000..fb06c66
--- /dev/null
+++ b/yii/console/controllers/MigrateController.php
@@ -0,0 +1,633 @@
+<?php
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\console\controllers;
+
+use Yii;
+use yii\console\Exception;
+use yii\console\Controller;
+use yii\db\Connection;
+use yii\db\Query;
+use yii\helpers\ArrayHelper;
+
+/**
+ * This command manages application migrations.
+ *
+ * A migration means a set of persistent changes to the application environment
+ * that is shared among different developers. For example, in an application
+ * backed by a database, a migration may refer to a set of changes to
+ * the database, such as creating a new table, adding a new table column.
+ *
+ * This command provides support for tracking the migration history, upgrading
+ * or downloading with migrations, and creating new migration skeletons.
+ *
+ * The migration history is stored in a database table named
+ * as [[migrationTable]]. The table will be automatically created the first time
+ * this command is executed, if it does not exist. You may also manually
+ * create it as follows:
+ *
+ * ~~~
+ * CREATE TABLE tbl_migration (
+ *     version varchar(255) PRIMARY KEY,
+ *     apply_time integer
+ * )
+ * ~~~
+ *
+ * Below are some common usages of this command:
+ *
+ * ~~~
+ * # creates a new migration named 'create_user_table'
+ * yiic migrate/create create_user_table
+ *
+ * # applies ALL new migrations
+ * yiic migrate
+ *
+ * # reverts the last applied migration
+ * yiic migrate/down
+ * ~~~
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class MigrateController extends Controller
+{
+	/**
+	 * The name of the dummy migration that marks the beginning of the whole migration history.
+	 */
+	const BASE_MIGRATION = 'm000000_000000_base';
+
+	/**
+	 * @var string the default command action.
+	 */
+	public $defaultAction = 'up';
+	/**
+	 * @var string the directory storing the migration classes. This can be either
+	 * a path alias or a directory.
+	 */
+	public $migrationPath = '@app/migrations';
+	/**
+	 * @var string the name of the table for keeping applied migration information.
+	 */
+	public $migrationTable = 'tbl_migration';
+	/**
+	 * @var string the template file for generating new migrations.
+	 * This can be either a path alias (e.g. "@app/migrations/template.php")
+	 * or a file path.
+	 */
+	public $templateFile = '@yii/views/migration.php';
+	/**
+	 * @var boolean whether to execute the migration in an interactive mode.
+	 */
+	public $interactive = true;
+	/**
+	 * @var Connection|string the DB connection object or the application
+	 * component ID of the DB connection.
+	 */
+	public $db = 'db';
+
+	/**
+	 * Returns the names of the global options for this command.
+	 * @return array the names of the global options for this command.
+	 */
+	public function globalOptions()
+	{
+		return array('migrationPath', 'migrationTable', 'db', 'templateFile', 'interactive');
+	}
+
+	/**
+	 * This method is invoked right before an action is to be executed (after all possible filters.)
+	 * It checks the existence of the [[migrationPath]].
+	 * @param \yii\base\Action $action the action to be executed.
+	 * @return boolean whether the action should continue to be executed.
+	 * @throws Exception if the migration directory does not exist.
+	 */
+	public function beforeAction($action)
+	{
+		if (parent::beforeAction($action)) {
+			$path = Yii::getAlias($this->migrationPath);
+			if (!is_dir($path)) {
+				throw new Exception("The migration directory \"{$this->migrationPath}\" does not exist.");
+			}
+			$this->migrationPath = $path;
+
+			if (is_string($this->db)) {
+				$this->db = Yii::$app->getComponent($this->db);
+			}
+			if (!$this->db instanceof Connection) {
+				throw new Exception("The 'db' option must refer to the application component ID of a DB connection.");
+			}
+
+			$version = Yii::getVersion();
+			echo "Yii Migration Tool (based on Yii v{$version})\n\n";
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Upgrades the application by applying new migrations.
+	 * For example,
+	 *
+	 * ~~~
+	 * yiic migrate     # apply all new migrations
+	 * yiic migrate 3   # apply the first 3 new migrations
+	 * ~~~
+	 *
+	 * @param integer $limit the number of new migrations to be applied. If 0, it means
+	 * applying all available new migrations.
+	 */
+	public function actionUp($limit = 0)
+	{
+		$migrations = $this->getNewMigrations();
+		if (empty($migrations)) {
+			echo "No new migration found. Your system is up-to-date.\n";
+			Yii::$app->end();
+		}
+
+		$total = count($migrations);
+		$limit = (int)$limit;
+		if ($limit > 0) {
+			$migrations = array_slice($migrations, 0, $limit);
+		}
+
+		$n = count($migrations);
+		if ($n === $total) {
+			echo "Total $n new " . ($n === 1 ? 'migration' : 'migrations') . " to be applied:\n";
+		} else {
+			echo "Total $n out of $total new " . ($total === 1 ? 'migration' : 'migrations') . " to be applied:\n";
+		}
+
+		foreach ($migrations as $migration) {
+			echo "    $migration\n";
+		}
+		echo "\n";
+
+		if ($this->confirm('Apply the above ' . ($n === 1 ? 'migration' : 'migrations') . "?")) {
+			foreach ($migrations as $migration) {
+				if (!$this->migrateUp($migration)) {
+					echo "\nMigration failed. The rest of the migrations are canceled.\n";
+					return;
+				}
+			}
+			echo "\nMigrated up successfully.\n";
+		}
+	}
+
+	/**
+	 * Downgrades the application by reverting old migrations.
+	 * For example,
+	 *
+	 * ~~~
+	 * yiic migrate/down     # revert the last migration
+	 * yiic migrate/down 3   # revert the last 3 migrations
+	 * ~~~
+	 *
+	 * @param integer $limit the number of migrations to be reverted. Defaults to 1,
+	 * meaning the last applied migration will be reverted.
+	 * @throws Exception if the number of the steps specified is less than 1.
+	 */
+	public function actionDown($limit = 1)
+	{
+		$limit = (int)$limit;
+		if ($limit < 1) {
+			throw new Exception("The step argument must be greater than 0.");
+		}
+
+		$migrations = $this->getMigrationHistory($limit);
+		if (empty($migrations)) {
+			echo "No migration has been done before.\n";
+			return;
+		}
+		$migrations = array_keys($migrations);
+
+		$n = count($migrations);
+		echo "Total $n " . ($n === 1 ? 'migration' : 'migrations') . " to be reverted:\n";
+		foreach ($migrations as $migration) {
+			echo "    $migration\n";
+		}
+		echo "\n";
+
+		if ($this->confirm('Revert the above ' . ($n === 1 ? 'migration' : 'migrations') . "?")) {
+			foreach ($migrations as $migration) {
+				if (!$this->migrateDown($migration)) {
+					echo "\nMigration failed. The rest of the migrations are canceled.\n";
+					return;
+				}
+			}
+			echo "\nMigrated down successfully.\n";
+		}
+	}
+
+	/**
+	 * Redoes the last few migrations.
+	 *
+	 * This command will first revert the specified migrations, and then apply
+	 * them again. For example,
+	 *
+	 * ~~~
+	 * yiic migrate/redo     # redo the last applied migration
+	 * yiic migrate/redo 3   # redo the last 3 applied migrations
+	 * ~~~
+	 *
+	 * @param integer $limit the number of migrations to be redone. Defaults to 1,
+	 * meaning the last applied migration will be redone.
+	 * @throws Exception if the number of the steps specified is less than 1.
+	 */
+	public function actionRedo($limit = 1)
+	{
+		$limit = (int)$limit;
+		if ($limit < 1) {
+			throw new Exception("The step argument must be greater than 0.");
+		}
+
+		$migrations = $this->getMigrationHistory($limit);
+		if (empty($migrations)) {
+			echo "No migration has been done before.\n";
+			return;
+		}
+		$migrations = array_keys($migrations);
+
+		$n = count($migrations);
+		echo "Total $n " . ($n === 1 ? 'migration' : 'migrations') . " to be redone:\n";
+		foreach ($migrations as $migration) {
+			echo "    $migration\n";
+		}
+		echo "\n";
+
+		if ($this->confirm('Redo the above ' . ($n === 1 ? 'migration' : 'migrations') . "?")) {
+			foreach ($migrations as $migration) {
+				if (!$this->migrateDown($migration)) {
+					echo "\nMigration failed. The rest of the migrations are canceled.\n";
+					return;
+				}
+			}
+			foreach (array_reverse($migrations) as $migration) {
+				if (!$this->migrateUp($migration)) {
+					echo "\nMigration failed. The rest of the migrations migrations are canceled.\n";
+					return;
+				}
+			}
+			echo "\nMigration redone successfully.\n";
+		}
+	}
+
+	/**
+	 * Upgrades or downgrades till the specified version.
+	 *
+	 * This command will first revert the specified migrations, and then apply
+	 * them again. For example,
+	 *
+	 * ~~~
+	 * yiic migrate/to 101129_185401                      # using timestamp
+	 * yiic migrate/to m101129_185401_create_user_table   # using full name
+	 * ~~~
+	 *
+	 * @param string $version the version name that the application should be migrated to.
+	 * This can be either the timestamp or the full name of the migration.
+	 * @throws Exception if the version argument is invalid
+	 */
+	public function actionTo($version)
+	{
+		$originalVersion = $version;
+		if (preg_match('/^m?(\d{6}_\d{6})(_.*?)?$/', $version, $matches)) {
+			$version = 'm' . $matches[1];
+		} else {
+			throw new Exception("The version argument must be either a timestamp (e.g. 101129_185401)\nor the full name of a migration (e.g. m101129_185401_create_user_table).");
+		}
+
+		// try migrate up
+		$migrations = $this->getNewMigrations();
+		foreach ($migrations as $i => $migration) {
+			if (strpos($migration, $version . '_') === 0) {
+				$this->actionUp($i + 1);
+				return;
+			}
+		}
+
+		// try migrate down
+		$migrations = array_keys($this->getMigrationHistory(-1));
+		foreach ($migrations as $i => $migration) {
+			if (strpos($migration, $version . '_') === 0) {
+				if ($i === 0) {
+					echo "Already at '$originalVersion'. Nothing needs to be done.\n";
+				} else {
+					$this->actionDown($i);
+				}
+				return;
+			}
+		}
+
+		throw new Exception("Unable to find the version '$originalVersion'.");
+	}
+
+	/**
+	 * Modifies the migration history to the specified version.
+	 *
+	 * No actual migration will be performed.
+	 *
+	 * ~~~
+	 * yiic migrate/mark 101129_185401                      # using timestamp
+	 * yiic migrate/mark m101129_185401_create_user_table   # using full name
+	 * ~~~
+	 *
+	 * @param string $version the version at which the migration history should be marked.
+	 * This can be either the timestamp or the full name of the migration.
+	 * @throws Exception if the version argument is invalid or the version cannot be found.
+	 */
+	public function actionMark($version)
+	{
+		$originalVersion = $version;
+		if (preg_match('/^m?(\d{6}_\d{6})(_.*?)?$/', $version, $matches)) {
+			$version = 'm' . $matches[1];
+		} else {
+			throw new Exception("The version argument must be either a timestamp (e.g. 101129_185401)\nor the full name of a migration (e.g. m101129_185401_create_user_table).");
+		}
+
+		// try mark up
+		$migrations = $this->getNewMigrations();
+		foreach ($migrations as $i => $migration) {
+			if (strpos($migration, $version . '_') === 0) {
+				if ($this->confirm("Set migration history at $originalVersion?")) {
+					$command = $this->db->createCommand();
+					for ($j = 0; $j <= $i; ++$j) {
+						$command->insert($this->migrationTable, array(
+							'version' => $migrations[$j],
+							'apply_time' => time(),
+						))->execute();
+					}
+					echo "The migration history is set at $originalVersion.\nNo actual migration was performed.\n";
+				}
+				return;
+			}
+		}
+
+		// try mark down
+		$migrations = array_keys($this->getMigrationHistory(-1));
+		foreach ($migrations as $i => $migration) {
+			if (strpos($migration, $version . '_') === 0) {
+				if ($i === 0) {
+					echo "Already at '$originalVersion'. Nothing needs to be done.\n";
+				} else {
+					if ($this->confirm("Set migration history at $originalVersion?")) {
+						$command = $this->db->createCommand();
+						for ($j = 0; $j < $i; ++$j) {
+							$command->delete($this->migrationTable, array(
+								'version' => $migrations[$j],
+							))->execute();
+						}
+						echo "The migration history is set at $originalVersion.\nNo actual migration was performed.\n";
+					}
+				}
+				return;
+			}
+		}
+
+		throw new Exception("Unable to find the version '$originalVersion'.");
+	}
+
+	/**
+	 * Displays the migration history.
+	 *
+	 * This command will show the list of migrations that have been applied
+	 * so far. For example,
+	 *
+	 * ~~~
+	 * yiic migrate/history     # showing the last 10 migrations
+	 * yiic migrate/history 5   # showing the last 5 migrations
+	 * yiic migrate/history 0   # showing the whole history
+	 * ~~~
+	 *
+	 * @param integer $limit the maximum number of migrations to be displayed.
+	 * If it is 0, the whole migration history will be displayed.
+	 */
+	public function actionHistory($limit = 10)
+	{
+		$limit = (int)$limit;
+		$migrations = $this->getMigrationHistory($limit);
+		if (empty($migrations)) {
+			echo "No migration has been done before.\n";
+		} else {
+			$n = count($migrations);
+			if ($limit > 0) {
+				echo "Showing the last $n applied " . ($n === 1 ? 'migration' : 'migrations') . ":\n";
+			} else {
+				echo "Total $n " . ($n === 1 ? 'migration has' : 'migrations have') . " been applied before:\n";
+			}
+			foreach ($migrations as $version => $time) {
+				echo "    (" . date('Y-m-d H:i:s', $time) . ') ' . $version . "\n";
+			}
+		}
+	}
+
+	/**
+	 * Displays the un-applied new migrations.
+	 *
+	 * This command will show the new migrations that have not been applied.
+	 * For example,
+	 *
+	 * ~~~
+	 * yiic migrate/new     # showing the first 10 new migrations
+	 * yiic migrate/new 5   # showing the first 5 new migrations
+	 * yiic migrate/new 0   # showing all new migrations
+	 * ~~~
+	 *
+	 * @param integer $limit the maximum number of new migrations to be displayed.
+	 * If it is 0, all available new migrations will be displayed.
+	 */
+	public function actionNew($limit = 10)
+	{
+		$limit = (int)$limit;
+		$migrations = $this->getNewMigrations();
+		if (empty($migrations)) {
+			echo "No new migrations found. Your system is up-to-date.\n";
+		} else {
+			$n = count($migrations);
+			if ($limit > 0 && $n > $limit) {
+				$migrations = array_slice($migrations, 0, $limit);
+				echo "Showing $limit out of $n new " . ($n === 1 ? 'migration' : 'migrations') . ":\n";
+			} else {
+				echo "Found $n new " . ($n === 1 ? 'migration' : 'migrations') . ":\n";
+			}
+
+			foreach ($migrations as $migration) {
+				echo "    " . $migration . "\n";
+			}
+		}
+	}
+
+	/**
+	 * Creates a new migration.
+	 *
+	 * This command creates a new migration using the available migration template.
+	 * After using this command, developers should modify the created migration
+	 * skeleton by filling up the actual migration logic.
+	 *
+	 * ~~~
+	 * yiic migrate/create create_user_table
+	 * ~~~
+	 *
+	 * @param string $name the name of the new migration. This should only contain
+	 * letters, digits and/or underscores.
+	 * @throws Exception if the name argument is invalid.
+	 */
+	public function actionCreate($name)
+	{
+		if (!preg_match('/^\w+$/', $name)) {
+			throw new Exception("The migration name should contain letters, digits and/or underscore characters only.");
+		}
+
+		$name = 'm' . gmdate('ymd_His') . '_' . $name;
+		$file = $this->migrationPath . DIRECTORY_SEPARATOR . $name . '.php';
+
+		if ($this->confirm("Create new migration '$file'?")) {
+			$content = $this->renderFile(Yii::getAlias($this->templateFile), array(
+				'className' => $name,
+			));
+			file_put_contents($file, $content);
+			echo "New migration created successfully.\n";
+		}
+	}
+
+	/**
+	 * Upgrades with the specified migration class.
+	 * @param string $class the migration class name
+	 * @return boolean whether the migration is successful
+	 */
+	protected function migrateUp($class)
+	{
+		if ($class === self::BASE_MIGRATION) {
+			return true;
+		}
+
+		echo "*** applying $class\n";
+		$start = microtime(true);
+		$migration = $this->createMigration($class);
+		if ($migration->up() !== false) {
+			$this->db->createCommand()->insert($this->migrationTable, array(
+				'version' => $class,
+				'apply_time' => time(),
+			))->execute();
+			$time = microtime(true) - $start;
+			echo "*** applied $class (time: " . sprintf("%.3f", $time) . "s)\n\n";
+			return true;
+		} else {
+			$time = microtime(true) - $start;
+			echo "*** failed to apply $class (time: " . sprintf("%.3f", $time) . "s)\n\n";
+			return false;
+		}
+	}
+
+	/**
+	 * Downgrades with the specified migration class.
+	 * @param string $class the migration class name
+	 * @return boolean whether the migration is successful
+	 */
+	protected function migrateDown($class)
+	{
+		if ($class === self::BASE_MIGRATION) {
+			return true;
+		}
+
+		echo "*** reverting $class\n";
+		$start = microtime(true);
+		$migration = $this->createMigration($class);
+		if ($migration->down() !== false) {
+			$this->db->createCommand()->delete($this->migrationTable, array(
+				'version' => $class,
+			))->execute();
+			$time = microtime(true) - $start;
+			echo "*** reverted $class (time: " . sprintf("%.3f", $time) . "s)\n\n";
+			return true;
+		} else {
+			$time = microtime(true) - $start;
+			echo "*** failed to revert $class (time: " . sprintf("%.3f", $time) . "s)\n\n";
+			return false;
+		}
+	}
+
+	/**
+	 * Creates a new migration instance.
+	 * @param string $class the migration class name
+	 * @return \yii\db\Migration the migration instance
+	 */
+	protected function createMigration($class)
+	{
+		$file = $this->migrationPath . DIRECTORY_SEPARATOR . $class . '.php';
+		require_once($file);
+		return new $class(array(
+			'db' => $this->db,
+		));
+	}
+
+	/**
+	 * Returns the migration history.
+	 * @param integer $limit the maximum number of records in the history to be returned
+	 * @return array the migration history
+	 */
+	protected function getMigrationHistory($limit)
+	{
+		if ($this->db->schema->getTableSchema($this->migrationTable) === null) {
+			$this->createMigrationHistoryTable();
+		}
+		$query = new Query;
+		$rows = $query->select(array('version', 'apply_time'))
+			->from($this->migrationTable)
+			->orderBy('version DESC')
+			->limit($limit)
+			->createCommand()
+			->queryAll();
+		$history = ArrayHelper::map($rows, 'version', 'apply_time');
+		unset($history[self::BASE_MIGRATION]);
+		return $history;
+	}
+
+	/**
+	 * Creates the migration history table.
+	 */
+	protected function createMigrationHistoryTable()
+	{
+		echo 'Creating migration history table "' . $this->migrationTable . '"...';
+		$this->db->createCommand()->createTable($this->migrationTable, array(
+			'version' => 'varchar(255) NOT NULL PRIMARY KEY',
+			'apply_time' => 'integer',
+		))->execute();
+		$this->db->createCommand()->insert($this->migrationTable, array(
+			'version' => self::BASE_MIGRATION,
+			'apply_time' => time(),
+		))->execute();
+		echo "done.\n";
+	}
+
+	/**
+	 * Returns the migrations that are not applied.
+	 * @return array list of new migrations
+	 */
+	protected function getNewMigrations()
+	{
+		$applied = array();
+		foreach ($this->getMigrationHistory(-1) as $version => $time) {
+			$applied[substr($version, 1, 13)] = true;
+		}
+
+		$migrations = array();
+		$handle = opendir($this->migrationPath);
+		while (($file = readdir($handle)) !== false) {
+			if ($file === '.' || $file === '..') {
+				continue;
+			}
+			$path = $this->migrationPath . DIRECTORY_SEPARATOR . $file;
+			if (preg_match('/^(m(\d{6}_\d{6})_.*?)\.php$/', $file, $matches) && is_file($path) && !isset($applied[$matches[2]])) {
+				$migrations[] = $matches[1];
+			}
+		}
+		closedir($handle);
+		sort($migrations);
+		return $migrations;
+	}
+}
diff --git a/yii/console/runtime/.gitignore b/yii/console/runtime/.gitignore
new file mode 100644
index 0000000..f59ec20
--- /dev/null
+++ b/yii/console/runtime/.gitignore
@@ -0,0 +1 @@
+*
\ No newline at end of file
diff --git a/yii/db/ActiveQuery.php b/yii/db/ActiveQuery.php
new file mode 100644
index 0000000..dac94c8
--- /dev/null
+++ b/yii/db/ActiveQuery.php
@@ -0,0 +1,380 @@
+<?php
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\db;
+
+use yii\db\Connection;
+use yii\db\Command;
+use yii\db\QueryBuilder;
+use yii\db\Expression;
+
+/**
+ * ActiveQuery represents a DB query associated with an Active Record class.
+ *
+ * ActiveQuery instances are usually created by [[ActiveRecord::find()]], [[ActiveRecord::findBySql()]]
+ * and [[ActiveRecord::count()]].
+ *
+ * ActiveQuery mainly provides the following methods to retrieve the query results:
+ *
+ * - [[one()]]: returns a single record populated with the first row of data.
+ * - [[all()]]: returns all records based on the query results.
+ * - [[count()]]: returns the number of records.
+ * - [[sum()]]: returns the sum over the specified column.
+ * - [[average()]]: returns the average over the specified column.
+ * - [[min()]]: returns the min over the specified column.
+ * - [[max()]]: returns the max over the specified column.
+ * - [[scalar()]]: returns the value of the first column in the first row of the query result.
+ * - [[exists()]]: returns a value indicating whether the query result has data or not.
+ *
+ * Because ActiveQuery extends from [[Query]], one can use query methods, such as [[where()]],
+ * [[orderBy()]] to customize the query options.
+ *
+ * ActiveQuery also provides the following additional query options:
+ *
+ * - [[with()]]: list of relations that this query should be performed with.
+ * - [[indexBy()]]: the name of the column by which the query result should be indexed.
+ * - [[asArray()]]: whether to return each record as an array.
+ *
+ * These options can be configured using methods of the same name. For example:
+ *
+ * ~~~
+ * $customers = Customer::find()->with('orders')->asArray()->all();
+ * ~~~
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class ActiveQuery extends Query
+{
+	/**
+	 * @var string the name of the ActiveRecord class.
+	 */
+	public $modelClass;
+	/**
+	 * @var array list of relations that this query should be performed with
+	 */
+	public $with;
+	/**
+	 * @var string the name of the column by which query results should be indexed by.
+	 * This is only used when the query result is returned as an array when calling [[all()]].
+	 */
+	public $indexBy;
+	/**
+	 * @var boolean whether to return each record as an array. If false (default), an object
+	 * of [[modelClass]] will be created to represent each record.
+	 */
+	public $asArray;
+	/**
+	 * @var string the SQL statement to be executed for retrieving AR records.
+	 * This is set by [[ActiveRecord::findBySql()]].
+	 */
+	public $sql;
+
+
+	/**
+	 * PHP magic method.
+	 * This method allows calling static method defined in [[modelClass]] via this query object.
+	 * It is mainly implemented for supporting the feature of scope.
+	 * @param string $name the method name to be called
+	 * @param array $params the parameters passed to the method
+	 * @return mixed the method return result
+	 */
+	public function __call($name, $params)
+	{
+		if (method_exists($this->modelClass, $name)) {
+			array_unshift($params, $this);
+			call_user_func_array(array($this->modelClass, $name), $params);
+			return $this;
+		} else {
+			return parent::__call($name, $params);
+		}
+	}
+
+	/**
+	 * Executes query and returns all results as an array.
+	 * @return array the query results. If the query results in nothing, an empty array will be returned.
+	 */
+	public function all()
+	{
+		$command = $this->createCommand();
+		$rows = $command->queryAll();
+		if (!empty($rows)) {
+			$models = $this->createModels($rows);
+			if (!empty($this->with)) {
+				$this->populateRelations($models, $this->with);
+			}
+			return $models;
+		} else {
+			return array();
+		}
+	}
+
+	/**
+	 * Executes query and returns a single row of result.
+	 * @return ActiveRecord|array|null a single row of query result. Depending on the setting of [[asArray]],
+	 * the query result may be either an array or an ActiveRecord object. Null will be returned
+	 * if the query results in nothing.
+	 */
+	public function one()
+	{
+		$command = $this->createCommand();
+		$row = $command->queryRow();
+		if ($row !== false && !$this->asArray) {
+			/** @var $class ActiveRecord */
+			$class = $this->modelClass;
+			$model = $class::create($row);
+			if (!empty($this->with)) {
+				$models = array($model);
+				$this->populateRelations($models, $this->with);
+				$model = $models[0];
+			}
+			return $model;
+		} else {
+			return $row === false ? null : $row;
+		}
+	}
+
+	/**
+	 * Returns the number of records.
+	 * @param string $q the COUNT expression. Defaults to '*'.
+	 * Make sure you properly quote column names.
+	 * @return integer number of records
+	 */
+	public function count($q = '*')
+	{
+		$this->select = array("COUNT($q)");
+		return $this->createCommand()->queryScalar();
+	}
+
+	/**
+	 * Returns the sum of the specified column values.
+	 * @param string $q the column name or expression.
+	 * Make sure you properly quote column names.
+	 * @return integer the sum of the specified column values
+	 */
+	public function sum($q)
+	{
+		$this->select = array("SUM($q)");
+		return $this->createCommand()->queryScalar();
+	}
+
+	/**
+	 * Returns the average of the specified column values.
+	 * @param string $q the column name or expression.
+	 * Make sure you properly quote column names.
+	 * @return integer the average of the specified column values.
+	 */
+	public function average($q)
+	{
+		$this->select = array("AVG($q)");
+		return $this->createCommand()->queryScalar();
+	}
+
+	/**
+	 * Returns the minimum of the specified column values.
+	 * @param string $q the column name or expression.
+	 * Make sure you properly quote column names.
+	 * @return integer the minimum of the specified column values.
+	 */
+	public function min($q)
+	{
+		$this->select = array("MIN($q)");
+		return $this->createCommand()->queryScalar();
+	}
+
+	/**
+	 * Returns the maximum of the specified column values.
+	 * @param string $q the column name or expression.
+	 * Make sure you properly quote column names.
+	 * @return integer the maximum of the specified column values.
+	 */
+	public function max($q)
+	{
+		$this->select = array("MAX($q)");
+		return $this->createCommand()->queryScalar();
+	}
+
+	/**
+	 * Returns the query result as a scalar value.
+	 * The value returned will be the first column in the first row of the query results.
+	 * @return string|boolean the value of the first column in the first row of the query result.
+	 * False is returned if the query result is empty.
+	 */
+	public function scalar()
+	{
+		return $this->createCommand()->queryScalar();
+	}
+
+	/**
+	 * Returns a value indicating whether the query result contains any row of data.
+	 * @return boolean whether the query result contains any row of data.
+	 */
+	public function exists()
+	{
+		$this->select = array(new Expression('1'));
+		return $this->scalar() !== false;
+	}
+
+	/**
+	 * Creates a DB command that can be used to execute this query.
+	 * @param Connection $db the DB connection used to create the DB command.
+	 * If null, the DB connection returned by [[modelClass]] will be used.
+	 * @return Command the created DB command instance.
+	 */
+	public function createCommand($db = null)
+	{
+		/** @var $modelClass ActiveRecord */
+		$modelClass = $this->modelClass;
+		if ($db === null) {
+			$db = $modelClass::getDb();
+		}
+		if ($this->sql === null) {
+			if ($this->from === null) {
+				$tableName = $modelClass::tableName();
+				$this->from = array($tableName);
+			}
+			/** @var $qb QueryBuilder */
+			$qb = $db->getQueryBuilder();
+			$this->sql = $qb->build($this);
+		}
+		return $db->createCommand($this->sql, $this->params);
+	}
+
+	/**
+	 * Sets the [[asArray]] property.
+	 * @param boolean $value whether to return the query results in terms of arrays instead of Active Records.
+	 * @return ActiveQuery the query object itself
+	 */
+	public function asArray($value = true)
+	{
+		$this->asArray = $value;
+		return $this;
+	}
+
+	/**
+	 * Specifies the relations with which this query should be performed.
+	 *
+	 * The parameters to this method can be either one or multiple strings, or a single array
+	 * of relation names and the optional callbacks to customize the relations.
+	 *
+	 * The followings are some usage examples:
+	 *
+	 * ~~~
+	 * // find customers together with their orders and country
+	 * Customer::find()->with('orders', 'country')->all();
+	 * // find customers together with their country and orders of status 1
+	 * Customer::find()->with(array(
+	 *     'orders' => function($query) {
+	 *         $query->andWhere('status = 1');
+	 *     },
+	 *     'country',
+	 * ))->all();
+	 * ~~~
+	 *
+	 * @return ActiveQuery the query object itself
+	 */
+	public function with()
+	{
+		$this->with = func_get_args();
+		if (isset($this->with[0]) && is_array($this->with[0])) {
+			// the parameter is given as an array
+			$this->with = $this->with[0];
+		}
+		return $this;
+	}
+
+	/**
+	 * Sets the [[indexBy]] property.
+	 * @param string $column the name of the column by which the query results should be indexed by.
+	 * @return ActiveQuery the query object itself
+	 */
+	public function indexBy($column)
+	{
+		$this->indexBy = $column;
+		return $this;
+	}
+
+	private function createModels($rows)
+	{
+		$models = array();
+		if ($this->asArray) {
+			if ($this->indexBy === null) {
+				return $rows;
+			}
+			foreach ($rows as $row) {
+				$models[$row[$this->indexBy]] = $row;
+			}
+		} else {
+			/** @var $class ActiveRecord */
+			$class = $this->modelClass;
+			if ($this->indexBy === null) {
+				foreach ($rows as $row) {
+					$models[] = $class::create($row);
+				}
+			} else {
+				foreach ($rows as $row) {
+					$model = $class::create($row);
+					$models[$model->{$this->indexBy}] = $model;
+				}
+			}
+		}
+		return $models;
+	}
+
+	private function populateRelations(&$models, $with)
+	{
+		$primaryModel = new $this->modelClass;
+		$relations = $this->normalizeRelations($primaryModel, $with);
+		foreach ($relations as $name => $relation) {
+			if ($relation->asArray === null) {
+				// inherit asArray from primary query
+				$relation->asArray = $this->asArray;
+			}
+			$relation->findWith($name, $models);
+		}
+	}
+
+	/**
+	 * @param ActiveRecord $model
+	 * @param array $with
+	 * @return ActiveRelation[]
+	 */
+	private function normalizeRelations($model, $with)
+	{
+		$relations = array();
+		foreach ($with as $name => $callback) {
+			if (is_integer($name)) {
+				$name = $callback;
+				$callback = null;
+			}
+			if (($pos = strpos($name, '.')) !== false) {
+				// with sub-relations
+				$childName = substr($name, $pos + 1);
+				$name = substr($name, 0, $pos);
+			} else {
+				$childName = null;
+			}
+
+			$t = strtolower($name);
+			if (!isset($relations[$t])) {
+				$relation = $model->getRelation($name);
+				$relation->primaryModel = null;
+				$relations[$t] = $relation;
+			} else {
+				$relation = $relations[$t];
+			}
+
+			if (isset($childName)) {
+				$relation->with[$childName] = $callback;
+			} elseif ($callback !== null) {
+				call_user_func($callback, $relation);
+			}
+		}
+		return $relations;
+	}
+}
diff --git a/yii/db/ActiveRecord.php b/yii/db/ActiveRecord.php
new file mode 100644
index 0000000..356819d
--- /dev/null
+++ b/yii/db/ActiveRecord.php
@@ -0,0 +1,1339 @@
+<?php
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\db;
+
+use yii\base\InvalidConfigException;
+use yii\base\Model;
+use yii\base\InvalidParamException;
+use yii\base\ModelEvent;
+use yii\base\UnknownMethodException;
+use yii\base\InvalidCallException;
+use yii\db\Connection;
+use yii\db\TableSchema;
+use yii\db\Expression;
+use yii\helpers\StringHelper;
+
+/**
+ * ActiveRecord is the base class for classes representing relational data in terms of objects.
+ *
+ * @include @yii/db/ActiveRecord.md
+ *
+ * @property Connection $db the database connection used by this AR class.
+ * @property TableSchema $tableSchema the schema information of the DB table associated with this AR class.
+ * @property array $oldAttributes the old attribute values (name-value pairs).
+ * @property array $dirtyAttributes the changed attribute values (name-value pairs).
+ * @property boolean $isNewRecord whether the record is new and should be inserted when calling [[save()]].
+ * @property mixed $primaryKey the primary key value.
+ * @property mixed $oldPrimaryKey the old primary key value.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class ActiveRecord extends Model
+{
+	/**
+	 * @event Event an event that is triggered when the record is initialized via [[init()]].
+	 */
+	const EVENT_INIT = 'init';
+	/**
+	 * @event Event an event that is triggered after the record is created and populated with query result.
+	 */
+	const EVENT_AFTER_FIND = 'afterFind';
+	/**
+	 * @event ModelEvent an event that is triggered before inserting a record.
+	 * You may set [[ModelEvent::isValid]] to be false to stop the insertion.
+	 */
+	const EVENT_BEFORE_INSERT = 'beforeInsert';
+	/**
+	 * @event Event an event that is triggered after a record is inserted.
+	 */
+	const EVENT_AFTER_INSERT = 'afterInsert';
+	/**
+	 * @event ModelEvent an event that is triggered before updating a record.
+	 * You may set [[ModelEvent::isValid]] to be false to stop the update.
+	 */
+	const EVENT_BEFORE_UPDATE = 'beforeUpdate';
+	/**
+	 * @event Event an event that is triggered after a record is updated.
+	 */
+	const EVENT_AFTER_UPDATE = 'afterUpdate';
+	/**
+	 * @event ModelEvent an event that is triggered before deleting a record.
+	 * You may set [[ModelEvent::isValid]] to be false to stop the deletion.
+	 */
+	const EVENT_BEFORE_DELETE = 'beforeDelete';
+	/**
+	 * @event Event an event that is triggered after a record is deleted.
+	 */
+	const EVENT_AFTER_DELETE = 'afterDelete';
+
+	/**
+	 * @var array attribute values indexed by attribute names
+	 */
+	private $_attributes = array();
+	/**
+	 * @var array old attribute values indexed by attribute names.
+	 */
+	private $_oldAttributes;
+	/**
+	 * @var array related models indexed by the relation names
+	 */
+	private $_related;
+
+
+	/**
+	 * Returns the database connection used by this AR class.
+	 * By default, the "db" application component is used as the database connection.
+	 * You may override this method if you want to use a different database connection.
+	 * @return Connection the database connection used by this AR class.
+	 */
+	public static function getDb()
+	{
+		return \Yii::$app->getDb();
+	}
+
+	/**
+	 * Creates an [[ActiveQuery]] instance for query purpose.
+	 *
+	 * @include @yii/db/ActiveRecord-find.md
+	 *
+	 * @param mixed $q the query parameter. This can be one of the followings:
+	 *
+	 *  - a scalar value (integer or string): query by a single primary key value and return the
+	 *    corresponding record.
+	 *  - an array of name-value pairs: query by a set of column values and return a single record matching all of them.
+	 *  - null: return a new [[ActiveQuery]] object for further query purpose.
+	 *
+	 * @return ActiveQuery|ActiveRecord|null When `$q` is null, a new [[ActiveQuery]] instance
+	 * is returned; when `$q` is a scalar or an array, an ActiveRecord object matching it will be
+	 * returned (null will be returned if there is no matching).
+	 * @throws InvalidConfigException if the AR class does not have a primary key
+	 * @see createQuery()
+	 */
+	public static function find($q = null)
+	{
+		$query = static::createQuery();
+		if (is_array($q)) {
+			return $query->where($q)->one();
+		} elseif ($q !== null) {
+			// query by primary key
+			$primaryKey = static::primaryKey();
+			if (isset($primaryKey[0])) {
+				return $query->where(array($primaryKey[0] => $q))->one();
+			} else {
+				throw new InvalidConfigException(get_called_class() . ' must have a primary key.');
+			}
+		}
+		return $query;
+	}
+
+	/**
+	 * Creates an [[ActiveQuery]] instance with a given SQL statement.
+	 *
+	 * Note that because the SQL statement is already specified, calling additional
+	 * query modification methods (such as `where()`, `order()`) on the created [[ActiveQuery]]
+	 * instance will have no effect. However, calling `with()`, `asArray()` or `indexBy()` is
+	 * still fine.
+	 *
+	 * Below is an example:
+	 *
+	 * ~~~
+	 * $customers = Customer::findBySql('SELECT * FROM tbl_customer')->all();
+	 * ~~~
+	 *
+	 * @param string $sql the SQL statement to be executed
+	 * @param array $params parameters to be bound to the SQL statement during execution.
+	 * @return ActiveQuery the newly created [[ActiveQuery]] instance
+	 */
+	public static function findBySql($sql, $params = array())
+	{
+		$query = static::createQuery();
+		$query->sql = $sql;
+		return $query->params($params);
+	}
+
+	/**
+	 * Updates the whole table using the provided attribute values and conditions.
+	 * For example, to change the status to be 1 for all customers whose status is 2:
+	 *
+	 * ~~~
+	 * Customer::updateAll(array('status' => 1), 'status = 2');
+	 * ~~~
+	 *
+	 * @param array $attributes attribute values (name-value pairs) to be saved into the table
+	 * @param string|array $condition the conditions that will be put in the WHERE part of the UPDATE SQL.
+	 * Please refer to [[Query::where()]] on how to specify this parameter.
+	 * @param array $params the parameters (name=>value) to be bound to the query.
+	 * @return integer the number of rows updated
+	 */
+	public static function updateAll($attributes, $condition = '', $params = array())
+	{
+		$command = static::getDb()->createCommand();
+		$command->update(static::tableName(), $attributes, $condition, $params);
+		return $command->execute();
+	}
+
+	/**
+	 * Updates the whole table using the provided counter changes and conditions.
+	 * For example, to increment all customers' age by 1,
+	 *
+	 * ~~~
+	 * Customer::updateAllCounters(array('age' => 1));
+	 * ~~~
+	 *
+	 * @param array $counters the counters to be updated (attribute name => increment value).
+	 * Use negative values if you want to decrement the counters.
+	 * @param string|array $condition the conditions that will be put in the WHERE part of the UPDATE SQL.
+	 * Please refer to [[Query::where()]] on how to specify this parameter.
+	 * @param array $params the parameters (name=>value) to be bound to the query.
+	 * Do not name the parameters as `:bp0`, `:bp1`, etc., because they are used internally by this method.
+	 * @return integer the number of rows updated
+	 */
+	public static function updateAllCounters($counters, $condition = '', $params = array())
+	{
+		$n = 0;
+		foreach ($counters as $name => $value) {
+			$counters[$name] = new Expression("[[$name]]+:bp{$n}", array(":bp{$n}" => $value));
+			$n++;
+		}
+		$command = static::getDb()->createCommand();
+		$command->update(static::tableName(), $counters, $condition, $params);
+		return $command->execute();
+	}
+
+	/**
+	 * Deletes rows in the table using the provided conditions.
+	 * WARNING: If you do not specify any condition, this method will delete ALL rows in the table.
+	 *
+	 * For example, to delete all customers whose status is 3:
+	 *
+	 * ~~~
+	 * Customer::deleteAll('status = 3');
+	 * ~~~
+	 *
+	 * @param string|array $condition the conditions that will be put in the WHERE part of the DELETE SQL.
+	 * Please refer to [[Query::where()]] on how to specify this parameter.
+	 * @param array $params the parameters (name=>value) to be bound to the query.
+	 * @return integer the number of rows deleted
+	 */
+	public static function deleteAll($condition = '', $params = array())
+	{
+		$command = static::getDb()->createCommand();
+		$command->delete(static::tableName(), $condition, $params);
+		return $command->execute();
+	}
+
+	/**
+	 * Creates an [[ActiveQuery]] instance.
+	 * This method is called by [[find()]], [[findBySql()]] and [[count()]] to start a SELECT query.
+	 * You may override this method to return a customized query (e.g. `CustomerQuery` specified
+	 * written for querying `Customer` purpose.)
+	 * @return ActiveQuery the newly created [[ActiveQuery]] instance.
+	 */
+	public static function createQuery()
+	{
+		return new ActiveQuery(array(
+			'modelClass' => get_called_class(),
+		));
+	}
+
+	/**
+	 * Declares the name of the database table associated with this AR class.
+	 * By default this method returns the class name as the table name by calling [[StringHelper::camel2id()]]
+	 * with prefix 'tbl_'. For example, 'Customer' becomes 'tbl_customer', and 'OrderItem' becomes
+	 * 'tbl_order_item'. You may override this method if the table is not named after this convention.
+	 * @return string the table name
+	 */
+	public static function tableName()
+	{
+		return 'tbl_' . StringHelper::camel2id(StringHelper::basename(get_called_class()), '_');
+	}
+
+	/**
+	 * Returns the schema information of the DB table associated with this AR class.
+	 * @return TableSchema the schema information of the DB table associated with this AR class.
+	 */
+	public static function getTableSchema()
+	{
+		return static::getDb()->getTableSchema(static::tableName());
+	}
+
+	/**
+	 * Returns the primary key name(s) for this AR class.
+	 * The default implementation will return the primary key(s) as declared
+	 * in the DB table that is associated with this AR class.
+	 *
+	 * If the DB table does not declare any primary key, you should override
+	 * this method to return the attributes that you want to use as primary keys
+	 * for this AR class.
+	 *
+	 * Note that an array should be returned even for a table with single primary key.
+	 *
+	 * @return string[] the primary keys of the associated database table.
+	 */
+	public static function primaryKey()
+	{
+		return static::getTableSchema()->primaryKey;
+	}
+
+	/**
+	 * Returns the name of the column that stores the lock version for implementing optimistic locking.
+	 *
+	 * Optimistic locking allows multiple users to access the same record for edits and avoids
+	 * potential conflicts. In case when a user attempts to save the record upon some staled data
+	 * (because another user has modified the data), a [[StaleObjectException]] exception will be thrown,
+	 * and the update or deletion is skipped.
+	 *
+	 * Optimized locking is only supported by [[update()]] and [[delete()]].
+	 *
+	 * To use optimized locking:
+	 *
+	 * 1. Create a column to store the version number of each row. The column type should be `BIGINT DEFAULT 0`.
+	 *    Override this method to return the name of this column.
+	 * 2. In the Web form that collects the user input, add a hidden field that stores
+	 *    the lock version of the recording being updated.
+	 * 3. In the controller action that does the data updating, try to catch the [[StaleObjectException]]
+	 *    and implement necessary business logic (e.g. merging the changes, prompting stated data)
+	 *    to resolve the conflict.
+	 *
+	 * @return string the column name that stores the lock version of a table row.
+	 * If null is returned (default implemented), optimistic locking will not be supported.
+	 */
+	public function optimisticLock()
+	{
+		return null;
+	}
+
+	/**
+	 * PHP getter magic method.
+	 * This method is overridden so that attributes and related objects can be accessed like properties.
+	 * @param string $name property name
+	 * @return mixed property value
+	 * @see getAttribute
+	 */
+	public function __get($name)
+	{
+		if (isset($this->_attributes[$name]) || array_key_exists($name, $this->_attributes)) {
+			return $this->_attributes[$name];
+		} elseif (isset($this->getTableSchema()->columns[$name])) {
+			return null;
+		} else {
+			$t = strtolower($name);
+			if (isset($this->_related[$t]) || $this->_related !== null && array_key_exists($t, $this->_related)) {
+				return $this->_related[$t];
+			}
+			$value = parent::__get($name);
+			if ($value instanceof ActiveRelation) {
+				return $this->_related[$t] = $value->multiple ? $value->all() : $value->one();
+			} else {
+				return $value;
+			}
+		}
+	}
+
+	/**
+	 * PHP setter magic method.
+	 * This method is overridden so that AR attributes can be accessed like properties.
+	 * @param string $name property name
+	 * @param mixed $value property value
+	 */
+	public function __set($name, $value)
+	{
+		if (isset($this->_attributes[$name]) || isset($this->getTableSchema()->columns[$name])) {
+			$this->_attributes[$name] = $value;
+		} else {
+			parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Checks if a property value is null.
+	 * This method overrides the parent implementation by checking if the named attribute is null or not.
+	 * @param string $name the property name or the event name
+	 * @return boolean whether the property value is null
+	 */
+	public function __isset($name)
+	{
+		try {
+			return $this->__get($name) !== null;
+		} catch (\Exception $e) {
+			return false;
+		}
+	}
+
+	/**
+	 * Sets a component property to be null.
+	 * This method overrides the parent implementation by clearing
+	 * the specified attribute value.
+	 * @param string $name the property name or the event name
+	 */
+	public function __unset($name)
+	{
+		if (isset($this->getTableSchema()->columns[$name])) {
+			unset($this->_attributes[$name]);
+		} else {
+			$t = strtolower($name);
+			if (isset($this->_related[$t])) {
+				unset($this->_related[$t]);
+			} else {
+				parent::__unset($name);
+			}
+		}
+	}
+
+	/**
+	 * Declares a `has-one` relation.
+	 * The declaration is returned in terms of an [[ActiveRelation]] instance
+	 * through which the related record can be queried and retrieved back.
+	 *
+	 * A `has-one` relation means that there is at most one related record matching
+	 * the criteria set by this relation, e.g., a customer has one country.
+	 *
+	 * For example, to declare the `country` relation for `Customer` class, we can write
+	 * the following code in the `Customer` class:
+	 *
+	 * ~~~
+	 * public function getCountry()
+	 * {
+	 *     return $this->hasOne('Country', array('id' => 'country_id'));
+	 * }
+	 * ~~~
+	 *
+	 * Note that in the above, the 'id' key in the `$link` parameter refers to an attribute name
+	 * in the related class `Country`, while the 'country_id' value refers to an attribute name
+	 * in the current AR class.
+	 *
+	 * Call methods declared in [[ActiveRelation]] to further customize the relation.
+	 *
+	 * @param string $class the class name of the related record
+	 * @param array $link the primary-foreign key constraint. The keys of the array refer to
+	 * the columns in the table associated with the `$class` model, while the values of the
+	 * array refer to the corresponding columns in the table associated with this AR class.
+	 * @return ActiveRelation the relation object.
+	 */
+	public function hasOne($class, $link)
+	{
+		return new ActiveRelation(array(
+			'modelClass' => $this->getNamespacedClass($class),
+			'primaryModel' => $this,
+			'link' => $link,
+			'multiple' => false,
+		));
+	}
+
+	/**
+	 * Declares a `has-many` relation.
+	 * The declaration is returned in terms of an [[ActiveRelation]] instance
+	 * through which the related record can be queried and retrieved back.
+	 *
+	 * A `has-many` relation means that there are multiple related records matching
+	 * the criteria set by this relation, e.g., a customer has many orders.
+	 *
+	 * For example, to declare the `orders` relation for `Customer` class, we can write
+	 * the following code in the `Customer` class:
+	 *
+	 * ~~~
+	 * public function getOrders()
+	 * {
+	 *     return $this->hasMany('Order', array('customer_id' => 'id'));
+	 * }
+	 * ~~~
+	 *
+	 * Note that in the above, the 'customer_id' key in the `$link` parameter refers to
+	 * an attribute name in the related class `Order`, while the 'id' value refers to
+	 * an attribute name in the current AR class.
+	 *
+	 * @param string $class the class name of the related record
+	 * @param array $link the primary-foreign key constraint. The keys of the array refer to
+	 * the columns in the table associated with the `$class` model, while the values of the
+	 * array refer to the corresponding columns in the table associated with this AR class.
+	 * @return ActiveRelation the relation object.
+	 */
+	public function hasMany($class, $link)
+	{
+		return new ActiveRelation(array(
+			'modelClass' => $this->getNamespacedClass($class),
+			'primaryModel' => $this,
+			'link' => $link,
+			'multiple' => true,
+		));
+	}
+
+	/**
+	 * Populates the named relation with the related records.
+	 * Note that this method does not check if the relation exists or not.
+	 * @param string $name the relation name (case-insensitive)
+	 * @param ActiveRecord|array|null the related records to be populated into the relation.
+	 */
+	public function populateRelation($name, $records)
+	{
+		$this->_related[strtolower($name)] = $records;
+	}
+
+	/**
+	 * Returns the list of all attribute names of the model.
+	 * The default implementation will return all column names of the table associated with this AR class.
+	 * @return array list of attribute names.
+	 */
+	public function attributes()
+	{
+		return array_keys($this->getTableSchema()->columns);
+	}
+
+	/**
+	 * Returns the named attribute value.
+	 * If this record is the result of a query and the attribute is not loaded,
+	 * null will be returned.
+	 * @param string $name the attribute name
+	 * @return mixed the attribute value. Null if the attribute is not set or does not exist.
+	 * @see hasAttribute
+	 */
+	public function getAttribute($name)
+	{
+		return isset($this->_attributes[$name]) ? $this->_attributes[$name] : null;
+	}
+
+	/**
+	 * Sets the named attribute value.
+	 * @param string $name the attribute name
+	 * @param mixed $value the attribute value.
+	 * @see hasAttribute
+	 */
+	public function setAttribute($name, $value)
+	{
+		$this->_attributes[$name] = $value;
+	}
+
+	/**
+	 * Returns the old attribute values.
+	 * @return array the old attribute values (name-value pairs)
+	 */
+	public function getOldAttributes()
+	{
+		return $this->_oldAttributes === null ? array() : $this->_oldAttributes;
+	}
+
+	/**
+	 * Sets the old attribute values.
+	 * All existing old attribute values will be discarded.
+	 * @param array $values old attribute values to be set.
+	 */
+	public function setOldAttributes($values)
+	{
+		$this->_oldAttributes = $values;
+	}
+
+	/**
+	 * Returns the old value of the named attribute.
+	 * If this record is the result of a query and the attribute is not loaded,
+	 * null will be returned.
+	 * @param string $name the attribute name
+	 * @return mixed the old attribute value. Null if the attribute is not loaded before
+	 * or does not exist.
+	 * @see hasAttribute
+	 */
+	public function getOldAttribute($name)
+	{
+		return isset($this->_oldAttributes[$name]) ? $this->_oldAttributes[$name] : null;
+	}
+
+	/**
+	 * Sets the old value of the named attribute.
+	 * @param string $name the attribute name
+	 * @param mixed $value the old attribute value.
+	 * @see hasAttribute
+	 */
+	public function setOldAttribute($name, $value)
+	{
+		$this->_oldAttributes[$name] = $value;
+	}
+
+	/**
+	 * Returns a value indicating whether the named attribute has been changed.
+	 * @param string $name the name of the attribute
+	 * @return boolean whether the attribute has been changed
+	 */
+	public function isAttributeChanged($name)
+	{
+		if (isset($this->_attributes[$name], $this->_oldAttributes[$name])) {
+			return $this->_attributes[$name] !== $this->_oldAttributes[$name];
+		} else {
+			return isset($this->_attributes[$name]) || isset($this->_oldAttributes);
+		}
+	}
+
+	/**
+	 * Returns the attribute values that have been modified since they are loaded or saved most recently.
+	 * @param string[]|null $names the names of the attributes whose values may be returned if they are
+	 * changed recently. If null, [[attributes()]] will be used.
+	 * @return array the changed attribute values (name-value pairs)
+	 */
+	public function getDirtyAttributes($names = null)
+	{
+		if ($names === null) {
+			$names = $this->attributes();
+		}
+		$names = array_flip($names);
+		$attributes = array();
+		if ($this->_oldAttributes === null) {
+			foreach ($this->_attributes as $name => $value) {
+				if (isset($names[$name])) {
+					$attributes[$name] = $value;
+				}
+			}
+		} else {
+			foreach ($this->_attributes as $name => $value) {
+				if (isset($names[$name]) && (!array_key_exists($name, $this->_oldAttributes) || $value !== $this->_oldAttributes[$name])) {
+					$attributes[$name] = $value;
+				}
+			}
+		}
+		return $attributes;
+	}
+
+	/**
+	 * Saves the current record.
+	 *
+	 * This method will call [[insert()]] when [[isNewRecord]] is true, or [[update()]]
+	 * when [[isNewRecord]] is false.
+	 *
+	 * For example, to save a customer record:
+	 *
+	 * ~~~
+	 * $customer = new Customer;  // or $customer = Customer::find($id);
+	 * $customer->name = $name;
+	 * $customer->email = $email;
+	 * $customer->save();
+	 * ~~~
+	 *
+	 *
+	 * @param boolean $runValidation whether to perform validation before saving the record.
+	 * If the validation fails, the record will not be saved to database.
+	 * @param array $attributes list of attributes that need to be saved. Defaults to null,
+	 * meaning all attributes that are loaded from DB will be saved.
+	 * @return boolean whether the saving succeeds
+	 */
+	public function save($runValidation = true, $attributes = null)
+	{
+		if ($this->getIsNewRecord()) {
+			return $this->insert($runValidation, $attributes);
+		} else {
+			return $this->update($runValidation, $attributes) !== false;
+		}
+	}
+
+	/**
+	 * Inserts a row into the associated database table using the attribute values of this record.
+	 *
+	 * This method performs the following steps in order:
+	 *
+	 * 1. call [[beforeValidate()]] when `$runValidation` is true. If validation
+	 *    fails, it will skip the rest of the steps;
+	 * 2. call [[afterValidate()]] when `$runValidation` is true.
+	 * 3. call [[beforeSave()]]. If the method returns false, it will skip the
+	 *    rest of the steps;
+	 * 4. insert the record into database. If this fails, it will skip the rest of the steps;
+	 * 5. call [[afterSave()]];
+	 *
+	 * In the above step 1, 2, 3 and 5, events [[EVENT_BEFORE_VALIDATE]],
+	 * [[EVENT_BEFORE_INSERT]], [[EVENT_AFTER_INSERT]] and [[EVENT_AFTER_VALIDATE]]
+	 * will be raised by the corresponding methods.
+	 *
+	 * Only the [[changedAttributes|changed attribute values]] will be inserted into database.
+	 *
+	 * If the table's primary key is auto-incremental and is null during insertion,
+	 * it will be populated with the actual value after insertion.
+	 *
+	 * For example, to insert a customer record:
+	 *
+	 * ~~~
+	 * $customer = new Customer;
+	 * $customer->name = $name;
+	 * $customer->email = $email;
+	 * $customer->insert();
+	 * ~~~
+	 *
+	 * @param boolean $runValidation whether to perform validation before saving the record.
+	 * If the validation fails, the record will not be inserted into the database.
+	 * @param array $attributes list of attributes that need to be saved. Defaults to null,
+	 * meaning all attributes that are loaded from DB will be saved.
+	 * @return boolean whether the attributes are valid and the record is inserted successfully.
+	 */
+	public function insert($runValidation = true, $attributes = null)
+	{
+		if ($runValidation && !$this->validate($attributes) || !$this->beforeSave(true)) {
+			return false;
+		}
+		$values = $this->getDirtyAttributes($attributes);
+		if (empty($values)) {
+			foreach ($this->primaryKey() as $key) {
+				$values[$key] = isset($this->_attributes[$key]) ? $this->_attributes[$key] : null;
+			}
+		}
+		$db = static::getDb();
+		$command = $db->createCommand()->insert($this->tableName(), $values);
+		if ($command->execute()) {
+			$table = $this->getTableSchema();
+			if ($table->sequenceName !== null) {
+				foreach ($table->primaryKey as $name) {
+					if (!isset($this->_attributes[$name])) {
+						$this->_oldAttributes[$name] = $this->_attributes[$name] = $db->getLastInsertID($table->sequenceName);
+						break;
+					}
+				}
+			}
+			foreach ($values as $name => $value) {
+				$this->_oldAttributes[$name] = $value;
+			}
+			$this->afterSave(true);
+			return true;
+		}
+	}
+
+	/**
+	 * Saves the changes to this active record into the associated database table.
+	 *
+	 * This method performs the following steps in order:
+	 *
+	 * 1. call [[beforeValidate()]] when `$runValidation` is true. If validation
+	 *    fails, it will skip the rest of the steps;
+	 * 2. call [[afterValidate()]] when `$runValidation` is true.
+	 * 3. call [[beforeSave()]]. If the method returns false, it will skip the
+	 *    rest of the steps;
+	 * 4. save the record into database. If this fails, it will skip the rest of the steps;
+	 * 5. call [[afterSave()]];
+	 *
+	 * In the above step 1, 2, 3 and 5, events [[EVENT_BEFORE_VALIDATE]],
+	 * [[EVENT_BEFORE_UPDATE]], [[EVENT_AFTER_UPDATE]] and [[EVENT_AFTER_VALIDATE]]
+	 * will be raised by the corresponding methods.
+	 *
+	 * Only the [[changedAttributes|changed attribute values]] will be saved into database.
+	 *
+	 * For example, to update a customer record:
+	 *
+	 * ~~~
+	 * $customer = Customer::find($id);
+	 * $customer->name = $name;
+	 * $customer->email = $email;
+	 * $customer->update();
+	 * ~~~
+	 *
+	 * Note that it is possible the update does not affect any row in the table.
+	 * In this case, this method will return 0. For this reason, you should use the following
+	 * code to check if update() is successful or not:
+	 *
+	 * ~~~
+	 * if ($this->update() !== false) {
+	 *     // update successful
+	 * } else {
+	 *     // update failed
+	 * }
+	 * ~~~
+	 *
+	 * @param boolean $runValidation whether to perform validation before saving the record.
+	 * If the validation fails, the record will not be inserted into the database.
+	 * @param array $attributes list of attributes that need to be saved. Defaults to null,
+	 * meaning all attributes that are loaded from DB will be saved.
+	 * @return integer|boolean the number of rows affected, or false if validation fails
+	 * or [[beforeSave()]] stops the updating process.
+	 * @throws StaleObjectException if [[optimisticLock|optimistic locking]] is enabled and the data
+	 * being updated is outdated.
+	 */
+	public function update($runValidation = true, $attributes = null)
+	{
+		if ($runValidation && !$this->validate($attributes) || !$this->beforeSave(false)) {
+			return false;
+		}
+		$values = $this->getDirtyAttributes($attributes);
+		if (!empty($values)) {
+			$condition = $this->getOldPrimaryKey(true);
+			$lock = $this->optimisticLock();
+			if ($lock !== null) {
+				if (!isset($values[$lock])) {
+					$values[$lock] = $this->$lock + 1;
+				}
+				$condition[$lock] = $this->$lock;
+			}
+			// We do not check the return value of updateAll() because it's possible
+			// that the UPDATE statement doesn't change anything and thus returns 0.
+			$rows = $this->updateAll($values, $condition);
+
+			if ($lock !== null && !$rows) {
+				throw new StaleObjectException('The object being updated is outdated.');
+			}
+
+			foreach ($values as $name => $value) {
+				$this->_oldAttributes[$name] = $this->_attributes[$name];
+			}
+
+			$this->afterSave(false);
+			return $rows;
+		} else {
+			return 0;
+		}
+	}
+
+	/**
+	 * Updates one or several counter columns for the current AR object.
+	 * Note that this method differs from [[updateAllCounters()]] in that it only
+	 * saves counters for the current AR object.
+	 *
+	 * An example usage is as follows:
+	 *
+	 * ~~~
+	 * $post = Post::find($id);
+	 * $post->updateCounters(array('view_count' => 1));
+	 * ~~~
+	 *
+	 * @param array $counters the counters to be updated (attribute name => increment value)
+	 * Use negative values if you want to decrement the counters.
+	 * @return boolean whether the saving is successful
+	 * @see updateAllCounters()
+	 */
+	public function updateCounters($counters)
+	{
+		if ($this->updateAllCounters($counters, $this->getOldPrimaryKey(true)) > 0) {
+			foreach ($counters as $name => $value) {
+				$this->_attributes[$name] += $value;
+				$this->_oldAttributes[$name] = $this->_attributes[$name];
+			}
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Deletes the table row corresponding to this active record.
+	 *
+	 * This method performs the following steps in order:
+	 *
+	 * 1. call [[beforeDelete()]]. If the method returns false, it will skip the
+	 *    rest of the steps;
+	 * 2. delete the record from the database;
+	 * 3. call [[afterDelete()]].
+	 *
+	 * In the above step 1 and 3, events named [[EVENT_BEFORE_DELETE]] and [[EVENT_AFTER_DELETE]]
+	 * will be raised by the corresponding methods.
+	 *
+	 * @return integer|boolean the number of rows deleted, or false if the deletion is unsuccessful for some reason.
+	 * Note that it is possible the number of rows deleted is 0, even though the deletion execution is successful.
+	 * @throws StaleObjectException if [[optimisticLock|optimistic locking]] is enabled and the data
+	 * being deleted is outdated.
+	 */
+	public function delete()
+	{
+		if ($this->beforeDelete()) {
+			// we do not check the return value of deleteAll() because it's possible
+			// the record is already deleted in the database and thus the method will return 0
+			$condition = $this->getOldPrimaryKey(true);
+			$lock = $this->optimisticLock();
+			if ($lock !== null) {
+				$condition[$lock] = $this->$lock;
+			}
+			$rows = $this->deleteAll($condition);
+			if ($lock !== null && !$rows) {
+				throw new StaleObjectException('The object being deleted is outdated.');
+			}
+			$this->_oldAttributes = null;
+			$this->afterDelete();
+			return $rows;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Returns a value indicating whether the current record is new.
+	 * @return boolean whether the record is new and should be inserted when calling [[save()]].
+	 */
+	public function getIsNewRecord()
+	{
+		return $this->_oldAttributes === null;
+	}
+
+	/**
+	 * Initializes the object.
+	 * This method is called at the end of the constructor.
+	 * The default implementation will trigger an [[EVENT_INIT]] event.
+	 * If you override this method, make sure you call the parent implementation at the end
+	 * to ensure triggering of the event.
+	 */
+	public function init()
+	{
+		parent::init();
+		$this->trigger(self::EVENT_INIT);
+	}
+
+	/**
+	 * This method is called when the AR object is created and populated with the query result.
+	 * The default implementation will trigger an [[EVENT_AFTER_FIND]] event.
+	 * When overriding this method, make sure you call the parent implementation to ensure the
+	 * event is triggered.
+	 */
+	public function afterFind()
+	{
+		$this->trigger(self::EVENT_AFTER_FIND);
+	}
+
+	/**
+	 * Sets the value indicating whether the record is new.
+	 * @param boolean $value whether the record is new and should be inserted when calling [[save()]].
+	 * @see getIsNewRecord
+	 */
+	public function setIsNewRecord($value)
+	{
+		$this->_oldAttributes = $value ? null : $this->_attributes;
+	}
+
+	/**
+	 * This method is called at the beginning of inserting or updating a record.
+	 * The default implementation will trigger an [[EVENT_BEFORE_INSERT]] event when `$insert` is true,
+	 * or an [[EVENT_BEFORE_UPDATE]] event if `$insert` is false.
+	 * When overriding this method, make sure you call the parent implementation like the following:
+	 *
+	 * ~~~
+	 * public function beforeSave($insert)
+	 * {
+	 *     if (parent::beforeSave($insert)) {
+	 *         // ...custom code here...
+	 *         return true;
+	 *     } else {
+	 *         return false;
+	 *     }
+	 * }
+	 * ~~~
+	 *
+	 * @param boolean $insert whether this method called while inserting a record.
+	 * If false, it means the method is called while updating a record.
+	 * @return boolean whether the insertion or updating should continue.
+	 * If false, the insertion or updating will be cancelled.
+	 */
+	public function beforeSave($insert)
+	{
+		$event = new ModelEvent;
+		$this->trigger($insert ? self::EVENT_BEFORE_INSERT : self::EVENT_BEFORE_UPDATE, $event);
+		return $event->isValid;
+	}
+
+	/**
+	 * This method is called at the end of inserting or updating a record.
+	 * The default implementation will trigger an [[EVENT_AFTER_INSERT]] event when `$insert` is true,
+	 * or an [[EVENT_AFTER_UPDATE]] event if `$insert` is false.
+	 * When overriding this method, make sure you call the parent implementation so that
+	 * the event is triggered.
+	 * @param boolean $insert whether this method called while inserting a record.
+	 * If false, it means the method is called while updating a record.
+	 */
+	public function afterSave($insert)
+	{
+		$this->trigger($insert ? self::EVENT_AFTER_INSERT : self::EVENT_AFTER_UPDATE);
+	}
+
+	/**
+	 * This method is invoked before deleting a record.
+	 * The default implementation raises the [[EVENT_BEFORE_DELETE]] event.
+	 * When overriding this method, make sure you call the parent implementation like the following:
+	 *
+	 * ~~~
+	 * public function beforeDelete()
+	 * {
+	 *     if (parent::beforeDelete()) {
+	 *         // ...custom code here...
+	 *         return true;
+	 *     } else {
+	 *         return false;
+	 *     }
+	 * }
+	 * ~~~
+	 *
+	 * @return boolean whether the record should be deleted. Defaults to true.
+	 */
+	public function beforeDelete()
+	{
+		$event = new ModelEvent;
+		$this->trigger(self::EVENT_BEFORE_DELETE, $event);
+		return $event->isValid;
+	}
+
+	/**
+	 * This method is invoked after deleting a record.
+	 * The default implementation raises the [[EVENT_AFTER_DELETE]] event.
+	 * You may override this method to do postprocessing after the record is deleted.
+	 * Make sure you call the parent implementation so that the event is raised properly.
+	 */
+	public function afterDelete()
+	{
+		$this->trigger(self::EVENT_AFTER_DELETE);
+	}
+
+	/**
+	 * Repopulates this active record with the latest data.
+	 * @param array $attributes
+	 * @return boolean whether the row still exists in the database. If true, the latest data
+	 * will be populated to this active record.
+	 */
+	public function refresh($attributes = null)
+	{
+		$record = $this->find($this->getPrimaryKey(true));
+		if ($record === null) {
+			return false;
+		}
+		if ($attributes === null) {
+			foreach ($this->attributes() as $name) {
+				$this->_attributes[$name] = $record->_attributes[$name];
+			}
+			$this->_oldAttributes = $this->_attributes;
+		} else {
+			foreach ($attributes as $name) {
+				$this->_oldAttributes[$name] = $this->_attributes[$name] = $record->_attributes[$name];
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * Returns a value indicating whether the given active record is the same as the current one.
+	 * The comparison is made by comparing the table names and the primary key values of the two active records.
+	 * @param ActiveRecord $record record to compare to
+	 * @return boolean whether the two active records refer to the same row in the same database table.
+	 */
+	public function equals($record)
+	{
+		return $this->tableName() === $record->tableName() && $this->getPrimaryKey() === $record->getPrimaryKey();
+	}
+
+	/**
+	 * Returns the primary key value(s).
+	 * @param boolean $asArray whether to return the primary key value as an array. If true,
+	 * the return value will be an array with column names as keys and column values as values.
+	 * Note that for composite primary keys, an array will always be returned regardless of this parameter value.
+	 * @return mixed the primary key value. An array (column name=>column value) is returned if the primary key
+	 * is composite or `$asArray` is true. A string is returned otherwise (null will be returned if
+	 * the key value is null).
+	 */
+	public function getPrimaryKey($asArray = false)
+	{
+		$keys = $this->primaryKey();
+		if (count($keys) === 1 && !$asArray) {
+			return isset($this->_attributes[$keys[0]]) ? $this->_attributes[$keys[0]] : null;
+		} else {
+			$values = array();
+			foreach ($keys as $name) {
+				$values[$name] = isset($this->_attributes[$name]) ? $this->_attributes[$name] : null;
+			}
+			return $values;
+		}
+	}
+
+	/**
+	 * Returns the old primary key value(s).
+	 * This refers to the primary key value that is populated into the record
+	 * after executing a find method (e.g. find(), findAll()).
+	 * The value remains unchanged even if the primary key attribute is manually assigned with a different value.
+	 * @param boolean $asArray whether to return the primary key value as an array. If true,
+	 * the return value will be an array with column name as key and column value as value.
+	 * If this is false (default), a scalar value will be returned for non-composite primary key.
+	 * @return mixed the old primary key value. An array (column name=>column value) is returned if the primary key
+	 * is composite or `$asArray` is true. A string is returned otherwise (null will be returned if
+	 * the key value is null).
+	 */
+	public function getOldPrimaryKey($asArray = false)
+	{
+		$keys = $this->primaryKey();
+		if (count($keys) === 1 && !$asArray) {
+			return isset($this->_oldAttributes[$keys[0]]) ? $this->_oldAttributes[$keys[0]] : null;
+		} else {
+			$values = array();
+			foreach ($keys as $name) {
+				$values[$name] = isset($this->_oldAttributes[$name]) ? $this->_oldAttributes[$name] : null;
+			}
+			return $values;
+		}
+	}
+
+	/**
+	 * Creates an active record object using a row of data.
+	 * This method is called by [[ActiveQuery]] to populate the query results
+	 * into Active Records.
+	 * @param array $row attribute values (name => value)
+	 * @return ActiveRecord the newly created active record.
+	 */
+	public static function create($row)
+	{
+		$record = static::instantiate($row);
+		$columns = static::getTableSchema()->columns;
+		foreach ($row as $name => $value) {
+			if (isset($columns[$name])) {
+				$record->_attributes[$name] = $value;
+			} else {
+				$record->$name = $value;
+			}
+		}
+		$record->_oldAttributes = $record->_attributes;
+		$record->afterFind();
+		return $record;
+	}
+
+	/**
+	 * Creates an active record instance.
+	 * This method is called by [[create()]].
+	 * You may override this method if the instance being created
+	 * depends on the row data to be populated into the record.
+	 * For example, by creating a record based on the value of a column,
+	 * you may implement the so-called single-table inheritance mapping.
+	 * @param array $row row data to be populated into the record.
+	 * @return ActiveRecord the newly created active record
+	 */
+	public static function instantiate($row)
+	{
+		return new static;
+	}
+
+	/**
+	 * Returns whether there is an element at the specified offset.
+	 * This method is required by the interface ArrayAccess.
+	 * @param mixed $offset the offset to check on
+	 * @return boolean whether there is an element at the specified offset.
+	 */
+	public function offsetExists($offset)
+	{
+		return $this->__isset($offset);
+	}
+
+	/**
+	 * Returns the relation object with the specified name.
+	 * A relation is defined by a getter method which returns an [[ActiveRelation]] object.
+	 * It can be declared in either the Active Record class itself or one of its behaviors.
+	 * @param string $name the relation name
+	 * @return ActiveRelation the relation object
+	 * @throws InvalidParamException if the named relation does not exist.
+	 */
+	public function getRelation($name)
+	{
+		$getter = 'get' . $name;
+		try {
+			$relation = $this->$getter();
+			if ($relation instanceof ActiveRelation) {
+				return $relation;
+			}
+		} catch (UnknownMethodException $e) {
+			throw new InvalidParamException(get_class($this) . ' has no relation named "' . $name . '".');
+		}
+	}
+
+	/**
+	 * Establishes the relationship between two models.
+	 *
+	 * The relationship is established by setting the foreign key value(s) in one model
+	 * to be the corresponding primary key value(s) in the other model.
+	 * The model with the foreign key will be saved into database without performing validation.
+	 *
+	 * If the relationship involves a pivot table, a new row will be inserted into the
+	 * pivot table which contains the primary key values from both models.
+	 *
+	 * Note that this method requires that the primary key value is not null.
+	 *
+	 * @param string $name the name of the relationship
+	 * @param ActiveRecord $model the model to be linked with the current one.
+	 * @param array $extraColumns additional column values to be saved into the pivot table.
+	 * This parameter is only meaningful for a relationship involving a pivot table
+	 * (i.e., a relation set with `[[ActiveRelation::via()]]` or `[[ActiveRelation::viaTable()]]`.)
+	 * @throws InvalidCallException if the method is unable to link two models.
+	 */
+	public function link($name, $model, $extraColumns = array())
+	{
+		$relation = $this->getRelation($name);
+
+		if ($relation->via !== null) {
+			if (is_array($relation->via)) {
+				/** @var $viaRelation ActiveRelation */
+				list($viaName, $viaRelation) = $relation->via;
+				/** @var $viaClass ActiveRecord */
+				$viaClass = $viaRelation->modelClass;
+				$viaTable = $viaClass::tableName();
+				// unset $viaName so that it can be reloaded to reflect the change
+				unset($this->_related[strtolower($viaName)]);
+			} else {
+				$viaRelation = $relation->via;
+				$viaTable = reset($relation->via->from);
+			}
+			$columns = array();
+			foreach ($viaRelation->link as $a => $b) {
+				$columns[$a] = $this->$b;
+			}
+			foreach ($relation->link as $a => $b) {
+				$columns[$b] = $model->$a;
+			}
+			foreach ($extraColumns as $k => $v) {
+				$columns[$k] = $v;
+			}
+			static::getDb()->createCommand()
+				->insert($viaTable, $columns)->execute();
+		} else {
+			$p1 = $model->isPrimaryKey(array_keys($relation->link));
+			$p2 = $this->isPrimaryKey(array_values($relation->link));
+			if ($p1 && $p2) {
+				if ($this->getIsNewRecord() && $model->getIsNewRecord()) {
+					throw new InvalidCallException('Unable to link models: both models are newly created.');
+				} elseif ($this->getIsNewRecord()) {
+					$this->bindModels(array_flip($relation->link), $this, $model);
+				} else {
+					$this->bindModels($relation->link, $model, $this);
+				}
+			} elseif ($p1) {
+				$this->bindModels(array_flip($relation->link), $this, $model);
+			} elseif ($p2) {
+				$this->bindModels($relation->link, $model, $this);
+			} else {
+				throw new InvalidCallException('Unable to link models: the link does not involve any primary key.');
+			}
+		}
+
+		// update lazily loaded related objects
+		if (!$relation->multiple) {
+			$this->_related[$name] = $model;
+		} elseif (isset($this->_related[$name])) {
+			if ($relation->indexBy !== null) {
+				$indexBy = $relation->indexBy;
+				$this->_related[$name][$model->$indexBy] = $model;
+			} else {
+				$this->_related[$name][] = $model;
+			}
+		}
+	}
+
+	/**
+	 * Destroys the relationship between two models.
+	 *
+	 * The model with the foreign key of the relationship will be deleted if `$delete` is true.
+	 * Otherwise, the foreign key will be set null and the model will be saved without validation.
+	 *
+	 * @param string $name the name of the relationship.
+	 * @param ActiveRecord $model the model to be unlinked from the current one.
+	 * @param boolean $delete whether to delete the model that contains the foreign key.
+	 * If false, the model's foreign key will be set null and saved.
+	 * If true, the model containing the foreign key will be deleted.
+	 * @throws InvalidCallException if the models cannot be unlinked
+	 */
+	public function unlink($name, $model, $delete = false)
+	{
+		$relation = $this->getRelation($name);
+
+		if ($relation->via !== null) {
+			if (is_array($relation->via)) {
+				/** @var $viaRelation ActiveRelation */
+				list($viaName, $viaRelation) = $relation->via;
+				/** @var $viaClass ActiveRecord */
+				$viaClass = $viaRelation->modelClass;
+				$viaTable = $viaClass::tableName();
+				unset($this->_related[strtolower($viaName)]);
+			} else {
+				$viaRelation = $relation->via;
+				$viaTable = reset($relation->via->from);
+			}
+			$columns = array();
+			foreach ($viaRelation->link as $a => $b) {
+				$columns[$a] = $this->$b;
+			}
+			foreach ($relation->link as $a => $b) {
+				$columns[$b] = $model->$a;
+			}
+			$command = static::getDb()->createCommand();
+			if ($delete) {
+				$command->delete($viaTable, $columns)->execute();
+			} else {
+				$nulls = array();
+				foreach (array_keys($columns) as $a) {
+					$nulls[$a] = null;
+				}
+				$command->update($viaTable, $nulls, $columns)->execute();
+			}
+		} else {
+			$p1 = $model->isPrimaryKey(array_keys($relation->link));
+			$p2 = $this->isPrimaryKey(array_values($relation->link));
+			if ($p1 && $p2 || $p2) {
+				foreach ($relation->link as $a => $b) {
+					$model->$a = null;
+				}
+				$delete ? $model->delete() : $model->save(false);
+			} elseif ($p1) {
+				foreach ($relation->link as $b) {
+					$this->$b = null;
+				}
+				$delete ? $this->delete() : $this->save(false);
+			} else {
+				throw new InvalidCallException('Unable to unlink models: the link does not involve any primary key.');
+			}
+		}
+
+		if (!$relation->multiple) {
+			unset($this->_related[$name]);
+		} elseif (isset($this->_related[$name])) {
+			/** @var $b ActiveRecord */
+			foreach ($this->_related[$name] as $a => $b) {
+				if ($model->getPrimaryKey() == $b->getPrimaryKey()) {
+					unset($this->_related[$name][$a]);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Changes the given class name into a namespaced one.
+	 * If the given class name is already namespaced, no change will be made.
+	 * Otherwise, the class name will be changed to use the same namespace as
+	 * the current AR class.
+	 * @param string $class the class name to be namespaced
+	 * @return string the namespaced class name
+	 */
+	protected function getNamespacedClass($class)
+	{
+		if (strpos($class, '\\') === false) {
+			$primaryClass = get_class($this);
+			if (($pos = strrpos($primaryClass, '\\')) !== false) {
+				return substr($primaryClass, 0, $pos + 1) . $class;
+			}
+		}
+		return $class;
+	}
+
+	/**
+	 * @param array $link
+	 * @param ActiveRecord $foreignModel
+	 * @param ActiveRecord $primaryModel
+	 * @throws InvalidCallException
+	 */
+	private function bindModels($link, $foreignModel, $primaryModel)
+	{
+		foreach ($link as $fk => $pk) {
+			$value = $primaryModel->$pk;
+			if ($value === null) {
+				throw new InvalidCallException('Unable to link models: the primary key of ' . get_class($primaryModel) . ' is null.');
+			}
+			$foreignModel->$fk = $value;
+		}
+		$foreignModel->save(false);
+	}
+
+	/**
+	 * @param array $keys
+	 * @return boolean
+	 */
+	private function isPrimaryKey($keys)
+	{
+		$pks = $this->primaryKey();
+		foreach ($keys as $key) {
+			if (!in_array($key, $pks, true)) {
+				return false;
+			}
+		}
+		return true;
+	}
+}
diff --git a/yii/db/ActiveRelation.php b/yii/db/ActiveRelation.php
new file mode 100644
index 0000000..42ae0e7
--- /dev/null
+++ b/yii/db/ActiveRelation.php
@@ -0,0 +1,304 @@
+<?php
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\db;
+
+use yii\db\Connection;
+use yii\db\Command;
+use yii\base\InvalidConfigException;
+
+/**
+ * ActiveRelation represents a relation between two Active Record classes.
+ *
+ * ActiveRelation instances are usually created by calling [[ActiveRecord::hasOne()]] and
+ * [[ActiveRecord::hasMany()]]. An Active Record class declares a relation by defining
+ * a getter method which calls one of the above methods and returns the created ActiveRelation object.
+ *
+ * A relation is specified by [[link]] which represents the association between columns
+ * of different tables; and the multiplicity of the relation is indicated by [[multiple]].
+ *
+ * If a relation involves a pivot table, it may be specified by [[via()]] or [[viaTable()]] method.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class ActiveRelation extends ActiveQuery
+{
+	/**
+	 * @var boolean whether this relation should populate all query results into AR instances.
+	 * If false, only the first row of the results will be retrieved.
+	 */
+	public $multiple;
+	/**
+	 * @var ActiveRecord the primary model that this relation is associated with.
+	 * This is used only in lazy loading with dynamic query options.
+	 */
+	public $primaryModel;
+	/**
+	 * @var array the columns of the primary and foreign tables that establish the relation.
+	 * The array keys must be columns of the table for this relation, and the array values
+	 * must be the corresponding columns from the primary table.
+	 * Do not prefix or quote the column names as they will be done automatically by Yii.
+	 */
+	public $link;
+	/**
+	 * @var array|ActiveRelation the query associated with the pivot table. Please call [[via()]]
+	 * or [[viaTable()]] to set this property instead of directly setting it.
+	 */
+	public $via;
+
+	/**
+	 * Specifies the relation associated with the pivot table.
+	 * @param string $relationName the relation name. This refers to a relation declared in [[primaryModel]].
+	 * @param callable $callable a PHP callback for customizing the relation associated with the pivot table.
+	 * Its signature should be `function($query)`, where `$query` is the query to be customized.
+	 * @return ActiveRelation the relation object itself.
+	 */
+	public function via($relationName, $callable = null)
+	{
+		$relation = $this->primaryModel->getRelation($relationName);
+		$this->via = array($relationName, $relation);
+		if ($callable !== null) {
+			call_user_func($callable, $relation);
+		}
+		return $this;
+	}
+
+	/**
+	 * Specifies the pivot table.
+	 * @param string $tableName the name of the pivot table.
+	 * @param array $link the link between the pivot table and the table associated with [[primaryModel]].
+	 * The keys of the array represent the columns in the pivot table, and the values represent the columns
+	 * in the [[primaryModel]] table.
+	 * @param callable $callable a PHP callback for customizing the relation associated with the pivot table.
+	 * Its signature should be `function($query)`, where `$query` is the query to be customized.
+	 * @return ActiveRelation
+	 */
+	public function viaTable($tableName, $link, $callable = null)
+	{
+		$relation = new ActiveRelation(array(
+			'modelClass' => get_class($this->primaryModel),
+			'from' => array($tableName),
+			'link' => $link,
+			'multiple' => true,
+			'asArray' => true,
+		));
+		$this->via = $relation;
+		if ($callable !== null) {
+			call_user_func($callable, $relation);
+		}
+		return $this;
+	}
+
+	/**
+	 * Creates a DB command that can be used to execute this query.
+	 * @param Connection $db the DB connection used to create the DB command.
+	 * If null, the DB connection returned by [[modelClass]] will be used.
+	 * @return Command the created DB command instance.
+	 */
+	public function createCommand($db = null)
+	{
+		if ($this->primaryModel !== null) {
+			// lazy loading
+			if ($this->via instanceof self) {
+				// via pivot table
+				$viaModels = $this->via->findPivotRows(array($this->primaryModel));
+				$this->filterByModels($viaModels);
+			} elseif (is_array($this->via)) {
+				// via relation
+				/** @var $viaQuery ActiveRelation */
+				list($viaName, $viaQuery) = $this->via;
+				if ($viaQuery->multiple) {
+					$viaModels = $viaQuery->all();
+					$this->primaryModel->populateRelation($viaName, $viaModels);
+				} else {
+					$model = $viaQuery->one();
+					$this->primaryModel->populateRelation($viaName, $model);
+					$viaModels = $model === null ? array() : array($model);
+				}
+				$this->filterByModels($viaModels);
+			} else {
+				$this->filterByModels(array($this->primaryModel));
+			}
+		}
+		return parent::createCommand($db);
+	}
+
+	/**
+	 * Finds the related records and populates them into the primary models.
+	 * This method is internally used by [[ActiveQuery]]. Do not call it directly.
+	 * @param string $name the relation name
+	 * @param array $primaryModels primary models
+	 * @return array the related models
+	 * @throws InvalidConfigException
+	 */
+	public function findWith($name, &$primaryModels)
+	{
+		if (!is_array($this->link)) {
+			throw new InvalidConfigException('Invalid link: it must be an array of key-value pairs.');
+		}
+
+		if ($this->via instanceof self) {
+			// via pivot table
+			/** @var $viaQuery ActiveRelation */
+			$viaQuery = $this->via;
+			$viaModels = $viaQuery->findPivotRows($primaryModels);
+			$this->filterByModels($viaModels);
+		} elseif (is_array($this->via)) {
+			// via relation
+			/** @var $viaQuery ActiveRelation */
+			list($viaName, $viaQuery) = $this->via;
+			$viaQuery->primaryModel = null;
+			$viaModels = $viaQuery->findWith($viaName, $primaryModels);
+			$this->filterByModels($viaModels);
+		} else {
+			$this->filterByModels($primaryModels);
+		}
+
+		if (count($primaryModels) === 1 && !$this->multiple) {
+			$model = $this->one();
+			foreach ($primaryModels as $i => $primaryModel) {
+				if ($primaryModel instanceof ActiveRecord) {
+					$primaryModel->populateRelation($name, $model);
+				} else {
+					$primaryModels[$i][$name] = $model;
+				}
+			}
+			return array($model);
+		} else {
+			$models = $this->all();
+			if (isset($viaModels, $viaQuery)) {
+				$buckets = $this->buildBuckets($models, $this->link, $viaModels, $viaQuery->link);
+			} else {
+				$buckets = $this->buildBuckets($models, $this->link);
+			}
+
+			$link = array_values(isset($viaQuery) ? $viaQuery->link : $this->link);
+			foreach ($primaryModels as $i => $primaryModel) {
+				$key = $this->getModelKey($primaryModel, $link);
+				$value = isset($buckets[$key]) ? $buckets[$key] : ($this->multiple ? array() : null);
+				if ($primaryModel instanceof ActiveRecord) {
+					$primaryModel->populateRelation($name, $value);
+				} else {
+					$primaryModels[$i][$name] = $value;
+				}
+			}
+			return $models;
+		}
+	}
+
+	/**
+	 * @param array $models
+	 * @param array $link
+	 * @param array $viaModels
+	 * @param array $viaLink
+	 * @return array
+	 */
+	private function buildBuckets($models, $link, $viaModels = null, $viaLink = null)
+	{
+		$buckets = array();
+		$linkKeys = array_keys($link);
+		foreach ($models as $i => $model) {
+			$key = $this->getModelKey($model, $linkKeys);
+			if ($this->indexBy !== null) {
+				$buckets[$key][$i] = $model;
+			} else {
+				$buckets[$key][] = $model;
+			}
+		}
+
+		if ($viaModels !== null) {
+			$viaBuckets = array();
+			$viaLinkKeys = array_keys($viaLink);
+			$linkValues = array_values($link);
+			foreach ($viaModels as $viaModel) {
+				$key1 = $this->getModelKey($viaModel, $viaLinkKeys);
+				$key2 = $this->getModelKey($viaModel, $linkValues);
+				if (isset($buckets[$key2])) {
+					foreach ($buckets[$key2] as $i => $bucket) {
+						if ($this->indexBy !== null) {
+							$viaBuckets[$key1][$i] = $bucket;
+						} else {
+							$viaBuckets[$key1][] = $bucket;
+						}
+					}
+				}
+			}
+			$buckets = $viaBuckets;
+		}
+
+		if (!$this->multiple) {
+			foreach ($buckets as $i => $bucket) {
+				$buckets[$i] = reset($bucket);
+			}
+		}
+		return $buckets;
+	}
+
+	/**
+	 * @param ActiveRecord|array $model
+	 * @param array $attributes
+	 * @return string
+	 */
+	private function getModelKey($model, $attributes)
+	{
+		if (count($attributes) > 1) {
+			$key = array();
+			foreach ($attributes as $attribute) {
+				$key[] = $model[$attribute];
+			}
+			return serialize($key);
+		} else {
+			$attribute = reset($attributes);
+			return $model[$attribute];
+		}
+	}
+
+	/**
+	 * @param array $models
+	 */
+	private function filterByModels($models)
+	{
+		$attributes = array_keys($this->link);
+		$values = array();
+		if (count($attributes) === 1) {
+			// single key
+			$attribute = reset($this->link);
+			foreach ($models as $model) {
+				$values[] = $model[$attribute];
+			}
+		} else {
+			// composite keys
+			foreach ($models as $model) {
+				$v = array();
+				foreach ($this->link as $attribute => $link) {
+					$v[$attribute] = $model[$link];
+				}
+				$values[] = $v;
+			}
+		}
+		$this->andWhere(array('in', $attributes, array_unique($values, SORT_REGULAR)));
+	}
+
+	/**
+	 * @param ActiveRecord[] $primaryModels
+	 * @return array
+	 */
+	private function findPivotRows($primaryModels)
+	{
+		if (empty($primaryModels)) {
+			return array();
+		}
+		$this->filterByModels($primaryModels);
+		/** @var $primaryModel ActiveRecord */
+		$primaryModel = reset($primaryModels);
+		$db = $primaryModel->getDb();
+		$sql = $db->getQueryBuilder()->build($this);
+		return $db->createCommand($sql, $this->params)->queryAll();
+	}
+}
diff --git a/yii/db/ColumnSchema.php b/yii/db/ColumnSchema.php
new file mode 100644
index 0000000..ffdafd4
--- /dev/null
+++ b/yii/db/ColumnSchema.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\db;
+
+/**
+ * ColumnSchema class describes the metadata of a column in a database table.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class ColumnSchema extends \yii\base\Component
+{
+	/**
+	 * @var string name of this column (without quotes).
+	 */
+	public $name;
+	/**
+	 * @var boolean whether this column can be null.
+	 */
+	public $allowNull;
+	/**
+	 * @var string abstract type of this column. Possible abstract types include:
+	 * string, text, boolean, smallint, integer, bigint, float, decimal, datetime,
+	 * timestamp, time, date, binary, and money.
+	 */
+	public $type;
+	/**
+	 * @var string the PHP type of this column. Possible PHP types include:
+	 * string, boolean, integer, double.
+	 */
+	public $phpType;
+	/**
+	 * @var string the DB type of this column. Possible DB types vary according to the type of DBMS.
+	 */
+	public $dbType;
+	/**
+	 * @var mixed default value of this column
+	 */
+	public $defaultValue;
+	/**
+	 * @var array enumerable values. This is set only if the column is declared to be an enumerable type.
+	 */
+	public $enumValues;
+	/**
+	 * @var integer display size of the column.
+	 */
+	public $size;
+	/**
+	 * @var integer precision of the column data, if it is numeric.
+	 */
+	public $precision;
+	/**
+	 * @var integer scale of the column data, if it is numeric.
+	 */
+	public $scale;
+	/**
+	 * @var boolean whether this column is a primary key
+	 */
+	public $isPrimaryKey;
+	/**
+	 * @var boolean whether this column is auto-incremental
+	 */
+	public $autoIncrement = false;
+	/**
+	 * @var boolean whether this column is unsigned. This is only meaningful
+	 * when [[type]] is `smallint`, `integer` or `bigint`.
+	 */
+	public $unsigned;
+	/**
+	 * @var string comment of this column. Not all DBMS support this.
+	 */
+	public $comment;
+
+
+	/**
+	 * Converts the input value according to [[phpType]].
+	 * If the value is null or an [[Expression]], it will not be converted.
+	 * @param mixed $value input value
+	 * @return mixed converted value
+	 */
+	public function typecast($value)
+	{
+		if ($value === null || gettype($value) === $this->phpType || $value instanceof Expression) {
+			return $value;
+		}
+		switch ($this->phpType) {
+			case 'string':
+				return (string)$value;
+			case 'integer':
+				return (integer)$value;
+			case 'boolean':
+				return (boolean)$value;
+		}
+		return $value;
+	}
+}
diff --git a/yii/db/Command.php b/yii/db/Command.php
new file mode 100644
index 0000000..a117685
--- /dev/null
+++ b/yii/db/Command.php
@@ -0,0 +1,754 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\db;
+
+use Yii;
+use yii\base\NotSupportedException;
+use yii\caching\Cache;
+
+/**
+ * Command represents a SQL statement to be executed against a database.
+ *
+ * A command object is usually created by calling [[Connection::createCommand()]].
+ * The SQL statement it represents can be set via the [[sql]] property.
+ *
+ * To execute a non-query SQL (such as INSERT, DELETE, UPDATE), call [[execute()]].
+ * To execute a SQL statement that returns result data set (such as SELECT),
+ * use [[queryAll()]], [[queryRow()]], [[queryColumn()]], [[queryScalar()]], or [[query()]].
+ * For example,
+ *
+ * ~~~
+ * $users = $connection->createCommand('SELECT * FROM tbl_user')->queryAll();
+ * ~~~
+ *
+ * Command supports SQL statement preparation and parameter binding.
+ * Call [[bindValue()]] to bind a value to a SQL parameter;
+ * Call [[bindParam()]] to bind a PHP variable to a SQL parameter.
+ * When binding a parameter, the SQL statement is automatically prepared.
+ * You may also call [[prepare()]] explicitly to prepare a SQL statement.
+ *
+ * Command also supports building SQL statements by providing methods such as [[insert()]],
+ * [[update()]], etc. For example,
+ *
+ * ~~~
+ * $connection->createCommand()->insert('tbl_user', array(
+ *     'name' => 'Sam',
+ *     'age' => 30,
+ * ))->execute();
+ * ~~~
+ *
+ * To build SELECT SQL statements, please use [[QueryBuilder]] instead.
+ *
+ * @property string $sql the SQL statement to be executed
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Command extends \yii\base\Component
+{
+	/**
+	 * @var Connection the DB connection that this command is associated with
+	 */
+	public $db;
+	/**
+	 * @var \PDOStatement the PDOStatement object that this command is associated with
+	 */
+	public $pdoStatement;
+	/**
+	 * @var mixed the default fetch mode for this command.
+	 * @see http://www.php.net/manual/en/function.PDOStatement-setFetchMode.php
+	 */
+	public $fetchMode = \PDO::FETCH_ASSOC;
+	/**
+	 * @var string the SQL statement that this command represents
+	 */
+	private $_sql;
+	/**
+	 * @var array the parameter log information (name=>value)
+	 */
+	private $_params = array();
+
+	/**
+	 * Returns the SQL statement for this command.
+	 * @return string the SQL statement to be executed
+	 */
+	public function getSql()
+	{
+		return $this->_sql;
+	}
+
+	/**
+	 * Specifies the SQL statement to be executed.
+	 * The previous SQL execution (if any) will be cancelled, and [[params]] will be cleared as well.
+	 * @param string $sql the SQL statement to be set.
+	 * @return Command this command instance
+	 */
+	public function setSql($sql)
+	{
+		if ($sql !== $this->_sql) {
+			$this->cancel();
+			$this->_sql = $this->db->quoteSql($sql);
+			$this->_params = array();
+		}
+		return $this;
+	}
+
+	/**
+	 * Returns the raw SQL by inserting parameter values into the corresponding placeholders in [[sql]].
+	 * Note that the return value of this method should mainly be used for logging purpose.
+	 * It is likely that this method returns an invalid SQL due to improper replacement of parameter placeholders.
+	 * @return string the raw SQL
+	 */
+	public function getRawSql()
+	{
+		if (empty($this->_params)) {
+			return $this->_sql;
+		} else {
+			$params = array();
+			foreach ($this->_params as $name => $value) {
+				if (is_string($value)) {
+					$params[$name] = $this->db->quoteValue($value);
+				} elseif ($value === null) {
+					$params[$name] = 'NULL';
+				} else {
+					$params[$name] = $value;
+				}
+			}
+			if (isset($params[1])) {
+				$sql = '';
+				foreach (explode('?', $this->_sql) as $i => $part) {
+					$sql .= (isset($params[$i]) ? $params[$i] : '') . $part;
+				}
+				return $sql;
+			} else {
+				return strtr($this->_sql, $params);
+			}
+		}
+	}
+
+	/**
+	 * Prepares the SQL statement to be executed.
+	 * For complex SQL statement that is to be executed multiple times,
+	 * this may improve performance.
+	 * For SQL statement with binding parameters, this method is invoked
+	 * automatically.
+	 * @throws Exception if there is any DB error
+	 */
+	public function prepare()
+	{
+		if ($this->pdoStatement == null) {
+			$sql = $this->getSql();
+			try {
+				$this->pdoStatement = $this->db->pdo->prepare($sql);
+			} catch (\Exception $e) {
+				Yii::error($e->getMessage() . "\nFailed to prepare SQL: $sql", __METHOD__);
+				$errorInfo = $e instanceof \PDOException ? $e->errorInfo : null;
+				throw new Exception($e->getMessage(), $errorInfo, (int)$e->getCode());
+			}
+		}
+	}
+
+	/**
+	 * Cancels the execution of the SQL statement.
+	 * This method mainly sets [[pdoStatement]] to be null.
+	 */
+	public function cancel()
+	{
+		$this->pdoStatement = null;
+	}
+
+	/**
+	 * Binds a parameter to the SQL statement to be executed.
+	 * @param string|integer $name parameter identifier. For a prepared statement
+	 * using named placeholders, this will be a parameter name of
+	 * the form `:name`. For a prepared statement using question mark
+	 * placeholders, this will be the 1-indexed position of the parameter.
+	 * @param mixed $value Name of the PHP variable to bind to the SQL statement parameter
+	 * @param integer $dataType SQL data type of the parameter. If null, the type is determined by the PHP type of the value.
+	 * @param integer $length length of the data type
+	 * @param mixed $driverOptions the driver-specific options
+	 * @return Command the current command being executed
+	 * @see http://www.php.net/manual/en/function.PDOStatement-bindParam.php
+	 */
+	public function bindParam($name, &$value, $dataType = null, $length = null, $driverOptions = null)
+	{
+		$this->prepare();
+		if ($dataType === null) {
+			$this->pdoStatement->bindParam($name, $value, $this->getPdoType($value));
+		} elseif ($length === null) {
+			$this->pdoStatement->bindParam($name, $value, $dataType);
+		} elseif ($driverOptions === null) {
+			$this->pdoStatement->bindParam($name, $value, $dataType, $length);
+		} else {
+			$this->pdoStatement->bindParam($name, $value, $dataType, $length, $driverOptions);
+		}
+		$this->_params[$name] =& $value;
+		return $this;
+	}
+
+	/**
+	 * Binds a value to a parameter.
+	 * @param string|integer $name Parameter identifier. For a prepared statement
+	 * using named placeholders, this will be a parameter name of
+	 * the form `:name`. For a prepared statement using question mark
+	 * placeholders, this will be the 1-indexed position of the parameter.
+	 * @param mixed $value The value to bind to the parameter
+	 * @param integer $dataType SQL data type of the parameter. If null, the type is determined by the PHP type of the value.
+	 * @return Command the current command being executed
+	 * @see http://www.php.net/manual/en/function.PDOStatement-bindValue.php
+	 */
+	public function bindValue($name, $value, $dataType = null)
+	{
+		$this->prepare();
+		if ($dataType === null) {
+			$this->pdoStatement->bindValue($name, $value, $this->getPdoType($value));
+		} else {
+			$this->pdoStatement->bindValue($name, $value, $dataType);
+		}
+		$this->_params[$name] = $value;
+		return $this;
+	}
+
+	/**
+	 * Binds a list of values to the corresponding parameters.
+	 * This is similar to [[bindValue()]] except that it binds multiple values at a time.
+	 * Note that the SQL data type of each value is determined by its PHP type.
+	 * @param array $values the values to be bound. This must be given in terms of an associative
+	 * array with array keys being the parameter names, and array values the corresponding parameter values,
+	 * e.g. `array(':name'=>'John', ':age'=>25)`. By default, the PDO type of each value is determined
+	 * by its PHP type. You may explicitly specify the PDO type by using an array: `array(value, type)`,
+	 * e.g. `array(':name'=>'John', ':profile'=>array($profile, \PDO::PARAM_LOB))`.
+	 * @return Command the current command being executed
+	 */
+	public function bindValues($values)
+	{
+		if (!empty($values)) {
+			$this->prepare();
+			foreach ($values as $name => $value) {
+				if (is_array($value)) {
+					$type = $value[1];
+					$value = $value[0];
+				} else {
+					$type = $this->getPdoType($value);
+				}
+				$this->pdoStatement->bindValue($name, $value, $type);
+				$this->_params[$name] = $value;
+			}
+		}
+		return $this;
+	}
+
+	/**
+	 * Determines the PDO type for the give PHP data value.
+	 * @param mixed $data the data whose PDO type is to be determined
+	 * @return integer the PDO type
+	 * @see http://www.php.net/manual/en/pdo.constants.php
+	 */
+	private function getPdoType($data)
+	{
+		static $typeMap = array(
+			'boolean' => \PDO::PARAM_BOOL,
+			'integer' => \PDO::PARAM_INT,
+			'string' => \PDO::PARAM_STR,
+			'resource' => \PDO::PARAM_LOB,
+			'NULL' => \PDO::PARAM_NULL,
+		);
+		$type = gettype($data);
+		return isset($typeMap[$type]) ? $typeMap[$type] : \PDO::PARAM_STR;
+	}
+
+	/**
+	 * Executes the SQL statement.
+	 * This method should only be used for executing non-query SQL statement, such as `INSERT`, `DELETE`, `UPDATE` SQLs.
+	 * No result set will be returned.
+	 * @return integer number of rows affected by the execution.
+	 * @throws Exception execution failed
+	 */
+	public function execute()
+	{
+		$sql = $this->getSql();
+
+		$rawSql = $this->getRawSql();
+
+		Yii::trace("Executing SQL: $rawSql", __METHOD__);
+
+		if ($sql == '') {
+			return 0;
+		}
+
+		try {
+			$token = "SQL: $sql";
+			if ($this->db->enableProfiling) {
+				Yii::beginProfile($token, __METHOD__);
+			}
+
+			$this->prepare();
+			$this->pdoStatement->execute();
+			$n = $this->pdoStatement->rowCount();
+
+			if ($this->db->enableProfiling) {
+				Yii::endProfile($token, __METHOD__);
+			}
+			return $n;
+		} catch (\Exception $e) {
+			if ($this->db->enableProfiling) {
+				Yii::endProfile($token, __METHOD__);
+			}
+			$message = $e->getMessage();
+
+			Yii::error("$message\nFailed to execute SQL: $rawSql", __METHOD__);
+
+			$errorInfo = $e instanceof \PDOException ? $e->errorInfo : null;
+			throw new Exception($message, $errorInfo, (int)$e->getCode());
+		}
+	}
+
+	/**
+	 * Executes the SQL statement and returns query result.
+	 * This method is for executing a SQL query that returns result set, such as `SELECT`.
+	 * @return DataReader the reader object for fetching the query result
+	 * @throws Exception execution failed
+	 */
+	public function query()
+	{
+		return $this->queryInternal('');
+	}
+
+	/**
+	 * Executes the SQL statement and returns ALL rows at once.
+	 * @param mixed $fetchMode the result fetch mode. Please refer to [PHP manual](http://www.php.net/manual/en/function.PDOStatement-setFetchMode.php)
+	 * for valid fetch modes. If this parameter is null, the value set in [[fetchMode]] will be used.
+	 * @return array all rows of the query result. Each array element is an array representing a row of data.
+	 * An empty array is returned if the query results in nothing.
+	 * @throws Exception execution failed
+	 */
+	public function queryAll($fetchMode = null)
+	{
+		return $this->queryInternal('fetchAll', $fetchMode);
+	}
+
+	/**
+	 * Executes the SQL statement and returns the first row of the result.
+	 * This method is best used when only the first row of result is needed for a query.
+	 * @param mixed $fetchMode the result fetch mode. Please refer to [PHP manual](http://www.php.net/manual/en/function.PDOStatement-setFetchMode.php)
+	 * for valid fetch modes. If this parameter is null, the value set in [[fetchMode]] will be used.
+	 * @return array|boolean the first row (in terms of an array) of the query result. False is returned if the query
+	 * results in nothing.
+	 * @throws Exception execution failed
+	 */
+	public function queryRow($fetchMode = null)
+	{
+		return $this->queryInternal('fetch', $fetchMode);
+	}
+
+	/**
+	 * Executes the SQL statement and returns the value of the first column in the first row of data.
+	 * This method is best used when only a single value is needed for a query.
+	 * @return string|boolean the value of the first column in the first row of the query result.
+	 * False is returned if there is no value.
+	 * @throws Exception execution failed
+	 */
+	public function queryScalar()
+	{
+		$result = $this->queryInternal('fetchColumn', 0);
+		if (is_resource($result) && get_resource_type($result) === 'stream') {
+			return stream_get_contents($result);
+		} else {
+			return $result;
+		}
+	}
+
+	/**
+	 * Executes the SQL statement and returns the first column of the result.
+	 * This method is best used when only the first column of result (i.e. the first element in each row)
+	 * is needed for a query.
+	 * @return array the first column of the query result. Empty array is returned if the query results in nothing.
+	 * @throws Exception execution failed
+	 */
+	public function queryColumn()
+	{
+		return $this->queryInternal('fetchAll', \PDO::FETCH_COLUMN);
+	}
+
+	/**
+	 * Performs the actual DB query of a SQL statement.
+	 * @param string $method method of PDOStatement to be called
+	 * @param mixed $fetchMode the result fetch mode. Please refer to [PHP manual](http://www.php.net/manual/en/function.PDOStatement-setFetchMode.php)
+	 * for valid fetch modes. If this parameter is null, the value set in [[fetchMode]] will be used.
+	 * @return mixed the method execution result
+	 * @throws Exception if the query causes any problem
+	 */
+	private function queryInternal($method, $fetchMode = null)
+	{
+		$db = $this->db;
+		$sql = $this->getSql();
+		$rawSql = $this->getRawSql();
+
+		Yii::trace("Querying SQL: $rawSql", __METHOD__);
+
+		/** @var $cache \yii\caching\Cache */
+		if ($db->enableQueryCache && $method !== '') {
+			$cache = is_string($db->queryCache) ? Yii::$app->getComponent($db->queryCache) : $db->queryCache;
+		}
+
+		if (isset($cache) && $cache instanceof Cache) {
+			$cacheKey = $cache->buildKey(array(
+				__CLASS__,
+				$db->dsn,
+				$db->username,
+				$rawSql,
+			));
+			if (($result = $cache->get($cacheKey)) !== false) {
+				Yii::trace('Query result served from cache', __METHOD__);
+				return $result;
+			}
+		}
+
+		try {
+			$token = "SQL: $sql";
+			if ($db->enableProfiling) {
+				Yii::beginProfile($token, __METHOD__);
+			}
+
+			$this->prepare();
+			$this->pdoStatement->execute();
+
+			if ($method === '') {
+				$result = new DataReader($this);
+			} else {
+				if ($fetchMode === null) {
+					$fetchMode = $this->fetchMode;
+				}
+				$result = call_user_func_array(array($this->pdoStatement, $method), (array)$fetchMode);
+				$this->pdoStatement->closeCursor();
+			}
+
+			if ($db->enableProfiling) {
+				Yii::endProfile($token, __METHOD__);
+			}
+
+			if (isset($cache, $cacheKey) && $cache instanceof Cache) {
+				$cache->set($cacheKey, $result, $db->queryCacheDuration, $db->queryCacheDependency);
+				Yii::trace('Saved query result in cache', __METHOD__);
+			}
+
+			return $result;
+		} catch (\Exception $e) {
+			if ($db->enableProfiling) {
+				Yii::endProfile($token, __METHOD__);
+			}
+			$message = $e->getMessage();
+			Yii::error("$message\nCommand::$method() failed: $rawSql", __METHOD__);
+			$errorInfo = $e instanceof \PDOException ? $e->errorInfo : null;
+			throw new Exception($message, $errorInfo, (int)$e->getCode());
+		}
+	}
+
+	/**
+	 * Creates an INSERT command.
+	 * For example,
+	 *
+	 * ~~~
+	 * $connection->createCommand()->insert('tbl_user', array(
+	 *     'name' => 'Sam',
+	 *     'age' => 30,
+	 * ))->execute();
+	 * ~~~
+	 *
+	 * The method will properly escape the column names, and bind the values to be inserted.
+	 *
+	 * Note that the created command is not executed until [[execute()]] is called.
+	 *
+	 * @param string $table the table that new rows will be inserted into.
+	 * @param array $columns the column data (name=>value) to be inserted into the table.
+	 * @return Command the command object itself
+	 */
+	public function insert($table, $columns)
+	{
+		$params = array();
+		$sql = $this->db->getQueryBuilder()->insert($table, $columns, $params);
+		return $this->setSql($sql)->bindValues($params);
+	}
+
+	/**
+	 * Creates a batch INSERT command.
+	 * For example,
+	 *
+	 * ~~~
+	 * $connection->createCommand()->batchInsert('tbl_user', array('name', 'age'), array(
+	 *     array('Tom', 30),
+	 *     array('Jane', 20),
+	 *     array('Linda', 25),
+	 * ))->execute();
+	 * ~~~
+	 *
+	 * Not that the values in each row must match the corresponding column names.
+	 *
+	 * @param string $table the table that new rows will be inserted into.
+	 * @param array $columns the column names
+	 * @param array $rows the rows to be batch inserted into the table
+	 * @return Command the command object itself
+	 */
+	public function batchInsert($table, $columns, $rows)
+	{
+		$sql = $this->db->getQueryBuilder()->batchInsert($table, $columns, $rows);
+		return $this->setSql($sql);
+	}
+
+	/**
+	 * Creates an UPDATE command.
+	 * For example,
+	 *
+	 * ~~~
+	 * $connection->createCommand()->update('tbl_user', array(
+	 *     'status' => 1,
+	 * ), 'age > 30')->execute();
+	 * ~~~
+	 *
+	 * The method will properly escape the column names and bind the values to be updated.
+	 *
+	 * Note that the created command is not executed until [[execute()]] is called.
+	 *
+	 * @param string $table the table to be updated.
+	 * @param array $columns the column data (name=>value) to be updated.
+	 * @param mixed $condition the condition that will be put in the WHERE part. Please
+	 * refer to [[Query::where()]] on how to specify condition.
+	 * @param array $params the parameters to be bound to the command
+	 * @return Command the command object itself
+	 */
+	public function update($table, $columns, $condition = '', $params = array())
+	{
+		$sql = $this->db->getQueryBuilder()->update($table, $columns, $condition, $params);
+		return $this->setSql($sql)->bindValues($params);
+	}
+
+	/**
+	 * Creates a DELETE command.
+	 * For example,
+	 *
+	 * ~~~
+	 * $connection->createCommand()->delete('tbl_user', 'status = 0')->execute();
+	 * ~~~
+	 *
+	 * The method will properly escape the table and column names.
+	 *
+	 * Note that the created command is not executed until [[execute()]] is called.
+	 *
+	 * @param string $table the table where the data will be deleted from.
+	 * @param mixed $condition the condition that will be put in the WHERE part. Please
+	 * refer to [[Query::where()]] on how to specify condition.
+	 * @param array $params the parameters to be bound to the command
+	 * @return Command the command object itself
+	 */
+	public function delete($table, $condition = '', $params = array())
+	{
+		$sql = $this->db->getQueryBuilder()->delete($table, $condition, $params);
+		return $this->setSql($sql)->bindValues($params);
+	}
+
+
+	/**
+	 * Creates a SQL command for creating a new DB table.
+	 *
+	 * The columns in the new table should be specified as name-definition pairs (e.g. 'name'=>'string'),
+	 * where name stands for a column name which will be properly quoted by the method, and definition
+	 * stands for the column type which can contain an abstract DB type.
+	 * The method [[QueryBuilder::getColumnType()]] will be called
+	 * to convert the abstract column types to physical ones. For example, `string` will be converted
+	 * as `varchar(255)`, and `string not null` becomes `varchar(255) not null`.
+	 *
+	 * If a column is specified with definition only (e.g. 'PRIMARY KEY (name, type)'), it will be directly
+	 * inserted into the generated SQL.
+	 *
+	 * @param string $table the name of the table to be created. The name will be properly quoted by the method.
+	 * @param array $columns the columns (name=>definition) in the new table.
+	 * @param string $options additional SQL fragment that will be appended to the generated SQL.
+	 * @return Command the command object itself
+	 */
+	public function createTable($table, $columns, $options = null)
+	{
+		$sql = $this->db->getQueryBuilder()->createTable($table, $columns, $options);
+		return $this->setSql($sql);
+	}
+
+	/**
+	 * Creates a SQL command for renaming a DB table.
+	 * @param string $table the table to be renamed. The name will be properly quoted by the method.
+	 * @param string $newName the new table name. The name will be properly quoted by the method.
+	 * @return Command the command object itself
+	 */
+	public function renameTable($table, $newName)
+	{
+		$sql = $this->db->getQueryBuilder()->renameTable($table, $newName);
+		return $this->setSql($sql);
+	}
+
+	/**
+	 * Creates a SQL command for dropping a DB table.
+	 * @param string $table the table to be dropped. The name will be properly quoted by the method.
+	 * @return Command the command object itself
+	 */
+	public function dropTable($table)
+	{
+		$sql = $this->db->getQueryBuilder()->dropTable($table);
+		return $this->setSql($sql);
+	}
+
+	/**
+	 * Creates a SQL command for truncating a DB table.
+	 * @param string $table the table to be truncated. The name will be properly quoted by the method.
+	 * @return Command the command object itself
+	 */
+	public function truncateTable($table)
+	{
+		$sql = $this->db->getQueryBuilder()->truncateTable($table);
+		return $this->setSql($sql);
+	}
+
+	/**
+	 * Creates a SQL command for adding a new DB column.
+	 * @param string $table the table that the new column will be added to. The table name will be properly quoted by the method.
+	 * @param string $column the name of the new column. The name will be properly quoted by the method.
+	 * @param string $type the column type. [[\yii\db\QueryBuilder::getColumnType()]] will be called
+	 * to convert the give column type to the physical one. For example, `string` will be converted
+	 * as `varchar(255)`, and `string not null` becomes `varchar(255) not null`.
+	 * @return Command the command object itself
+	 */
+	public function addColumn($table, $column, $type)
+	{
+		$sql = $this->db->getQueryBuilder()->addColumn($table, $column, $type);
+		return $this->setSql($sql);
+	}
+
+	/**
+	 * Creates a SQL command for dropping a DB column.
+	 * @param string $table the table whose column is to be dropped. The name will be properly quoted by the method.
+	 * @param string $column the name of the column to be dropped. The name will be properly quoted by the method.
+	 * @return Command the command object itself
+	 */
+	public function dropColumn($table, $column)
+	{
+		$sql = $this->db->getQueryBuilder()->dropColumn($table, $column);
+		return $this->setSql($sql);
+	}
+
+	/**
+	 * Creates a SQL command for renaming a column.
+	 * @param string $table the table whose column is to be renamed. The name will be properly quoted by the method.
+	 * @param string $oldName the old name of the column. The name will be properly quoted by the method.
+	 * @param string $newName the new name of the column. The name will be properly quoted by the method.
+	 * @return Command the command object itself
+	 */
+	public function renameColumn($table, $oldName, $newName)
+	{
+		$sql = $this->db->getQueryBuilder()->renameColumn($table, $oldName, $newName);
+		return $this->setSql($sql);
+	}
+
+	/**
+	 * Creates a SQL command for changing the definition of a column.
+	 * @param string $table the table whose column is to be changed. The table name will be properly quoted by the method.
+	 * @param string $column the name of the column to be changed. The name will be properly quoted by the method.
+	 * @param string $type the column type. [[\yii\db\QueryBuilder::getColumnType()]] will be called
+	 * to convert the give column type to the physical one. For example, `string` will be converted
+	 * as `varchar(255)`, and `string not null` becomes `varchar(255) not null`.
+	 * @return Command the command object itself
+	 */
+	public function alterColumn($table, $column, $type)
+	{
+		$sql = $this->db->getQueryBuilder()->alterColumn($table, $column, $type);
+		return $this->setSql($sql);
+	}
+
+	/**
+	 * Creates a SQL command for adding a foreign key constraint to an existing table.
+	 * The method will properly quote the table and column names.
+	 * @param string $name the name of the foreign key constraint.
+	 * @param string $table the table that the foreign key constraint will be added to.
+	 * @param string $columns the name of the column to that the constraint will be added on. If there are multiple columns, separate them with commas.
+	 * @param string $refTable the table that the foreign key references to.
+	 * @param string $refColumns the name of the column that the foreign key references to. If there are multiple columns, separate them with commas.
+	 * @param string $delete the ON DELETE option. Most DBMS support these options: RESTRICT, CASCADE, NO ACTION, SET DEFAULT, SET NULL
+	 * @param string $update the ON UPDATE option. Most DBMS support these options: RESTRICT, CASCADE, NO ACTION, SET DEFAULT, SET NULL
+	 * @return Command the command object itself
+	 */
+	public function addForeignKey($name, $table, $columns, $refTable, $refColumns, $delete = null, $update = null)
+	{
+		$sql = $this->db->getQueryBuilder()->addForeignKey($name, $table, $columns, $refTable, $refColumns, $delete, $update);
+		return $this->setSql($sql);
+	}
+
+	/**
+	 * Creates a SQL command for dropping a foreign key constraint.
+	 * @param string $name the name of the foreign key constraint to be dropped. The name will be properly quoted by the method.
+	 * @param string $table the table whose foreign is to be dropped. The name will be properly quoted by the method.
+	 * @return Command the command object itself
+	 */
+	public function dropForeignKey($name, $table)
+	{
+		$sql = $this->db->getQueryBuilder()->dropForeignKey($name, $table);
+		return $this->setSql($sql);
+	}
+
+	/**
+	 * Creates a SQL command for creating a new index.
+	 * @param string $name the name of the index. The name will be properly quoted by the method.
+	 * @param string $table the table that the new index will be created for. The table name will be properly quoted by the method.
+	 * @param string $columns the column(s) that should be included in the index. If there are multiple columns, please separate them
+	 * by commas. The column names will be properly quoted by the method.
+	 * @param boolean $unique whether to add UNIQUE constraint on the created index.
+	 * @return Command the command object itself
+	 */
+	public function createIndex($name, $table, $columns, $unique = false)
+	{
+		$sql = $this->db->getQueryBuilder()->createIndex($name, $table, $columns, $unique);
+		return $this->setSql($sql);
+	}
+
+	/**
+	 * Creates a SQL command for dropping an index.
+	 * @param string $name the name of the index to be dropped. The name will be properly quoted by the method.
+	 * @param string $table the table whose index is to be dropped. The name will be properly quoted by the method.
+	 * @return Command the command object itself
+	 */
+	public function dropIndex($name, $table)
+	{
+		$sql = $this->db->getQueryBuilder()->dropIndex($name, $table);
+		return $this->setSql($sql);
+	}
+
+	/**
+	 * Creates a SQL command for resetting the sequence value of a table's primary key.
+	 * The sequence will be reset such that the primary key of the next new row inserted
+	 * will have the specified value or 1.
+	 * @param string $table the name of the table whose primary key sequence will be reset
+	 * @param mixed $value the value for the primary key of the next new row inserted. If this is not set,
+	 * the next new row's primary key will have a value 1.
+	 * @return Command the command object itself
+	 * @throws NotSupportedException if this is not supported by the underlying DBMS
+	 */
+	public function resetSequence($table, $value = null)
+	{
+		$sql = $this->db->getQueryBuilder()->resetSequence($table, $value);
+		return $this->setSql($sql);
+	}
+
+	/**
+	 * Builds a SQL command for enabling or disabling integrity check.
+	 * @param boolean $check whether to turn on or off the integrity check.
+	 * @param string $schema the schema name of the tables. Defaults to empty string, meaning the current
+	 * or default schema.
+	 * @return Command the command object itself
+	 * @throws NotSupportedException if this is not supported by the underlying DBMS
+	 */
+	public function checkIntegrity($check = true, $schema = '')
+	{
+		$sql = $this->db->getQueryBuilder()->checkIntegrity($check, $schema);
+		return $this->setSql($sql);
+	}
+}
diff --git a/yii/db/Connection.php b/yii/db/Connection.php
new file mode 100644
index 0000000..37a5307
--- /dev/null
+++ b/yii/db/Connection.php
@@ -0,0 +1,563 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\db;
+
+use yii\base\Component;
+use yii\base\InvalidConfigException;
+use yii\base\NotSupportedException;
+use yii\caching\Cache;
+
+/**
+ * Connection represents a connection to a database via [PDO](http://www.php.net/manual/en/ref.pdo.php).
+ *
+ * Connection works together with [[Command]], [[DataReader]] and [[Transaction]]
+ * to provide data access to various DBMS in a common set of APIs. They are a thin wrapper
+ * of the [[PDO PHP extension]](http://www.php.net/manual/en/ref.pdo.php).
+ *
+ * To establish a DB connection, set [[dsn]], [[username]] and [[password]], and then
+ * call [[open()]] to be true.
+ *
+ * The following example shows how to create a Connection instance and establish
+ * the DB connection:
+ *
+ * ~~~
+ * $connection = new \yii\db\Connection(array(
+ *     'dsn' => $dsn,
+ *     'username' => $username,
+ *     'password' => $password,
+ * ));
+ * $connection->open();
+ * ~~~
+ *
+ * After the DB connection is established, one can execute SQL statements like the following:
+ *
+ * ~~~
+ * $command = $connection->createCommand('SELECT * FROM tbl_post');
+ * $posts = $command->queryAll();
+ * $command = $connection->createCommand('UPDATE tbl_post SET status=1');
+ * $command->execute();
+ * ~~~
+ *
+ * One can also do prepared SQL execution and bind parameters to the prepared SQL.
+ * When the parameters are coming from user input, you should use this approach
+ * to prevent SQL injection attacks. The following is an example:
+ *
+ * ~~~
+ * $command = $connection->createCommand('SELECT * FROM tbl_post WHERE id=:id');
+ * $command->bindValue(':id', $_GET['id']);
+ * $post = $command->query();
+ * ~~~
+ *
+ * For more information about how to perform various DB queries, please refer to [[Command]].
+ *
+ * If the underlying DBMS supports transactions, you can perform transactional SQL queries
+ * like the following:
+ *
+ * ~~~
+ * $transaction = $connection->beginTransaction();
+ * try {
+ *     $connection->createCommand($sql1)->execute();
+ *     $connection->createCommand($sql2)->execute();
+ *     // ... executing other SQL statements ...
+ *     $transaction->commit();
+ * } catch(Exception $e) {
+ *     $transaction->rollback();
+ * }
+ * ~~~
+ *
+ * Connection is often used as an application component and configured in the application
+ * configuration like the following:
+ *
+ * ~~~
+ * array(
+ *	 'components' => array(
+ *		 'db' => array(
+ *			 'class' => '\yii\db\Connection',
+ *			 'dsn' => 'mysql:host=127.0.0.1;dbname=demo',
+ *			 'username' => 'root',
+ *			 'password' => '',
+ *			 'charset' => 'utf8',
+ *		 ),
+ *	 ),
+ * )
+ * ~~~
+ *
+ * @property boolean $isActive Whether the DB connection is established. This property is read-only.
+ * @property Transaction $transaction The currently active transaction. Null if no active transaction.
+ * @property Schema $schema The database schema information for the current connection.
+ * @property QueryBuilder $queryBuilder The query builder.
+ * @property string $lastInsertID The row ID of the last row inserted, or the last value retrieved from the sequence object.
+ * @property string $driverName Name of the DB driver currently being used.
+ * @property array $querySummary The statistical results of SQL queries.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Connection extends Component
+{
+	/**
+	 * @event Event an event that is triggered after a DB connection is established
+	 */
+	const EVENT_AFTER_OPEN = 'afterOpen';
+
+	/**
+	 * @var string the Data Source Name, or DSN, contains the information required to connect to the database.
+	 * Please refer to the [PHP manual](http://www.php.net/manual/en/function.PDO-construct.php) on
+	 * the format of the DSN string.
+	 * @see charset
+	 */
+	public $dsn;
+	/**
+	 * @var string the username for establishing DB connection. Defaults to empty string.
+	 */
+	public $username = '';
+	/**
+	 * @var string the password for establishing DB connection. Defaults to empty string.
+	 */
+	public $password = '';
+	/**
+	 * @var array PDO attributes (name=>value) that should be set when calling [[open()]]
+	 * to establish a DB connection. Please refer to the
+	 * [PHP manual](http://www.php.net/manual/en/function.PDO-setAttribute.php) for
+	 * details about available attributes.
+	 */
+	public $attributes;
+	/**
+	 * @var \PDO the PHP PDO instance associated with this DB connection.
+	 * This property is mainly managed by [[open()]] and [[close()]] methods.
+	 * When a DB connection is active, this property will represent a PDO instance;
+	 * otherwise, it will be null.
+	 */
+	public $pdo;
+	/**
+	 * @var boolean whether to enable schema caching.
+	 * Note that in order to enable truly schema caching, a valid cache component as specified
+	 * by [[schemaCache]] must be enabled and [[enableSchemaCache]] must be set true.
+	 * @see schemaCacheDuration
+	 * @see schemaCacheExclude
+	 * @see schemaCache
+	 */
+	public $enableSchemaCache = false;
+	/**
+	 * @var integer number of seconds that table metadata can remain valid in cache.
+	 * Use 0 to indicate that the cached data will never expire.
+	 * @see enableSchemaCache
+	 */
+	public $schemaCacheDuration = 3600;
+	/**
+	 * @var array list of tables whose metadata should NOT be cached. Defaults to empty array.
+	 * The table names may contain schema prefix, if any. Do not quote the table names.
+	 * @see enableSchemaCache
+	 */
+	public $schemaCacheExclude = array();
+	/**
+	 * @var Cache|string the cache object or the ID of the cache application component that
+	 * is used to cache the table metadata.
+	 * @see enableSchemaCache
+	 */
+	public $schemaCache = 'cache';
+	/**
+	 * @var boolean whether to enable query caching.
+	 * Note that in order to enable query caching, a valid cache component as specified
+	 * by [[queryCache]] must be enabled and [[enableQueryCache]] must be set true.
+	 *
+	 * Methods [[beginCache()]] and [[endCache()]] can be used as shortcuts to turn on
+	 * and off query caching on the fly.
+	 * @see queryCacheDuration
+	 * @see queryCache
+	 * @see queryCacheDependency
+	 * @see beginCache()
+	 * @see endCache()
+	 */
+	public $enableQueryCache = false;
+	/**
+	 * @var integer number of seconds that query results can remain valid in cache.
+	 * Defaults to 3600, meaning 3600 seconds, or one hour.
+	 * Use 0 to indicate that the cached data will never expire.
+	 * @see enableQueryCache
+	 */
+	public $queryCacheDuration = 3600;
+	/**
+	 * @var \yii\caching\Dependency the dependency that will be used when saving query results into cache.
+	 * Defaults to null, meaning no dependency.
+	 * @see enableQueryCache
+	 */
+	public $queryCacheDependency;
+	/**
+	 * @var Cache|string the cache object or the ID of the cache application component
+	 * that is used for query caching.
+	 * @see enableQueryCache
+	 */
+	public $queryCache = 'cache';
+	/**
+	 * @var string the charset used for database connection. The property is only used
+	 * for MySQL and PostgreSQL databases. Defaults to null, meaning using default charset
+	 * as specified by the database.
+	 *
+	 * Note that if you're using GBK or BIG5 then it's highly recommended to
+	 * update to PHP 5.3.6+ and to specify charset via DSN like
+	 * 'mysql:dbname=mydatabase;host=127.0.0.1;charset=GBK;'.
+	 */
+	public $charset;
+	/**
+	 * @var boolean whether to turn on prepare emulation. Defaults to false, meaning PDO
+	 * will use the native prepare support if available. For some databases (such as MySQL),
+	 * this may need to be set true so that PDO can emulate the prepare support to bypass
+	 * the buggy native prepare support.
+	 * The default value is null, which means the PDO ATTR_EMULATE_PREPARES value will not be changed.
+	 */
+	public $emulatePrepare;
+	/**
+	 * @var boolean whether to enable profiling for the SQL statements being executed.
+	 * Defaults to false. This should be mainly enabled and used during development
+	 * to find out the bottleneck of SQL executions.
+	 * @see getStats
+	 */
+	public $enableProfiling = false;
+	/**
+	 * @var string the common prefix or suffix for table names. If a table name is given
+	 * as `{{%TableName}}`, then the percentage character `%` will be replaced with this
+	 * property value. For example, `{{%post}}` becomes `{{tbl_post}}` if this property is
+	 * set as `"tbl_"`.
+	 */
+	public $tablePrefix;
+	/**
+	 * @var array mapping between PDO driver names and [[Schema]] classes.
+	 * The keys of the array are PDO driver names while the values the corresponding
+	 * schema class name or configuration. Please refer to [[\Yii::createObject()]] for
+	 * details on how to specify a configuration.
+	 *
+	 * This property is mainly used by [[getSchema()]] when fetching the database schema information.
+	 * You normally do not need to set this property unless you want to use your own
+	 * [[Schema]] class to support DBMS that is not supported by Yii.
+	 */
+	public $schemaMap = array(
+		'pgsql' => 'yii\db\pgsql\Schema',    // PostgreSQL
+		'mysqli' => 'yii\db\mysql\Schema',   // MySQL
+		'mysql' => 'yii\db\mysql\Schema',    // MySQL
+		'sqlite' => 'yii\db\sqlite\Schema',  // sqlite 3
+		'sqlite2' => 'yii\db\sqlite\Schema', // sqlite 2
+		'mssql' => 'yii\db\dao\mssql\Schema', // Mssql driver on windows hosts
+		'sqlsrv' => 'yii\db\mssql\Schema',   // Mssql
+		'oci' => 'yii\db\oci\Schema',        // Oracle driver
+		'dblib' => 'yii\db\mssql\Schema',    // dblib drivers on linux (and maybe others os) hosts
+	);
+	/**
+	 * @var Transaction the currently active transaction
+	 */
+	private $_transaction;
+	/**
+	 * @var Schema the database schema
+	 */
+	private $_schema;
+
+	/**
+	 * Closes the connection when this component is being serialized.
+	 * @return array
+	 */
+	public function __sleep()
+	{
+		$this->close();
+		return array_keys(get_object_vars($this));
+	}
+
+	/**
+	 * Returns a value indicating whether the DB connection is established.
+	 * @return boolean whether the DB connection is established
+	 */
+	public function getIsActive()
+	{
+		return $this->pdo !== null;
+	}
+
+	/**
+	 * Turns on query caching.
+	 * This method is provided as a shortcut to setting two properties that are related
+	 * with query caching: [[queryCacheDuration]] and [[queryCacheDependency]].
+	 * @param integer $duration the number of seconds that query results may remain valid in cache.
+	 * If not set, it will use the value of [[queryCacheDuration]]. See [[queryCacheDuration]] for more details.
+	 * @param \yii\caching\Dependency $dependency the dependency for the cached query result.
+	 * See [[queryCacheDependency]] for more details.
+	 */
+	public function beginCache($duration = null, $dependency = null)
+	{
+		$this->enableQueryCache = true;
+		if ($duration !== null) {
+			$this->queryCacheDuration = $duration;
+		}
+		$this->queryCacheDependency = $dependency;
+	}
+
+	/**
+	 * Turns off query caching.
+	 */
+	public function endCache()
+	{
+		$this->enableQueryCache = false;
+	}
+
+	/**
+	 * Establishes a DB connection.
+	 * It does nothing if a DB connection has already been established.
+	 * @throws Exception if connection fails
+	 */
+	public function open()
+	{
+		if ($this->pdo === null) {
+			if (empty($this->dsn)) {
+				throw new InvalidConfigException('Connection::dsn cannot be empty.');
+			}
+			try {
+				\Yii::trace('Opening DB connection: ' . $this->dsn, __METHOD__);
+				$this->pdo = $this->createPdoInstance();
+				$this->initConnection();
+			}
+			catch (\PDOException $e) {
+				\Yii::error("Failed to open DB connection ({$this->dsn}): " . $e->getMessage(), __METHOD__);
+				$message = YII_DEBUG ? 'Failed to open DB connection: ' . $e->getMessage() : 'Failed to open DB connection.';
+				throw new Exception($message, $e->errorInfo, (int)$e->getCode());
+			}
+		}
+	}
+
+	/**
+	 * Closes the currently active DB connection.
+	 * It does nothing if the connection is already closed.
+	 */
+	public function close()
+	{
+		if ($this->pdo !== null) {
+			\Yii::trace('Closing DB connection: ' . $this->dsn, __METHOD__);
+			$this->pdo = null;
+			$this->_schema = null;
+			$this->_transaction = null;
+		}
+	}
+
+	/**
+	 * Creates the PDO instance.
+	 * This method is called by [[open]] to establish a DB connection.
+	 * The default implementation will create a PHP PDO instance.
+	 * You may override this method if the default PDO needs to be adapted for certain DBMS.
+	 * @return \PDO the pdo instance
+	 */
+	protected function createPdoInstance()
+	{
+		$pdoClass = '\PDO';
+		if (($pos = strpos($this->dsn, ':')) !== false) {
+			$driver = strtolower(substr($this->dsn, 0, $pos));
+			if ($driver === 'mssql' || $driver === 'dblib' || $driver === 'sqlsrv') {
+				$pdoClass = 'yii\db\mssql\PDO';
+			}
+		}
+		return new $pdoClass($this->dsn, $this->username, $this->password, $this->attributes);
+	}
+
+	/**
+	 * Initializes the DB connection.
+	 * This method is invoked right after the DB connection is established.
+	 * The default implementation turns on `PDO::ATTR_EMULATE_PREPARES`
+	 * if [[emulatePrepare]] is true, and sets the database [[charset]] if it is not empty.
+	 * It then triggers an [[EVENT_AFTER_OPEN]] event.
+	 */
+	protected function initConnection()
+	{
+		$this->pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+		if ($this->emulatePrepare !== null && constant('\PDO::ATTR_EMULATE_PREPARES')) {
+			$this->pdo->setAttribute(\PDO::ATTR_EMULATE_PREPARES, $this->emulatePrepare);
+		}
+		if ($this->charset !== null && in_array($this->getDriverName(), array('pgsql', 'mysql', 'mysqli'))) {
+			$this->pdo->exec('SET NAMES ' . $this->pdo->quote($this->charset));
+		}
+		$this->trigger(self::EVENT_AFTER_OPEN);
+	}
+
+	/**
+	 * Creates a command for execution.
+	 * @param string $sql the SQL statement to be executed
+	 * @param array $params the parameters to be bound to the SQL statement
+	 * @return Command the DB command
+	 */
+	public function createCommand($sql = null, $params = array())
+	{
+		$this->open();
+		$command = new Command(array(
+			'db' => $this,
+			'sql' => $sql,
+		));
+		return $command->bindValues($params);
+	}
+
+	/**
+	 * Returns the currently active transaction.
+	 * @return Transaction the currently active transaction. Null if no active transaction.
+	 */
+	public function getTransaction()
+	{
+		return $this->_transaction && $this->_transaction->isActive ? $this->_transaction : null;
+	}
+
+	/**
+	 * Starts a transaction.
+	 * @return Transaction the transaction initiated
+	 */
+	public function beginTransaction()
+	{
+		$this->open();
+		$this->_transaction = new Transaction(array(
+			'db' => $this,
+		));
+		$this->_transaction->begin();
+		return $this->_transaction;
+	}
+
+	/**
+	 * Returns the schema information for the database opened by this connection.
+	 * @return Schema the schema information for the database opened by this connection.
+	 * @throws NotSupportedException if there is no support for the current driver type
+	 */
+	public function getSchema()
+	{
+		if ($this->_schema !== null) {
+			return $this->_schema;
+		} else {
+			$driver = $this->getDriverName();
+			if (isset($this->schemaMap[$driver])) {
+				$this->_schema = \Yii::createObject($this->schemaMap[$driver]);
+				$this->_schema->db = $this;
+				return $this->_schema;
+			} else {
+				throw new NotSupportedException("Connection does not support reading schema information for '$driver' DBMS.");
+			}
+		}
+	}
+
+	/**
+	 * Returns the query builder for the current DB connection.
+	 * @return QueryBuilder the query builder for the current DB connection.
+	 */
+	public function getQueryBuilder()
+	{
+		return $this->getSchema()->getQueryBuilder();
+	}
+
+	/**
+	 * Obtains the schema information for the named table.
+	 * @param string $name table name.
+	 * @param boolean $refresh whether to reload the table schema even if it is found in the cache.
+	 * @return TableSchema table schema information. Null if the named table does not exist.
+	 */
+	public function getTableSchema($name, $refresh = false)
+	{
+		return $this->getSchema()->getTableSchema($name, $refresh);
+	}
+
+	/**
+	 * Returns the ID of the last inserted row or sequence value.
+	 * @param string $sequenceName name of the sequence object (required by some DBMS)
+	 * @return string the row ID of the last row inserted, or the last value retrieved from the sequence object
+	 * @see http://www.php.net/manual/en/function.PDO-lastInsertId.php
+	 */
+	public function getLastInsertID($sequenceName = '')
+	{
+		return $this->getSchema()->getLastInsertID($sequenceName);
+	}
+
+	/**
+	 * Quotes a string value for use in a query.
+	 * Note that if the parameter is not a string, it will be returned without change.
+	 * @param string $str string to be quoted
+	 * @return string the properly quoted string
+	 * @see http://www.php.net/manual/en/function.PDO-quote.php
+	 */
+	public function quoteValue($str)
+	{
+		return $this->getSchema()->quoteValue($str);
+	}
+
+	/**
+	 * Quotes a table name for use in a query.
+	 * If the table name contains schema prefix, the prefix will also be properly quoted.
+	 * If the table name is already quoted or contains special characters including '(', '[[' and '{{',
+	 * then this method will do nothing.
+	 * @param string $name table name
+	 * @return string the properly quoted table name
+	 */
+	public function quoteTableName($name)
+	{
+		return $this->getSchema()->quoteTableName($name);
+	}
+
+	/**
+	 * Quotes a column name for use in a query.
+	 * If the column name contains prefix, the prefix will also be properly quoted.
+	 * If the column name is already quoted or contains special characters including '(', '[[' and '{{',
+	 * then this method will do nothing.
+	 * @param string $name column name
+	 * @return string the properly quoted column name
+	 */
+	public function quoteColumnName($name)
+	{
+		return $this->getSchema()->quoteColumnName($name);
+	}
+
+	/**
+	 * Processes a SQL statement by quoting table and column names that are enclosed within double brackets.
+	 * Tokens enclosed within double curly brackets are treated as table names, while
+	 * tokens enclosed within double square brackets are column names. They will be quoted accordingly.
+	 * Also, the percentage character "%" in a table name will be replaced with [[tablePrefix]].
+	 * @param string $sql the SQL to be quoted
+	 * @return string the quoted SQL
+	 */
+	public function quoteSql($sql)
+	{
+		$db = $this;
+		return preg_replace_callback('/(\\{\\{([%\w\-\. ]+)\\}\\}|\\[\\[([\w\-\. ]+)\\]\\])/',
+			function($matches) use($db) {
+				if (isset($matches[3])) {
+					return $db->quoteColumnName($matches[3]);
+				} else {
+					return str_replace('%', $db->tablePrefix, $db->quoteTableName($matches[2]));
+				}
+			}, $sql);
+	}
+
+	/**
+	 * Returns the name of the DB driver for the current [[dsn]].
+	 * @return string name of the DB driver
+	 */
+	public function getDriverName()
+	{
+		if (($pos = strpos($this->dsn, ':')) !== false) {
+			return strtolower(substr($this->dsn, 0, $pos));
+		} else {
+			return strtolower($this->pdo->getAttribute(\PDO::ATTR_DRIVER_NAME));
+		}
+	}
+
+	/**
+	 * Returns the statistical results of SQL queries.
+	 * The results returned include the number of SQL statements executed and
+	 * the total time spent.
+	 * In order to use this method, [[enableProfiling]] has to be set true.
+	 * @return array the first element indicates the number of SQL statements executed,
+	 * and the second element the total time spent in SQL execution.
+	 * @see \yii\logging\Logger::getProfiling()
+	 */
+	public function getQuerySummary()
+	{
+		$logger = \Yii::getLogger();
+		$timings = $logger->getProfiling(array('yii\db\Command::query', 'yii\db\Command::execute'));
+		$count = count($timings);
+		$time = 0;
+		foreach ($timings as $timing) {
+			$time += $timing[1];
+		}
+		return array($count, $time);
+	}
+}
diff --git a/yii/db/DataReader.php b/yii/db/DataReader.php
new file mode 100644
index 0000000..20444e7
--- /dev/null
+++ b/yii/db/DataReader.php
@@ -0,0 +1,264 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\db;
+
+use yii\base\InvalidCallException;
+
+/**
+ * DataReader represents a forward-only stream of rows from a query result set.
+ *
+ * To read the current row of data, call [[read()]]. The method [[readAll()]]
+ * returns all the rows in a single array. Rows of data can also be read by
+ * iterating through the reader. For example,
+ *
+ * ~~~
+ * $reader = $command->query('SELECT * FROM tbl_post');
+ *
+ * while ($row = $reader->read()) {
+ *     $rows[] = $row;
+ * }
+ *
+ * // equivalent to:
+ * foreach($reader as $row) {
+ *     $rows[] = $row;
+ * }
+ *
+ * // equivalent to:
+ * $rows = $reader->readAll();
+ * ~~~
+ *
+ * Note that since DataReader is a forward-only stream, you can only traverse it once.
+ * Doing it the second time will throw an exception.
+ *
+ * It is possible to use a specific mode of data fetching by setting
+ * [[fetchMode]]. See the [PHP manual](http://www.php.net/manual/en/function.PDOStatement-setFetchMode.php)
+ * for more details about possible fetch mode.
+ *
+ * @property boolean $isClosed whether the reader is closed or not.
+ * @property integer $rowCount number of rows contained in the result.
+ * @property integer $columnCount the number of columns in the result set.
+ * @property mixed $fetchMode fetch mode used when retrieving the data.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class DataReader extends \yii\base\Object implements \Iterator, \Countable
+{
+	/**
+	 * @var \PDOStatement the PDOStatement associated with the command
+	 */
+	private $_statement;
+	private $_closed = false;
+	private $_row;
+	private $_index = -1;
+
+	/**
+	 * Constructor.
+	 * @param Command $command the command generating the query result
+	 * @param array $config name-value pairs that will be used to initialize the object properties
+	 */
+	public function __construct(Command $command, $config = array())
+	{
+		$this->_statement = $command->pdoStatement;
+		$this->_statement->setFetchMode(\PDO::FETCH_ASSOC);
+		parent::__construct($config);
+	}
+
+	/**
+	 * Binds a column to a PHP variable.
+	 * When rows of data are being fetched, the corresponding column value
+	 * will be set in the variable. Note, the fetch mode must include PDO::FETCH_BOUND.
+	 * @param mixed $column Number of the column (1-indexed) or name of the column
+	 * in the result set. If using the column name, be aware that the name
+	 * should match the case of the column, as returned by the driver.
+	 * @param mixed $value Name of the PHP variable to which the column will be bound.
+	 * @param integer $dataType Data type of the parameter
+	 * @see http://www.php.net/manual/en/function.PDOStatement-bindColumn.php
+	 */
+	public function bindColumn($column, &$value, $dataType = null)
+	{
+		if ($dataType === null) {
+			$this->_statement->bindColumn($column, $value);
+		} else {
+			$this->_statement->bindColumn($column, $value, $dataType);
+		}
+	}
+
+	/**
+	 * Set the default fetch mode for this statement
+	 * @param mixed $mode fetch mode
+	 * @see http://www.php.net/manual/en/function.PDOStatement-setFetchMode.php
+	 */
+	public function setFetchMode($mode)
+	{
+		$params = func_get_args();
+		call_user_func_array(array($this->_statement, 'setFetchMode'), $params);
+	}
+
+	/**
+	 * Advances the reader to the next row in a result set.
+	 * @return array the current row, false if no more row available
+	 */
+	public function read()
+	{
+		return $this->_statement->fetch();
+	}
+
+	/**
+	 * Returns a single column from the next row of a result set.
+	 * @param integer $columnIndex zero-based column index
+	 * @return mixed the column of the current row, false if no more row available
+	 */
+	public function readColumn($columnIndex)
+	{
+		return $this->_statement->fetchColumn($columnIndex);
+	}
+
+	/**
+	 * Returns an object populated with the next row of data.
+	 * @param string $className class name of the object to be created and populated
+	 * @param array $fields Elements of this array are passed to the constructor
+	 * @return mixed the populated object, false if no more row of data available
+	 */
+	public function readObject($className, $fields)
+	{
+		return $this->_statement->fetchObject($className, $fields);
+	}
+
+	/**
+	 * Reads the whole result set into an array.
+	 * @return array the result set (each array element represents a row of data).
+	 * An empty array will be returned if the result contains no row.
+	 */
+	public function readAll()
+	{
+		return $this->_statement->fetchAll();
+	}
+
+	/**
+	 * Advances the reader to the next result when reading the results of a batch of statements.
+	 * This method is only useful when there are multiple result sets
+	 * returned by the query. Not all DBMS support this feature.
+	 * @return boolean Returns true on success or false on failure.
+	 */
+	public function nextResult()
+	{
+		if (($result = $this->_statement->nextRowset()) !== false) {
+			$this->_index = -1;
+		}
+		return $result;
+	}
+
+	/**
+	 * Closes the reader.
+	 * This frees up the resources allocated for executing this SQL statement.
+	 * Read attempts after this method call are unpredictable.
+	 */
+	public function close()
+	{
+		$this->_statement->closeCursor();
+		$this->_closed = true;
+	}
+
+	/**
+	 * whether the reader is closed or not.
+	 * @return boolean whether the reader is closed or not.
+	 */
+	public function getIsClosed()
+	{
+		return $this->_closed;
+	}
+
+	/**
+	 * Returns the number of rows in the result set.
+	 * Note, most DBMS may not give a meaningful count.
+	 * In this case, use "SELECT COUNT(*) FROM tableName" to obtain the number of rows.
+	 * @return integer number of rows contained in the result.
+	 */
+	public function getRowCount()
+	{
+		return $this->_statement->rowCount();
+	}
+
+	/**
+	 * Returns the number of rows in the result set.
+	 * This method is required by the Countable interface.
+	 * Note, most DBMS may not give a meaningful count.
+	 * In this case, use "SELECT COUNT(*) FROM tableName" to obtain the number of rows.
+	 * @return integer number of rows contained in the result.
+	 */
+	public function count()
+	{
+		return $this->getRowCount();
+	}
+
+	/**
+	 * Returns the number of columns in the result set.
+	 * Note, even there's no row in the reader, this still gives correct column number.
+	 * @return integer the number of columns in the result set.
+	 */
+	public function getColumnCount()
+	{
+		return $this->_statement->columnCount();
+	}
+
+	/**
+	 * Resets the iterator to the initial state.
+	 * This method is required by the interface Iterator.
+	 * @throws InvalidCallException if this method is invoked twice
+	 */
+	public function rewind()
+	{
+		if ($this->_index < 0) {
+			$this->_row = $this->_statement->fetch();
+			$this->_index = 0;
+		} else {
+			throw new InvalidCallException('DataReader cannot rewind. It is a forward-only reader.');
+		}
+	}
+
+	/**
+	 * Returns the index of the current row.
+	 * This method is required by the interface Iterator.
+	 * @return integer the index of the current row.
+	 */
+	public function key()
+	{
+		return $this->_index;
+	}
+
+	/**
+	 * Returns the current row.
+	 * This method is required by the interface Iterator.
+	 * @return mixed the current row.
+	 */
+	public function current()
+	{
+		return $this->_row;
+	}
+
+	/**
+	 * Moves the internal pointer to the next row.
+	 * This method is required by the interface Iterator.
+	 */
+	public function next()
+	{
+		$this->_row = $this->_statement->fetch();
+		$this->_index++;
+	}
+
+	/**
+	 * Returns whether there is a row of data at current position.
+	 * This method is required by the interface Iterator.
+	 * @return boolean whether there is a row of data at current position.
+	 */
+	public function valid()
+	{
+		return $this->_row !== false;
+	}
+}
diff --git a/yii/db/Exception.php b/yii/db/Exception.php
new file mode 100644
index 0000000..b7a60b4
--- /dev/null
+++ b/yii/db/Exception.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\db;
+
+/**
+ * Exception represents an exception that is caused by some DB-related operations.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Exception extends \yii\base\Exception
+{
+	/**
+	 * @var mixed the error info provided by a PDO exception. This is the same as returned
+	 * by [PDO::errorInfo](http://www.php.net/manual/en/pdo.errorinfo.php).
+	 */
+	public $errorInfo;
+
+	/**
+	 * Constructor.
+	 * @param string $message PDO error message
+	 * @param mixed $errorInfo PDO error info
+	 * @param integer $code PDO error code
+	 * @param \Exception $previous The previous exception used for the exception chaining.
+	 */
+	public function __construct($message, $errorInfo = null, $code = 0, \Exception $previous = null)
+	{
+		$this->errorInfo = $errorInfo;
+		parent::__construct($message, $code, $previous);
+	}
+
+	/**
+	 * @return string the user-friendly name of this exception
+	 */
+	public function getName()
+	{
+		return \Yii::t('yii|Database Exception');
+	}
+}
diff --git a/yii/db/Expression.php b/yii/db/Expression.php
new file mode 100644
index 0000000..77e9f60
--- /dev/null
+++ b/yii/db/Expression.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\db;
+
+/**
+ * Expression represents a DB expression that does not need escaping or quoting.
+ * When an Expression object is embedded within a SQL statement or fragment,
+ * it will be replaced with the [[expression]] property value without any
+ * DB escaping or quoting. For example,
+ *
+ * ~~~
+ * $expression = new Expression('NOW()');
+ * $sql = 'SELECT ' . $expression;  // SELECT NOW()
+ * ~~~
+ *
+ * An expression can also be bound with parameters specified via [[params]].
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Expression extends \yii\base\Object
+{
+	/**
+	 * @var string the DB expression
+	 */
+	public $expression;
+	/**
+	 * @var array list of parameters that should be bound for this expression.
+	 * The keys are placeholders appearing in [[expression]] and the values
+	 * are the corresponding parameter values.
+	 */
+	public $params = array();
+
+	/**
+	 * Constructor.
+	 * @param string $expression the DB expression
+	 * @param array $params parameters
+	 * @param array $config name-value pairs that will be used to initialize the object properties
+	 */
+	public function __construct($expression, $params = array(), $config = array())
+	{
+		$this->expression = $expression;
+		$this->params = $params;
+		parent::__construct($config);
+	}
+
+	/**
+	 * String magic method
+	 * @return string the DB expression
+	 */
+	public function __toString()
+	{
+		return $this->expression;
+	}
+}
diff --git a/yii/db/Migration.php b/yii/db/Migration.php
new file mode 100644
index 0000000..f51e597
--- /dev/null
+++ b/yii/db/Migration.php
@@ -0,0 +1,371 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\db;
+
+/**
+ * Migration is the base class for representing a database migration.
+ *
+ * Migration is designed to be used together with the "yiic migrate" command.
+ *
+ * Each child class of Migration represents an individual database migration which
+ * is identified by the child class name.
+ *
+ * Within each migration, the [[up()]] method should be overwritten to contain the logic
+ * for "upgrading" the database; while the [[down()]] method for the "downgrading"
+ * logic. The "yiic migrate" command manages all available migrations in an application.
+ *
+ * If the database supports transactions, you may also overwrite [[safeUp()]] and
+ * [[safeDown()]] so that if anything wrong happens during the upgrading or downgrading,
+ * the whole migration can be reverted in a whole.
+ *
+ * Migration provides a set of convenient methods for manipulating database data and schema.
+ * For example, the [[insert()]] method can be used to easily insert a row of data into
+ * a database table; the [[createTable()]] method can be used to create a database table.
+ * Compared with the same methods in [[Command]], these methods will display extra
+ * information showing the method parameters and execution time, which may be useful when
+ * applying migrations.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Migration extends \yii\base\Component
+{
+	/**
+	 * @var Connection the database connection that this migration should work with.
+	 * If not set, it will be initialized as the 'db' application component.
+	 */
+	public $db;
+
+	/**
+	 * Initializes the migration.
+	 * This method will set [[db]] to be the 'db' application component, if it is null.
+	 */
+	public function init()
+	{
+		parent::init();
+		if ($this->db === null) {
+			$this->db = \Yii::$app->getComponent('db');
+		}
+	}
+
+	/**
+	 * This method contains the logic to be executed when applying this migration.
+	 * Child classes may overwrite this method to provide actual migration logic.
+	 * @return boolean return a false value to indicate the migration fails
+	 * and should not proceed further. All other return values mean the migration succeeds.
+	 */
+	public function up()
+	{
+		$transaction = $this->db->beginTransaction();
+		try {
+			if ($this->safeUp() === false) {
+				$transaction->rollback();
+				return false;
+			}
+			$transaction->commit();
+		} catch (\Exception $e) {
+			echo "Exception: " . $e->getMessage() . ' (' . $e->getFile() . ':' . $e->getLine() . ")\n";
+			echo $e->getTraceAsString() . "\n";
+			$transaction->rollback();
+			return false;
+		}
+		return null;
+	}
+
+	/**
+	 * This method contains the logic to be executed when removing this migration.
+	 * The default implementation throws an exception indicating the migration cannot be removed.
+	 * Child classes may override this method if the corresponding migrations can be removed.
+	 * @return boolean return a false value to indicate the migration fails
+	 * and should not proceed further. All other return values mean the migration succeeds.
+	 */
+	public function down()
+	{
+		$transaction = $this->db->beginTransaction();
+		try {
+			if ($this->safeDown() === false) {
+				$transaction->rollback();
+				return false;
+			}
+			$transaction->commit();
+		} catch (\Exception $e) {
+			echo "Exception: " . $e->getMessage() . ' (' . $e->getFile() . ':' . $e->getLine() . ")\n";
+			echo $e->getTraceAsString() . "\n";
+			$transaction->rollback();
+			return false;
+		}
+		return null;
+	}
+
+	/**
+	 * This method contains the logic to be executed when applying this migration.
+	 * This method differs from [[up()]] in that the DB logic implemented here will
+	 * be enclosed within a DB transaction.
+	 * Child classes may implement this method instead of [[up()]] if the DB logic
+	 * needs to be within a transaction.
+	 * @return boolean return a false value to indicate the migration fails
+	 * and should not proceed further. All other return values mean the migration succeeds.
+	 */
+	public function safeUp()
+	{
+	}
+
+	/**
+	 * This method contains the logic to be executed when removing this migration.
+	 * This method differs from [[down()]] in that the DB logic implemented here will
+	 * be enclosed within a DB transaction.
+	 * Child classes may implement this method instead of [[up()]] if the DB logic
+	 * needs to be within a transaction.
+	 * @return boolean return a false value to indicate the migration fails
+	 * and should not proceed further. All other return values mean the migration succeeds.
+	 */
+	public function safeDown()
+	{
+	}
+
+	/**
+	 * Executes a SQL statement.
+	 * This method executes the specified SQL statement using [[db]].
+	 * @param string $sql the SQL statement to be executed
+	 * @param array $params input parameters (name=>value) for the SQL execution. See [[Command::execute()]] for more details.
+	 */
+	public function execute($sql, $params = array())
+	{
+		echo "    > execute SQL: $sql ...";
+		$time = microtime(true);
+		$this->db->createCommand($sql)->execute($params);
+		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+	}
+
+	/**
+	 * Creates and executes an INSERT SQL statement.
+	 * The method will properly escape the column names, and bind the values to be inserted.
+	 * @param string $table the table that new rows will be inserted into.
+	 * @param array $columns the column data (name=>value) to be inserted into the table.
+	 */
+	public function insert($table, $columns)
+	{
+		echo "    > insert into $table ...";
+		$time = microtime(true);
+		$this->db->createCommand()->insert($table, $columns)->execute();
+		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+	}
+
+	/**
+	 * Creates and executes an UPDATE SQL statement.
+	 * The method will properly escape the column names and bind the values to be updated.
+	 * @param string $table the table to be updated.
+	 * @param array $columns the column data (name=>value) to be updated.
+	 * @param mixed $condition the conditions that will be put in the WHERE part. Please
+	 * refer to [[Query::where()]] on how to specify conditions.
+	 * @param array $params the parameters to be bound to the query.
+	 */
+	public function update($table, $columns, $condition = '', $params = array())
+	{
+		echo "    > update $table ...";
+		$time = microtime(true);
+		$this->db->createCommand()->update($table, $columns, $condition, $params)->execute();
+		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+	}
+
+	/**
+	 * Creates and executes a DELETE SQL statement.
+	 * @param string $table the table where the data will be deleted from.
+	 * @param mixed $condition the conditions that will be put in the WHERE part. Please
+	 * refer to [[Query::where()]] on how to specify conditions.
+	 * @param array $params the parameters to be bound to the query.
+	 */
+	public function delete($table, $condition = '', $params = array())
+	{
+		echo "    > delete from $table ...";
+		$time = microtime(true);
+		$this->db->createCommand()->delete($table, $condition, $params)->execute();
+		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+	}
+
+	/**
+	 * Builds and executes a SQL statement for creating a new DB table.
+	 *
+	 * The columns in the new  table should be specified as name-definition pairs (e.g. 'name'=>'string'),
+	 * where name stands for a column name which will be properly quoted by the method, and definition
+	 * stands for the column type which can contain an abstract DB type.
+	 *
+	 * The [[QueryBuilder::getColumnType()]] method will be invoked to convert any abstract type into a physical one.
+	 *
+	 * If a column is specified with definition only (e.g. 'PRIMARY KEY (name, type)'), it will be directly
+	 * put into the generated SQL.
+	 *
+	 * @param string $table the name of the table to be created. The name will be properly quoted by the method.
+	 * @param array $columns the columns (name=>definition) in the new table.
+	 * @param string $options additional SQL fragment that will be appended to the generated SQL.
+	 */
+	public function createTable($table, $columns, $options = null)
+	{
+		echo "    > create table $table ...";
+		$time = microtime(true);
+		$this->db->createCommand()->createTable($table, $columns, $options)->execute();
+		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+	}
+
+	/**
+	 * Builds and executes a SQL statement for renaming a DB table.
+	 * @param string $table the table to be renamed. The name will be properly quoted by the method.
+	 * @param string $newName the new table name. The name will be properly quoted by the method.
+	 */
+	public function renameTable($table, $newName)
+	{
+		echo "    > rename table $table to $newName ...";
+		$time = microtime(true);
+		$this->db->createCommand()->renameTable($table, $newName)->execute();
+		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+	}
+
+	/**
+	 * Builds and executes a SQL statement for dropping a DB table.
+	 * @param string $table the table to be dropped. The name will be properly quoted by the method.
+	 */
+	public function dropTable($table)
+	{
+		echo "    > drop table $table ...";
+		$time = microtime(true);
+		$this->db->createCommand()->dropTable($table)->execute();
+		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+	}
+
+	/**
+	 * Builds and executes a SQL statement for truncating a DB table.
+	 * @param string $table the table to be truncated. The name will be properly quoted by the method.
+	 */
+	public function truncateTable($table)
+	{
+		echo "    > truncate table $table ...";
+		$time = microtime(true);
+		$this->db->createCommand()->truncateTable($table)->execute();
+		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+	}
+
+	/**
+	 * Builds and executes a SQL statement for adding a new DB column.
+	 * @param string $table the table that the new column will be added to. The table name will be properly quoted by the method.
+	 * @param string $column the name of the new column. The name will be properly quoted by the method.
+	 * @param string $type the column type. The [[QueryBuilder::getColumnType()]] method will be invoked to convert abstract column type (if any)
+	 * into the physical one. Anything that is not recognized as abstract type will be kept in the generated SQL.
+	 * For example, 'string' will be turned into 'varchar(255)', while 'string not null' will become 'varchar(255) not null'.
+	 */
+	public function addColumn($table, $column, $type)
+	{
+		echo "    > add column $column $type to table $table ...";
+		$time = microtime(true);
+		$this->db->createCommand()->addColumn($table, $column, $type)->execute();
+		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+	}
+
+	/**
+	 * Builds and executes a SQL statement for dropping a DB column.
+	 * @param string $table the table whose column is to be dropped. The name will be properly quoted by the method.
+	 * @param string $column the name of the column to be dropped. The name will be properly quoted by the method.
+	 */
+	public function dropColumn($table, $column)
+	{
+		echo "    > drop column $column from table $table ...";
+		$time = microtime(true);
+		$this->db->createCommand()->dropColumn($table, $column)->execute();
+		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+	}
+
+	/**
+	 * Builds and executes a SQL statement for renaming a column.
+	 * @param string $table the table whose column is to be renamed. The name will be properly quoted by the method.
+	 * @param string $name the old name of the column. The name will be properly quoted by the method.
+	 * @param string $newName the new name of the column. The name will be properly quoted by the method.
+	 */
+	public function renameColumn($table, $name, $newName)
+	{
+		echo "    > rename column $name in table $table to $newName ...";
+		$time = microtime(true);
+		$this->db->createCommand()->renameColumn($table, $name, $newName)->execute();
+		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+	}
+
+	/**
+	 * Builds and executes a SQL statement for changing the definition of a column.
+	 * @param string $table the table whose column is to be changed. The table name will be properly quoted by the method.
+	 * @param string $column the name of the column to be changed. The name will be properly quoted by the method.
+	 * @param string $type the new column type. The {@link getColumnType} method will be invoked to convert abstract column type (if any)
+	 * into the physical one. Anything that is not recognized as abstract type will be kept in the generated SQL.
+	 * For example, 'string' will be turned into 'varchar(255)', while 'string not null' will become 'varchar(255) not null'.
+	 */
+	public function alterColumn($table, $column, $type)
+	{
+		echo "    > alter column $column in table $table to $type ...";
+		$time = microtime(true);
+		$this->db->createCommand()->alterColumn($table, $column, $type)->execute();
+		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+	}
+
+	/**
+	 * Builds a SQL statement for adding a foreign key constraint to an existing table.
+	 * The method will properly quote the table and column names.
+	 * @param string $name the name of the foreign key constraint.
+	 * @param string $table the table that the foreign key constraint will be added to.
+	 * @param string $columns the name of the column to that the constraint will be added on. If there are multiple columns, separate them with commas.
+	 * @param string $refTable the table that the foreign key references to.
+	 * @param string $refColumns the name of the column that the foreign key references to. If there are multiple columns, separate them with commas.
+	 * @param string $delete the ON DELETE option. Most DBMS support these options: RESTRICT, CASCADE, NO ACTION, SET DEFAULT, SET NULL
+	 * @param string $update the ON UPDATE option. Most DBMS support these options: RESTRICT, CASCADE, NO ACTION, SET DEFAULT, SET NULL
+	 */
+	public function addForeignKey($name, $table, $columns, $refTable, $refColumns, $delete = null, $update = null)
+	{
+		echo "    > add foreign key $name: $table ($columns) references $refTable ($refColumns) ...";
+		$time = microtime(true);
+		$this->db->createCommand()->addForeignKey($name, $table, $columns, $refTable, $refColumns, $delete, $update)->execute();
+		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+	}
+
+	/**
+	 * Builds a SQL statement for dropping a foreign key constraint.
+	 * @param string $name the name of the foreign key constraint to be dropped. The name will be properly quoted by the method.
+	 * @param string $table the table whose foreign is to be dropped. The name will be properly quoted by the method.
+	 */
+	public function dropForeignKey($name, $table)
+	{
+		echo "    > drop foreign key $name from table $table ...";
+		$time = microtime(true);
+		$this->db->createCommand()->dropForeignKey($name, $table)->execute();
+		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+	}
+
+	/**
+	 * Builds and executes a SQL statement for creating a new index.
+	 * @param string $name the name of the index. The name will be properly quoted by the method.
+	 * @param string $table the table that the new index will be created for. The table name will be properly quoted by the method.
+	 * @param string $column the column(s) that should be included in the index. If there are multiple columns, please separate them
+	 * by commas. The column names will be properly quoted by the method.
+	 * @param boolean $unique whether to add UNIQUE constraint on the created index.
+	 */
+	public function createIndex($name, $table, $column, $unique = false)
+	{
+		echo "    > create" . ($unique ? ' unique' : '') . " index $name on $table ($column) ...";
+		$time = microtime(true);
+		$this->db->createCommand()->createIndex($name, $table, $column, $unique)->execute();
+		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+	}
+
+	/**
+	 * Builds and executes a SQL statement for dropping an index.
+	 * @param string $name the name of the index to be dropped. The name will be properly quoted by the method.
+	 * @param string $table the table whose index is to be dropped. The name will be properly quoted by the method.
+	 */
+	public function dropIndex($name, $table)
+	{
+		echo "    > drop index $name ...";
+		$time = microtime(true);
+		$this->db->createCommand()->dropIndex($name, $table)->execute();
+		echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+	}
+}
diff --git a/yii/db/Query.php b/yii/db/Query.php
new file mode 100644
index 0000000..b1fc718
--- /dev/null
+++ b/yii/db/Query.php
@@ -0,0 +1,607 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\db;
+
+/**
+ * Query represents a SELECT SQL statement in a way that is independent of DBMS.
+ *
+ * Query provides a set of methods to facilitate the specification of different clauses
+ * in a SELECT statement. These methods can be chained together.
+ *
+ * By calling [[createCommand()]], we can get a [[Command]] instance which can be further
+ * used to perform/execute the DB query against a database.
+ *
+ * For example,
+ *
+ * ~~~
+ * $query = new Query;
+ * $query->select('id, name')
+ *     ->from('tbl_user')
+ *     ->limit(10);
+ * // build and execute the query
+ * $command = $query->createCommand();
+ * // $command->sql returns the actual SQL
+ * $rows = $command->queryAll();
+ * ~~~
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Query extends \yii\base\Component
+{
+	/**
+	 * Sort ascending
+	 * @see orderBy
+	 */
+	const SORT_ASC = false;
+	/**
+	 * Sort ascending
+	 * @see orderBy
+	 */
+	const SORT_DESC = true;
+
+	/**
+	 * @var array the columns being selected. For example, `array('id', 'name')`.
+	 * This is used to construct the SELECT clause in a SQL statement. If not set, if means selecting all columns.
+	 * @see select()
+	 */
+	public $select;
+	/**
+	 * @var string additional option that should be appended to the 'SELECT' keyword. For example,
+	 * in MySQL, the option 'SQL_CALC_FOUND_ROWS' can be used.
+	 */
+	public $selectOption;
+	/**
+	 * @var boolean whether to select distinct rows of data only. If this is set true,
+	 * the SELECT clause would be changed to SELECT DISTINCT.
+	 */
+	public $distinct;
+	/**
+	 * @var array the table(s) to be selected from. For example, `array('tbl_user', 'tbl_post')`.
+	 * This is used to construct the FROM clause in a SQL statement.
+	 * @see from()
+	 */
+	public $from;
+	/**
+	 * @var string|array query condition. This refers to the WHERE clause in a SQL statement.
+	 * For example, `age > 31 AND team = 1`.
+	 * @see where()
+	 */
+	public $where;
+	/**
+	 * @var integer maximum number of records to be returned. If not set or less than 0, it means no limit.
+	 */
+	public $limit;
+	/**
+	 * @var integer zero-based offset from where the records are to be returned. If not set or
+	 * less than 0, it means starting from the beginning.
+	 */
+	public $offset;
+	/**
+	 * @var array how to sort the query results. This is used to construct the ORDER BY clause in a SQL statement.
+	 * The array keys are the columns to be sorted by, and the array values are the corresponding sort directions which
+	 * can be either [[Query::SORT_ASC]] or [[Query::SORT_DESC]]. The array may also contain [[Expression]] objects.
+	 * If that is the case, the expressions will be converted into strings without any change.
+	 */
+	public $orderBy;
+	/**
+	 * @var array how to group the query results. For example, `array('company', 'department')`.
+	 * This is used to construct the GROUP BY clause in a SQL statement.
+	 */
+	public $groupBy;
+	/**
+	 * @var array how to join with other tables. Each array element represents the specification
+	 * of one join which has the following structure:
+	 *
+	 * ~~~
+	 * array($joinType, $tableName, $joinCondition)
+	 * ~~~
+	 *
+	 * For example,
+	 *
+	 * ~~~
+	 * array(
+	 *     array('INNER JOIN', 'tbl_user', 'tbl_user.id = author_id'),
+	 *     array('LEFT JOIN', 'tbl_team', 'tbl_team.id = team_id'),
+	 * )
+	 * ~~~
+	 */
+	public $join;
+	/**
+	 * @var string|array the condition to be applied in the GROUP BY clause.
+	 * It can be either a string or an array. Please refer to [[where()]] on how to specify the condition.
+	 */
+	public $having;
+	/**
+	 * @var array this is used to construct the UNION clause(s) in a SQL statement.
+	 * Each array element can be either a string or a [[Query]] object representing a sub-query.
+	 */
+	public $union;
+	/**
+	 * @var array list of query parameter values indexed by parameter placeholders.
+	 * For example, `array(':name'=>'Dan', ':age'=>31)`.
+	 */
+	public $params;
+
+	/**
+	 * Creates a DB command that can be used to execute this query.
+	 * @param Connection $db the database connection used to generate the SQL statement.
+	 * If this parameter is not given, the `db` application component will be used.
+	 * @return Command the created DB command instance.
+	 */
+	public function createCommand($db = null)
+	{
+		if ($db === null) {
+			$db = \Yii::$app->db;
+		}
+		$sql = $db->getQueryBuilder()->build($this);
+		return $db->createCommand($sql, $this->params);
+	}
+
+	/**
+	 * Sets the SELECT part of the query.
+	 * @param string|array $columns the columns to be selected.
+	 * Columns can be specified in either a string (e.g. "id, name") or an array (e.g. array('id', 'name')).
+	 * Columns can contain table prefixes (e.g. "tbl_user.id") and/or column aliases (e.g. "tbl_user.id AS user_id").
+	 * The method will automatically quote the column names unless a column contains some parenthesis
+	 * (which means the column contains a DB expression).
+	 * @param string $option additional option that should be appended to the 'SELECT' keyword. For example,
+	 * in MySQL, the option 'SQL_CALC_FOUND_ROWS' can be used.
+	 * @return Query the query object itself
+	 */
+	public function select($columns, $option = null)
+	{
+		if (!is_array($columns)) {
+			$columns = preg_split('/\s*,\s*/', trim($columns), -1, PREG_SPLIT_NO_EMPTY);
+		}
+		$this->select = $columns;
+		$this->selectOption = $option;
+		return $this;
+	}
+
+	/**
+	 * Sets the value indicating whether to SELECT DISTINCT or not.
+	 * @param bool $value whether to SELECT DISTINCT or not.
+	 * @return Query the query object itself
+	 */
+	public function distinct($value = true)
+	{
+		$this->distinct = $value;
+		return $this;
+	}
+
+	/**
+	 * Sets the FROM part of the query.
+	 * @param string|array $tables the table(s) to be selected from. This can be either a string (e.g. `'tbl_user'`)
+	 * or an array (e.g. `array('tbl_user', 'tbl_profile')`) specifying one or several table names.
+	 * Table names can contain schema prefixes (e.g. `'public.tbl_user'`) and/or table aliases (e.g. `'tbl_user u'`).
+	 * The method will automatically quote the table names unless it contains some parenthesis
+	 * (which means the table is given as a sub-query or DB expression).
+	 * @return Query the query object itself
+	 */
+	public function from($tables)
+	{
+		if (!is_array($tables)) {
+			$tables = preg_split('/\s*,\s*/', trim($tables), -1, PREG_SPLIT_NO_EMPTY);
+		}
+		$this->from = $tables;
+		return $this;
+	}
+
+	/**
+	 * Sets the WHERE part of the query.
+	 *
+	 * The method requires a $condition parameter, and optionally a $params parameter
+	 * specifying the values to be bound to the query.
+	 *
+	 * The $condition parameter should be either a string (e.g. 'id=1') or an array.
+	 * If the latter, it must be in one of the following two formats:
+	 *
+	 * - hash format: `array('column1' => value1, 'column2' => value2, ...)`
+	 * - operator format: `array(operator, operand1, operand2, ...)`
+	 *
+	 * A condition in hash format represents the following SQL expression in general:
+	 * `column1=value1 AND column2=value2 AND ...`. In case when a value is an array,
+	 * an `IN` expression will be generated. And if a value is null, `IS NULL` will be used
+	 * in the generated expression. Below are some examples:
+	 *
+	 * - `array('type'=>1, 'status'=>2)` generates `(type=1) AND (status=2)`.
+	 * - `array('id'=>array(1,2,3), 'status'=>2)` generates `(id IN (1,2,3)) AND (status=2)`.
+	 * - `array('status'=>null) generates `status IS NULL`.
+	 *
+	 * A condition in operator format generates the SQL expression according to the specified operator, which
+	 * can be one of the followings:
+	 *
+	 * - `and`: the operands should be concatenated together using `AND`. For example,
+	 * `array('and', 'id=1', 'id=2')` will generate `id=1 AND id=2`. If an operand is an array,
+	 * it will be converted into a string using the rules described here. For example,
+	 * `array('and', 'type=1', array('or', 'id=1', 'id=2'))` will generate `type=1 AND (id=1 OR id=2)`.
+	 * The method will NOT do any quoting or escaping.
+	 *
+	 * - `or`: similar to the `and` operator except that the operands are concatenated using `OR`.
+	 *
+	 * - `between`: operand 1 should be the column name, and operand 2 and 3 should be the
+	 * starting and ending values of the range that the column is in.
+	 * For example, `array('between', 'id', 1, 10)` will generate `id BETWEEN 1 AND 10`.
+	 *
+	 * - `not between`: similar to `between` except the `BETWEEN` is replaced with `NOT BETWEEN`
+	 * in the generated condition.
+	 *
+	 * - `in`: operand 1 should be a column or DB expression, and operand 2 be an array representing
+	 * the range of the values that the column or DB expression should be in. For example,
+	 * `array('in', 'id', array(1,2,3))` will generate `id IN (1,2,3)`.
+	 * The method will properly quote the column name and escape values in the range.
+	 *
+	 * - `not in`: similar to the `in` operator except that `IN` is replaced with `NOT IN` in the generated condition.
+	 *
+	 * - `like`: operand 1 should be a column or DB expression, and operand 2 be a string or an array representing
+	 * the values that the column or DB expression should be like.
+	 * For example, `array('like', 'name', '%tester%')` will generate `name LIKE '%tester%'`.
+	 * When the value range is given as an array, multiple `LIKE` predicates will be generated and concatenated
+	 * using `AND`. For example, `array('like', 'name', array('%test%', '%sample%'))` will generate
+	 * `name LIKE '%test%' AND name LIKE '%sample%'`.
+	 * The method will properly quote the column name and escape values in the range.
+	 *
+	 * - `or like`: similar to the `like` operator except that `OR` is used to concatenate the `LIKE`
+	 * predicates when operand 2 is an array.
+	 *
+	 * - `not like`: similar to the `like` operator except that `LIKE` is replaced with `NOT LIKE`
+	 * in the generated condition.
+	 *
+	 * - `or not like`: similar to the `not like` operator except that `OR` is used to concatenate
+	 * the `NOT LIKE` predicates.
+	 *
+	 * @param string|array $condition the conditions that should be put in the WHERE part.
+	 * @param array $params the parameters (name=>value) to be bound to the query.
+	 * @return Query the query object itself
+	 * @see andWhere()
+	 * @see orWhere()
+	 */
+	public function where($condition, $params = array())
+	{
+		$this->where = $condition;
+		$this->addParams($params);
+		return $this;
+	}
+
+	/**
+	 * Adds an additional WHERE condition to the existing one.
+	 * The new condition and the existing one will be joined using the 'AND' operator.
+	 * @param string|array $condition the new WHERE condition. Please refer to [[where()]]
+	 * on how to specify this parameter.
+	 * @param array $params the parameters (name=>value) to be bound to the query.
+	 * @return Query the query object itself
+	 * @see where()
+	 * @see orWhere()
+	 */
+	public function andWhere($condition, $params = array())
+	{
+		if ($this->where === null) {
+			$this->where = $condition;
+		} else {
+			$this->where = array('and', $this->where, $condition);
+		}
+		$this->addParams($params);
+		return $this;
+	}
+
+	/**
+	 * Adds an additional WHERE condition to the existing one.
+	 * The new condition and the existing one will be joined using the 'OR' operator.
+	 * @param string|array $condition the new WHERE condition. Please refer to [[where()]]
+	 * on how to specify this parameter.
+	 * @param array $params the parameters (name=>value) to be bound to the query.
+	 * @return Query the query object itself
+	 * @see where()
+	 * @see andWhere()
+	 */
+	public function orWhere($condition, $params = array())
+	{
+		if ($this->where === null) {
+			$this->where = $condition;
+		} else {
+			$this->where = array('or', $this->where, $condition);
+		}
+		$this->addParams($params);
+		return $this;
+	}
+
+	/**
+	 * Appends a JOIN part to the query.
+	 * The first parameter specifies what type of join it is.
+	 * @param string $type the type of join, such as INNER JOIN, LEFT JOIN.
+	 * @param string $table the table to be joined.
+	 * Table name can contain schema prefix (e.g. 'public.tbl_user') and/or table alias (e.g. 'tbl_user u').
+	 * The method will automatically quote the table name unless it contains some parenthesis
+	 * (which means the table is given as a sub-query or DB expression).
+	 * @param string|array $on the join condition that should appear in the ON part.
+	 * Please refer to [[where()]] on how to specify this parameter.
+	 * @param array $params the parameters (name=>value) to be bound to the query.
+	 * @return Query the query object itself
+	 */
+	public function join($type, $table, $on = '', $params = array())
+	{
+		$this->join[] = array($type, $table, $on);
+		return $this->addParams($params);
+	}
+
+	/**
+	 * Appends an INNER JOIN part to the query.
+	 * @param string $table the table to be joined.
+	 * Table name can contain schema prefix (e.g. 'public.tbl_user') and/or table alias (e.g. 'tbl_user u').
+	 * The method will automatically quote the table name unless it contains some parenthesis
+	 * (which means the table is given as a sub-query or DB expression).
+	 * @param string|array $on the join condition that should appear in the ON part.
+	 * Please refer to [[where()]] on how to specify this parameter.
+	 * @param array $params the parameters (name=>value) to be bound to the query.
+	 * @return Query the query object itself
+	 */
+	public function innerJoin($table, $on = '', $params = array())
+	{
+		$this->join[] = array('INNER JOIN', $table, $on);
+		return $this->addParams($params);
+	}
+
+	/**
+	 * Appends a LEFT OUTER JOIN part to the query.
+	 * @param string $table the table to be joined.
+	 * Table name can contain schema prefix (e.g. 'public.tbl_user') and/or table alias (e.g. 'tbl_user u').
+	 * The method will automatically quote the table name unless it contains some parenthesis
+	 * (which means the table is given as a sub-query or DB expression).
+	 * @param string|array $on the join condition that should appear in the ON part.
+	 * Please refer to [[where()]] on how to specify this parameter.
+	 * @param array $params the parameters (name=>value) to be bound to the query
+	 * @return Query the query object itself
+	 */
+	public function leftJoin($table, $on = '', $params = array())
+	{
+		$this->join[] = array('LEFT JOIN', $table, $on);
+		return $this->addParams($params);
+	}
+
+	/**
+	 * Appends a RIGHT OUTER JOIN part to the query.
+	 * @param string $table the table to be joined.
+	 * Table name can contain schema prefix (e.g. 'public.tbl_user') and/or table alias (e.g. 'tbl_user u').
+	 * The method will automatically quote the table name unless it contains some parenthesis
+	 * (which means the table is given as a sub-query or DB expression).
+	 * @param string|array $on the join condition that should appear in the ON part.
+	 * Please refer to [[where()]] on how to specify this parameter.
+	 * @param array $params the parameters (name=>value) to be bound to the query
+	 * @return Query the query object itself
+	 */
+	public function rightJoin($table, $on = '', $params = array())
+	{
+		$this->join[] = array('RIGHT JOIN', $table, $on);
+		return $this->addParams($params);
+	}
+
+	/**
+	 * Sets the GROUP BY part of the query.
+	 * @param string|array $columns the columns to be grouped by.
+	 * Columns can be specified in either a string (e.g. "id, name") or an array (e.g. array('id', 'name')).
+	 * The method will automatically quote the column names unless a column contains some parenthesis
+	 * (which means the column contains a DB expression).
+	 * @return Query the query object itself
+	 * @see addGroupBy()
+	 */
+	public function groupBy($columns)
+	{
+		if (!is_array($columns)) {
+			$columns = preg_split('/\s*,\s*/', trim($columns), -1, PREG_SPLIT_NO_EMPTY);
+		}
+		$this->groupBy = $columns;
+		return $this;
+	}
+
+	/**
+	 * Adds additional group-by columns to the existing ones.
+	 * @param string|array $columns additional columns to be grouped by.
+	 * Columns can be specified in either a string (e.g. "id, name") or an array (e.g. array('id', 'name')).
+	 * The method will automatically quote the column names unless a column contains some parenthesis
+	 * (which means the column contains a DB expression).
+	 * @return Query the query object itself
+	 * @see groupBy()
+	 */
+	public function addGroupBy($columns)
+	{
+		if (!is_array($columns)) {
+			$columns = preg_split('/\s*,\s*/', trim($columns), -1, PREG_SPLIT_NO_EMPTY);
+		}
+		if ($this->groupBy === null) {
+			$this->groupBy = $columns;
+		} else {
+			$this->groupBy = array_merge($this->groupBy, $columns);
+		}
+		return $this;
+	}
+
+	/**
+	 * Sets the HAVING part of the query.
+	 * @param string|array $condition the conditions to be put after HAVING.
+	 * Please refer to [[where()]] on how to specify this parameter.
+	 * @param array $params the parameters (name=>value) to be bound to the query.
+	 * @return Query the query object itself
+	 * @see andHaving()
+	 * @see orHaving()
+	 */
+	public function having($condition, $params = array())
+	{
+		$this->having = $condition;
+		$this->addParams($params);
+		return $this;
+	}
+
+	/**
+	 * Adds an additional HAVING condition to the existing one.
+	 * The new condition and the existing one will be joined using the 'AND' operator.
+	 * @param string|array $condition the new HAVING condition. Please refer to [[where()]]
+	 * on how to specify this parameter.
+	 * @param array $params the parameters (name=>value) to be bound to the query.
+	 * @return Query the query object itself
+	 * @see having()
+	 * @see orHaving()
+	 */
+	public function andHaving($condition, $params = array())
+	{
+		if ($this->having === null) {
+			$this->having = $condition;
+		} else {
+			$this->having = array('and', $this->having, $condition);
+		}
+		$this->addParams($params);
+		return $this;
+	}
+
+	/**
+	 * Adds an additional HAVING condition to the existing one.
+	 * The new condition and the existing one will be joined using the 'OR' operator.
+	 * @param string|array $condition the new HAVING condition. Please refer to [[where()]]
+	 * on how to specify this parameter.
+	 * @param array $params the parameters (name=>value) to be bound to the query.
+	 * @return Query the query object itself
+	 * @see having()
+	 * @see andHaving()
+	 */
+	public function orHaving($condition, $params = array())
+	{
+		if ($this->having === null) {
+			$this->having = $condition;
+		} else {
+			$this->having = array('or', $this->having, $condition);
+		}
+		$this->addParams($params);
+		return $this;
+	}
+
+	/**
+	 * Sets the ORDER BY part of the query.
+	 * @param string|array $columns the columns (and the directions) to be ordered by.
+	 * Columns can be specified in either a string (e.g. "id ASC, name DESC") or an array
+	 * (e.g. `array('id' => Query::SORT_ASC, 'name' => Query::SORT_DESC)`).
+	 * The method will automatically quote the column names unless a column contains some parenthesis
+	 * (which means the column contains a DB expression).
+	 * @return Query the query object itself
+	 * @see addOrderBy()
+	 */
+	public function orderBy($columns)
+	{
+		$this->orderBy = $this->normalizeOrderBy($columns);
+		return $this;
+	}
+
+	/**
+	 * Adds additional ORDER BY columns to the query.
+	 * @param string|array $columns the columns (and the directions) to be ordered by.
+	 * Columns can be specified in either a string (e.g. "id ASC, name DESC") or an array
+	 * (e.g. `array('id' => Query::SORT_ASC, 'name' => Query::SORT_DESC)`).
+	 * The method will automatically quote the column names unless a column contains some parenthesis
+	 * (which means the column contains a DB expression).
+	 * @return Query the query object itself
+	 * @see orderBy()
+	 */
+	public function addOrderBy($columns)
+	{
+		$columns = $this->normalizeOrderBy($columns);
+		if ($this->orderBy === null) {
+			$this->orderBy = $columns;
+		} else {
+			$this->orderBy = array_merge($this->orderBy, $columns);
+		}
+		return $this;
+	}
+
+	protected function normalizeOrderBy($columns)
+	{
+		if (is_array($columns)) {
+			return $columns;
+		} else {
+			$columns = preg_split('/\s*,\s*/', trim($columns), -1, PREG_SPLIT_NO_EMPTY);
+			$result = array();
+			foreach ($columns as $column) {
+				if (preg_match('/^(.*?)\s+(asc|desc)$/i', $column, $matches)) {
+					$result[$matches[1]] = strcasecmp($matches[2], 'desc') ? self::SORT_ASC : self::SORT_DESC;
+				} else {
+					$result[$column] = self::SORT_ASC;
+				}
+			}
+			return $result;
+		}
+	}
+
+	/**
+	 * Sets the LIMIT part of the query.
+	 * @param integer $limit the limit
+	 * @return Query the query object itself
+	 */
+	public function limit($limit)
+	{
+		$this->limit = $limit;
+		return $this;
+	}
+
+	/**
+	 * Sets the OFFSET part of the query.
+	 * @param integer $offset the offset
+	 * @return Query the query object itself
+	 */
+	public function offset($offset)
+	{
+		$this->offset = $offset;
+		return $this;
+	}
+
+	/**
+	 * Appends a SQL statement using UNION operator.
+	 * @param string|Query $sql the SQL statement to be appended using UNION
+	 * @return Query the query object itself
+	 */
+	public function union($sql)
+	{
+		$this->union[] = $sql;
+		return $this;
+	}
+
+	/**
+	 * Sets the parameters to be bound to the query.
+	 * @param array $params list of query parameter values indexed by parameter placeholders.
+	 * For example, `array(':name'=>'Dan', ':age'=>31)`.
+	 * @return Query the query object itself
+	 * @see addParams()
+	 */
+	public function params($params)
+	{
+		$this->params = $params;
+		return $this;
+	}
+
+	/**
+	 * Adds additional parameters to be bound to the query.
+	 * @param array $params list of query parameter values indexed by parameter placeholders.
+	 * For example, `array(':name'=>'Dan', ':age'=>31)`.
+	 * @return Query the query object itself
+	 * @see params()
+	 */
+	public function addParams($params)
+	{
+		if (!empty($params)) {
+			if ($this->params === null) {
+				$this->params = $params;
+			} else {
+				foreach ($params as $name => $value) {
+					if (is_integer($name)) {
+						$this->params[] = $value;
+					} else {
+						$this->params[$name] = $value;
+					}
+				}
+			}
+		}
+		return $this;
+	}
+}
diff --git a/yii/db/QueryBuilder.php b/yii/db/QueryBuilder.php
new file mode 100644
index 0000000..a4e30ea
--- /dev/null
+++ b/yii/db/QueryBuilder.php
@@ -0,0 +1,912 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\db;
+
+use yii\db\Exception;
+use yii\base\NotSupportedException;
+
+/**
+ * QueryBuilder builds a SELECT SQL statement based on the specification given as a [[Query]] object.
+ *
+ * QueryBuilder can also be used to build SQL statements such as INSERT, UPDATE, DELETE, CREATE TABLE,
+ * from a [[Query]] object.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class QueryBuilder extends \yii\base\Object
+{
+	/**
+	 * The prefix for automatically generated query binding parameters.
+	 */
+	const PARAM_PREFIX = ':qp';
+
+	/**
+	 * @var Connection the database connection.
+	 */
+	public $db;
+	/**
+	 * @var string the separator between different fragments of a SQL statement.
+	 * Defaults to an empty space. This is mainly used by [[build()]] when generating a SQL statement.
+	 */
+	public $separator = " ";
+	/**
+	 * @var array the abstract column types mapped to physical column types.
+	 * This is mainly used to support creating/modifying tables using DB-independent data type specifications.
+	 * Child classes should override this property to declare supported type mappings.
+	 */
+	public $typeMap = array();
+
+	/**
+	 * Constructor.
+	 * @param Connection $connection the database connection.
+	 * @param array $config name-value pairs that will be used to initialize the object properties
+	 */
+	public function __construct($connection, $config = array())
+	{
+		$this->db = $connection;
+		parent::__construct($config);
+	}
+
+	/**
+	 * Generates a SELECT SQL statement from a [[Query]] object.
+	 * @param Query $query the [[Query]] object from which the SQL statement will be generated
+	 * @return string the generated SQL statement
+	 */
+	public function build($query)
+	{
+		$clauses = array(
+			$this->buildSelect($query->select, $query->distinct, $query->selectOption),
+			$this->buildFrom($query->from),
+			$this->buildJoin($query->join, $query->params),
+			$this->buildWhere($query->where, $query->params),
+			$this->buildGroupBy($query->groupBy),
+			$this->buildHaving($query->having, $query->params),
+			$this->buildUnion($query->union, $query->params),
+			$this->buildOrderBy($query->orderBy),
+			$this->buildLimit($query->limit, $query->offset),
+		);
+		return implode($this->separator, array_filter($clauses));
+	}
+
+	/**
+	 * Creates an INSERT SQL statement.
+	 * For example,
+	 *
+	 * ~~~
+	 * $sql = $queryBuilder->insert('tbl_user', array(
+	 *	 'name' => 'Sam',
+	 *	 'age' => 30,
+	 * ), $params);
+	 * ~~~
+	 *
+	 * The method will properly escape the table and column names.
+	 *
+	 * @param string $table the table that new rows will be inserted into.
+	 * @param array $columns the column data (name=>value) to be inserted into the table.
+	 * @param array $params the binding parameters that will be generated by this method.
+	 * They should be bound to the DB command later.
+	 * @return string the INSERT SQL
+	 */
+	public function insert($table, $columns, &$params)
+	{
+		$names = array();
+		$placeholders = array();
+		foreach ($columns as $name => $value) {
+			$names[] = $this->db->quoteColumnName($name);
+			if ($value instanceof Expression) {
+				$placeholders[] = $value->expression;
+				foreach ($value->params as $n => $v) {
+					$params[$n] = $v;
+				}
+			} else {
+				$phName = self::PARAM_PREFIX . count($params);
+				$placeholders[] = $phName;
+				$params[$phName] = $value;
+			}
+		}
+
+		return 'INSERT INTO ' . $this->db->quoteTableName($table)
+			. ' (' . implode(', ', $names) . ') VALUES ('
+			. implode(', ', $placeholders) . ')';
+	}
+
+	/**
+	 * Generates a batch INSERT SQL statement.
+	 * For example,
+	 *
+	 * ~~~
+	 * $connection->createCommand()->batchInsert('tbl_user', array('name', 'age'), array(
+	 *     array('Tom', 30),
+	 *     array('Jane', 20),
+	 *     array('Linda', 25),
+	 * ))->execute();
+	 * ~~~
+	 *
+	 * Not that the values in each row must match the corresponding column names.
+	 *
+	 * @param string $table the table that new rows will be inserted into.
+	 * @param array $columns the column names
+	 * @param array $rows the rows to be batch inserted into the table
+	 * @return string the batch INSERT SQL statement
+	 * @throws NotSupportedException if this is not supported by the underlying DBMS
+	 */
+	public function batchInsert($table, $columns, $rows)
+	{
+		throw new NotSupportedException($this->db->getDriverName() . ' does not support batch insert.');
+
+	}
+
+	/**
+	 * Creates an UPDATE SQL statement.
+	 * For example,
+	 *
+	 * ~~~
+	 * $params = array();
+	 * $sql = $queryBuilder->update('tbl_user', array(
+	 *	 'status' => 1,
+	 * ), 'age > 30', $params);
+	 * ~~~
+	 *
+	 * The method will properly escape the table and column names.
+	 *
+	 * @param string $table the table to be updated.
+	 * @param array $columns the column data (name=>value) to be updated.
+	 * @param mixed $condition the condition that will be put in the WHERE part. Please
+	 * refer to [[Query::where()]] on how to specify condition.
+	 * @param array $params the binding parameters that will be modified by this method
+	 * so that they can be bound to the DB command later.
+	 * @return string the UPDATE SQL
+	 */
+	public function update($table, $columns, $condition, &$params)
+	{
+		$lines = array();
+		foreach ($columns as $name => $value) {
+			if ($value instanceof Expression) {
+				$lines[] = $this->db->quoteColumnName($name) . '=' . $value->expression;
+				foreach ($value->params as $n => $v) {
+					$params[$n] = $v;
+				}
+			} else {
+				$phName = self::PARAM_PREFIX . count($params);
+				$lines[] = $this->db->quoteColumnName($name) . '=' . $phName;
+				$params[$phName] = $value;
+			}
+		}
+
+		$sql = 'UPDATE ' . $this->db->quoteTableName($table) . ' SET ' . implode(', ', $lines);
+		$where = $this->buildWhere($condition, $params);
+		return $where === '' ? $sql : $sql . ' ' . $where;
+	}
+
+	/**
+	 * Creates a DELETE SQL statement.
+	 * For example,
+	 *
+	 * ~~~
+	 * $sql = $queryBuilder->delete('tbl_user', 'status = 0');
+	 * ~~~
+	 *
+	 * The method will properly escape the table and column names.
+	 *
+	 * @param string $table the table where the data will be deleted from.
+	 * @param mixed $condition the condition that will be put in the WHERE part. Please
+	 * refer to [[Query::where()]] on how to specify condition.
+	 * @param array $params the binding parameters that will be modified by this method
+	 * so that they can be bound to the DB command later.
+	 * @return string the DELETE SQL
+	 */
+	public function delete($table, $condition, &$params)
+	{
+		$sql = 'DELETE FROM ' . $this->db->quoteTableName($table);
+		$where = $this->buildWhere($condition, $params);
+		return $where === '' ? $sql : $sql . ' ' . $where;
+	}
+
+	/**
+	 * Builds a SQL statement for creating a new DB table.
+	 *
+	 * The columns in the new  table should be specified as name-definition pairs (e.g. 'name'=>'string'),
+	 * where name stands for a column name which will be properly quoted by the method, and definition
+	 * stands for the column type which can contain an abstract DB type.
+	 * The [[getColumnType()]] method will be invoked to convert any abstract type into a physical one.
+	 *
+	 * If a column is specified with definition only (e.g. 'PRIMARY KEY (name, type)'), it will be directly
+	 * inserted into the generated SQL.
+	 *
+	 * For example,
+	 *
+	 * ~~~
+	 * $sql = $queryBuilder->createTable('tbl_user', array(
+	 *	 'id' => 'pk',
+	 *	 'name' => 'string',
+	 *	 'age' => 'integer',
+	 * ));
+	 * ~~~
+	 *
+	 * @param string $table the name of the table to be created. The name will be properly quoted by the method.
+	 * @param array $columns the columns (name=>definition) in the new table.
+	 * @param string $options additional SQL fragment that will be appended to the generated SQL.
+	 * @return string the SQL statement for creating a new DB table.
+	 */
+	public function createTable($table, $columns, $options = null)
+	{
+		$cols = array();
+		foreach ($columns as $name => $type) {
+			if (is_string($name)) {
+				$cols[] = "\t" . $this->db->quoteColumnName($name) . ' ' . $this->getColumnType($type);
+			} else {
+				$cols[] = "\t" . $type;
+			}
+		}
+		$sql = "CREATE TABLE " . $this->db->quoteTableName($table) . " (\n" . implode(",\n", $cols) . "\n)";
+		return $options === null ? $sql : $sql . ' ' . $options;
+	}
+
+	/**
+	 * Builds a SQL statement for renaming a DB table.
+	 * @param string $oldName the table to be renamed. The name will be properly quoted by the method.
+	 * @param string $newName the new table name. The name will be properly quoted by the method.
+	 * @return string the SQL statement for renaming a DB table.
+	 */
+	public function renameTable($oldName, $newName)
+	{
+		return 'RENAME TABLE ' . $this->db->quoteTableName($oldName) . ' TO ' . $this->db->quoteTableName($newName);
+	}
+
+	/**
+	 * Builds a SQL statement for dropping a DB table.
+	 * @param string $table the table to be dropped. The name will be properly quoted by the method.
+	 * @return string the SQL statement for dropping a DB table.
+	 */
+	public function dropTable($table)
+	{
+		return "DROP TABLE " . $this->db->quoteTableName($table);
+	}
+
+	/**
+	 * Builds a SQL statement for truncating a DB table.
+	 * @param string $table the table to be truncated. The name will be properly quoted by the method.
+	 * @return string the SQL statement for truncating a DB table.
+	 */
+	public function truncateTable($table)
+	{
+		return "TRUNCATE TABLE " . $this->db->quoteTableName($table);
+	}
+
+	/**
+	 * Builds a SQL statement for adding a new DB column.
+	 * @param string $table the table that the new column will be added to. The table name will be properly quoted by the method.
+	 * @param string $column the name of the new column. The name will be properly quoted by the method.
+	 * @param string $type the column type. The [[getColumnType()]] method will be invoked to convert abstract column type (if any)
+	 * into the physical one. Anything that is not recognized as abstract type will be kept in the generated SQL.
+	 * For example, 'string' will be turned into 'varchar(255)', while 'string not null' will become 'varchar(255) not null'.
+	 * @return string the SQL statement for adding a new column.
+	 */
+	public function addColumn($table, $column, $type)
+	{
+		return 'ALTER TABLE ' . $this->db->quoteTableName($table)
+			. ' ADD ' . $this->db->quoteColumnName($column) . ' '
+			. $this->getColumnType($type);
+	}
+
+	/**
+	 * Builds a SQL statement for dropping a DB column.
+	 * @param string $table the table whose column is to be dropped. The name will be properly quoted by the method.
+	 * @param string $column the name of the column to be dropped. The name will be properly quoted by the method.
+	 * @return string the SQL statement for dropping a DB column.
+	 */
+	public function dropColumn($table, $column)
+	{
+		return "ALTER TABLE " . $this->db->quoteTableName($table)
+			. " DROP COLUMN " . $this->db->quoteColumnName($column);
+	}
+
+	/**
+	 * Builds a SQL statement for renaming a column.
+	 * @param string $table the table whose column is to be renamed. The name will be properly quoted by the method.
+	 * @param string $oldName the old name of the column. The name will be properly quoted by the method.
+	 * @param string $newName the new name of the column. The name will be properly quoted by the method.
+	 * @return string the SQL statement for renaming a DB column.
+	 */
+	public function renameColumn($table, $oldName, $newName)
+	{
+		return "ALTER TABLE " . $this->db->quoteTableName($table)
+			. " RENAME COLUMN " . $this->db->quoteColumnName($oldName)
+			. " TO " . $this->db->quoteColumnName($newName);
+	}
+
+	/**
+	 * Builds a SQL statement for changing the definition of a column.
+	 * @param string $table the table whose column is to be changed. The table name will be properly quoted by the method.
+	 * @param string $column the name of the column to be changed. The name will be properly quoted by the method.
+	 * @param string $type the new column type. The [[getColumnType()]] method will be invoked to convert abstract
+	 * column type (if any) into the physical one. Anything that is not recognized as abstract type will be kept
+	 * in the generated SQL. For example, 'string' will be turned into 'varchar(255)', while 'string not null'
+	 * will become 'varchar(255) not null'.
+	 * @return string the SQL statement for changing the definition of a column.
+	 */
+	public function alterColumn($table, $column, $type)
+	{
+		return 'ALTER TABLE ' . $this->db->quoteTableName($table) . ' CHANGE '
+			. $this->db->quoteColumnName($column) . ' '
+			. $this->db->quoteColumnName($column) . ' '
+			. $this->getColumnType($type);
+	}
+
+	/**
+	 * Builds a SQL statement for adding a foreign key constraint to an existing table.
+	 * The method will properly quote the table and column names.
+	 * @param string $name the name of the foreign key constraint.
+	 * @param string $table the table that the foreign key constraint will be added to.
+	 * @param string|array $columns the name of the column to that the constraint will be added on.
+	 * If there are multiple columns, separate them with commas or use an array to represent them.
+	 * @param string $refTable the table that the foreign key references to.
+	 * @param string|array $refColumns the name of the column that the foreign key references to.
+	 * If there are multiple columns, separate them with commas or use an array to represent them.
+	 * @param string $delete the ON DELETE option. Most DBMS support these options: RESTRICT, CASCADE, NO ACTION, SET DEFAULT, SET NULL
+	 * @param string $update the ON UPDATE option. Most DBMS support these options: RESTRICT, CASCADE, NO ACTION, SET DEFAULT, SET NULL
+	 * @return string the SQL statement for adding a foreign key constraint to an existing table.
+	 */
+	public function addForeignKey($name, $table, $columns, $refTable, $refColumns, $delete = null, $update = null)
+	{
+		$sql = 'ALTER TABLE ' . $this->db->quoteTableName($table)
+			. ' ADD CONSTRAINT ' . $this->db->quoteColumnName($name)
+			. ' FOREIGN KEY (' . $this->buildColumns($columns) . ')'
+			. ' REFERENCES ' . $this->db->quoteTableName($refTable)
+			. ' (' . $this->buildColumns($refColumns) . ')';
+		if ($delete !== null) {
+			$sql .= ' ON DELETE ' . $delete;
+		}
+		if ($update !== null) {
+			$sql .= ' ON UPDATE ' . $update;
+		}
+		return $sql;
+	}
+
+	/**
+	 * Builds a SQL statement for dropping a foreign key constraint.
+	 * @param string $name the name of the foreign key constraint to be dropped. The name will be properly quoted by the method.
+	 * @param string $table the table whose foreign is to be dropped. The name will be properly quoted by the method.
+	 * @return string the SQL statement for dropping a foreign key constraint.
+	 */
+	public function dropForeignKey($name, $table)
+	{
+		return 'ALTER TABLE ' . $this->db->quoteTableName($table)
+			. ' DROP CONSTRAINT ' . $this->db->quoteColumnName($name);
+	}
+
+	/**
+	 * Builds a SQL statement for creating a new index.
+	 * @param string $name the name of the index. The name will be properly quoted by the method.
+	 * @param string $table the table that the new index will be created for. The table name will be properly quoted by the method.
+	 * @param string|array $columns the column(s) that should be included in the index. If there are multiple columns,
+	 * separate them with commas or use an array to represent them. Each column name will be properly quoted
+	 * by the method, unless a parenthesis is found in the name.
+	 * @param boolean $unique whether to add UNIQUE constraint on the created index.
+	 * @return string the SQL statement for creating a new index.
+	 */
+	public function createIndex($name, $table, $columns, $unique = false)
+	{
+		return ($unique ? 'CREATE UNIQUE INDEX ' : 'CREATE INDEX ')
+			. $this->db->quoteTableName($name) . ' ON '
+			. $this->db->quoteTableName($table)
+			. ' (' . $this->buildColumns($columns) . ')';
+	}
+
+	/**
+	 * Builds a SQL statement for dropping an index.
+	 * @param string $name the name of the index to be dropped. The name will be properly quoted by the method.
+	 * @param string $table the table whose index is to be dropped. The name will be properly quoted by the method.
+	 * @return string the SQL statement for dropping an index.
+	 */
+	public function dropIndex($name, $table)
+	{
+		return 'DROP INDEX ' . $this->db->quoteTableName($name) . ' ON ' . $this->db->quoteTableName($table);
+	}
+
+	/**
+	 * Creates a SQL statement for resetting the sequence value of a table's primary key.
+	 * The sequence will be reset such that the primary key of the next new row inserted
+	 * will have the specified value or 1.
+	 * @param string $table the name of the table whose primary key sequence will be reset
+	 * @param mixed $value the value for the primary key of the next new row inserted. If this is not set,
+	 * the next new row's primary key will have a value 1.
+	 * @return string the SQL statement for resetting sequence
+	 * @throws NotSupportedException if this is not supported by the underlying DBMS
+	 */
+	public function resetSequence($table, $value = null)
+	{
+		throw new NotSupportedException($this->db->getDriverName() . ' does not support resetting sequence.');
+	}
+
+	/**
+	 * Builds a SQL statement for enabling or disabling integrity check.
+	 * @param boolean $check whether to turn on or off the integrity check.
+	 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
+	 * @return string the SQL statement for checking integrity
+	 * @throws NotSupportedException if this is not supported by the underlying DBMS
+	 */
+	public function checkIntegrity($check = true, $schema = '')
+	{
+		throw new NotSupportedException($this->db->getDriverName() . ' does not support enabling/disabling integrity check.');
+	}
+
+	/**
+	 * Converts an abstract column type into a physical column type.
+	 * The conversion is done using the type map specified in [[typeMap]].
+	 * The following abstract column types are supported (using MySQL as an example to explain the corresponding
+	 * physical types):
+	 *
+	 * - `pk`: an auto-incremental primary key type, will be converted into "int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY"
+	 * - `string`: string type, will be converted into "varchar(255)"
+	 * - `text`: a long string type, will be converted into "text"
+	 * - `smallint`: a small integer type, will be converted into "smallint(6)"
+	 * - `integer`: integer type, will be converted into "int(11)"
+	 * - `bigint`: a big integer type, will be converted into "bigint(20)"
+	 * - `boolean`: boolean type, will be converted into "tinyint(1)"
+	 * - `float``: float number type, will be converted into "float"
+	 * - `decimal`: decimal number type, will be converted into "decimal"
+	 * - `datetime`: datetime type, will be converted into "datetime"
+	 * - `timestamp`: timestamp type, will be converted into "timestamp"
+	 * - `time`: time type, will be converted into "time"
+	 * - `date`: date type, will be converted into "date"
+	 * - `money`: money type, will be converted into "decimal(19,4)"
+	 * - `binary`: binary data type, will be converted into "blob"
+	 *
+	 * If the abstract type contains two or more parts separated by spaces (e.g. "string NOT NULL"), then only
+	 * the first part will be converted, and the rest of the parts will be appended to the converted result.
+	 * For example, 'string NOT NULL' is converted to 'varchar(255) NOT NULL'.
+	 *
+	 * If a type cannot be found in [[typeMap]], it will be returned without any change.
+	 * @param string $type abstract column type
+	 * @return string physical column type.
+	 */
+	public function getColumnType($type)
+	{
+		if (isset($this->typeMap[$type])) {
+			return $this->typeMap[$type];
+		} elseif (preg_match('/^(\w+)\s+/', $type, $matches)) {
+			if (isset($this->typeMap[$matches[1]])) {
+				return preg_replace('/^\w+/', $this->typeMap[$matches[1]], $type);
+			}
+		}
+		return $type;
+	}
+
+	/**
+	 * @param array $columns
+	 * @param boolean $distinct
+	 * @param string $selectOption
+	 * @return string the SELECT clause built from [[query]].
+	 */
+	public function buildSelect($columns, $distinct = false, $selectOption = null)
+	{
+		$select = $distinct ? 'SELECT DISTINCT' : 'SELECT';
+		if ($selectOption !== null) {
+			$select .= ' ' . $selectOption;
+		}
+
+		if (empty($columns)) {
+			return $select . ' *';
+		}
+
+		foreach ($columns as $i => $column) {
+			if (is_object($column)) {
+				$columns[$i] = (string)$column;
+			} elseif (strpos($column, '(') === false) {
+				if (preg_match('/^(.*?)(?i:\s+as\s+|\s+)([\w\-_\.]+)$/', $column, $matches)) {
+					$columns[$i] = $this->db->quoteColumnName($matches[1]) . ' AS ' . $this->db->quoteColumnName($matches[2]);
+				} else {
+					$columns[$i] = $this->db->quoteColumnName($column);
+				}
+			}
+		}
+
+		if (is_array($columns)) {
+			$columns = implode(', ', $columns);
+		}
+
+		return $select . ' ' . $columns;
+	}
+
+	/**
+	 * @param array $tables
+	 * @return string the FROM clause built from [[query]].
+	 */
+	public function buildFrom($tables)
+	{
+		if (empty($tables)) {
+			return '';
+		}
+
+		foreach ($tables as $i => $table) {
+			if (strpos($table, '(') === false) {
+				if (preg_match('/^(.*?)(?i:\s+as\s+|\s+)(.*)$/i', $table, $matches)) { // with alias
+					$tables[$i] = $this->db->quoteTableName($matches[1]) . ' ' . $this->db->quoteTableName($matches[2]);
+				} else {
+					$tables[$i] = $this->db->quoteTableName($table);
+				}
+			}
+		}
+
+		if (is_array($tables)) {
+			$tables = implode(', ', $tables);
+		}
+
+		return 'FROM ' . $tables;
+	}
+
+	/**
+	 * @param string|array $joins
+	 * @param array $params the binding parameters to be populated
+	 * @return string the JOIN clause built from [[query]].
+	 * @throws Exception if the $joins parameter is not in proper format
+	 */
+	public function buildJoin($joins, &$params)
+	{
+		if (empty($joins)) {
+			return '';
+		}
+
+		foreach ($joins as $i => $join) {
+			if (is_object($join)) {
+				$joins[$i] = (string)$join;
+			} elseif (is_array($join) && isset($join[0], $join[1])) {
+				// 0:join type, 1:table name, 2:on-condition
+				$table = $join[1];
+				if (strpos($table, '(') === false) {
+					if (preg_match('/^(.*?)(?i:\s+as\s+|\s+)(.*)$/', $table, $matches)) { // with alias
+						$table = $this->db->quoteTableName($matches[1]) . ' ' . $this->db->quoteTableName($matches[2]);
+					} else {
+						$table = $this->db->quoteTableName($table);
+					}
+				}
+				$joins[$i] = $join[0] . ' ' . $table;
+				if (isset($join[2])) {
+					$condition = $this->buildCondition($join[2], $params);
+					if ($condition !== '') {
+						$joins[$i] .= ' ON ' . $condition;
+					}
+				}
+			} else {
+				throw new Exception('A join clause must be specified as an array of join type, join table, and optionally join condition.');
+			}
+		}
+
+		return implode($this->separator, $joins);
+	}
+
+	/**
+	 * @param string|array $condition
+	 * @param array $params the binding parameters to be populated
+	 * @return string the WHERE clause built from [[query]].
+	 */
+	public function buildWhere($condition, &$params)
+	{
+		$where = $this->buildCondition($condition, $params);
+		return $where === '' ? '' : 'WHERE ' . $where;
+	}
+
+	/**
+	 * @param array $columns
+	 * @return string the GROUP BY clause
+	 */
+	public function buildGroupBy($columns)
+	{
+		return empty($columns) ? '' : 'GROUP BY ' . $this->buildColumns($columns);
+	}
+
+	/**
+	 * @param string|array $condition
+	 * @param array $params the binding parameters to be populated
+	 * @return string the HAVING clause built from [[query]].
+	 */
+	public function buildHaving($condition, &$params)
+	{
+		$having = $this->buildCondition($condition, $params);
+		return $having === '' ? '' : 'HAVING ' . $having;
+	}
+
+	/**
+	 * @param array $columns
+	 * @return string the ORDER BY clause built from [[query]].
+	 */
+	public function buildOrderBy($columns)
+	{
+		if (empty($columns)) {
+			return '';
+		}
+		$orders = array();
+		foreach ($columns as $name => $direction) {
+			if (is_object($direction)) {
+				$orders[] = (string)$direction;
+			} else {
+				$orders[] = $this->db->quoteColumnName($name) . ($direction === Query::SORT_DESC ? ' DESC' : '');
+			}
+		}
+
+		return 'ORDER BY ' . implode(', ', $orders);
+	}
+
+	/**
+	 * @param integer $limit
+	 * @param integer $offset
+	 * @return string the LIMIT and OFFSET clauses built from [[query]].
+	 */
+	public function buildLimit($limit, $offset)
+	{
+		$sql = '';
+		if ($limit !== null && $limit >= 0) {
+			$sql = 'LIMIT ' . (int)$limit;
+		}
+		if ($offset > 0) {
+			$sql .= ' OFFSET ' . (int)$offset;
+		}
+		return ltrim($sql);
+	}
+
+	/**
+	 * @param array $unions
+	 * @param array $params the binding parameters to be populated
+	 * @return string the UNION clause built from [[query]].
+	 */
+	public function buildUnion($unions, &$params)
+	{
+		if (empty($unions)) {
+			return '';
+		}
+		foreach ($unions as $i => $union) {
+			if ($union instanceof Query) {
+				$union->addParams($params);
+				$unions[$i] = $this->build($union);
+				$params = $union->params;
+			}
+		}
+		return "UNION (\n" . implode("\n) UNION (\n", $unions) . "\n)";
+	}
+
+	/**
+	 * Processes columns and properly quote them if necessary.
+	 * It will join all columns into a string with comma as separators.
+	 * @param string|array $columns the columns to be processed
+	 * @return string the processing result
+	 */
+	public function buildColumns($columns)
+	{
+		if (!is_array($columns)) {
+			if (strpos($columns, '(') !== false) {
+				return $columns;
+			} else {
+				$columns = preg_split('/\s*,\s*/', $columns, -1, PREG_SPLIT_NO_EMPTY);
+			}
+		}
+		foreach ($columns as $i => $column) {
+			if (is_object($column)) {
+				$columns[$i] = (string)$column;
+			} elseif (strpos($column, '(') === false) {
+				$columns[$i] = $this->db->quoteColumnName($column);
+			}
+		}
+		return is_array($columns) ? implode(', ', $columns) : $columns;
+	}
+
+
+	/**
+	 * Parses the condition specification and generates the corresponding SQL expression.
+	 * @param string|array $condition the condition specification. Please refer to [[Query::where()]]
+	 * on how to specify a condition.
+	 * @param array $params the binding parameters to be populated
+	 * @return string the generated SQL expression
+	 * @throws \yii\db\Exception if the condition is in bad format
+	 */
+	public function buildCondition($condition, &$params)
+	{
+		static $builders = array(
+			'AND' => 'buildAndCondition',
+			'OR' => 'buildAndCondition',
+			'BETWEEN' => 'buildBetweenCondition',
+			'NOT BETWEEN' => 'buildBetweenCondition',
+			'IN' => 'buildInCondition',
+			'NOT IN' => 'buildInCondition',
+			'LIKE' => 'buildLikeCondition',
+			'NOT LIKE' => 'buildLikeCondition',
+			'OR LIKE' => 'buildLikeCondition',
+			'OR NOT LIKE' => 'buildLikeCondition',
+		);
+
+		if (!is_array($condition)) {
+			return (string)$condition;
+		} elseif (empty($condition)) {
+			return '';
+		}
+		if (isset($condition[0])) { // operator format: operator, operand 1, operand 2, ...
+			$operator = strtoupper($condition[0]);
+			if (isset($builders[$operator])) {
+				$method = $builders[$operator];
+				array_shift($condition);
+				return $this->$method($operator, $condition, $params);
+			} else {
+				throw new Exception('Found unknown operator in query: ' . $operator);
+			}
+		} else { // hash format: 'column1'=>'value1', 'column2'=>'value2', ...
+			return $this->buildHashCondition($condition, $params);
+		}
+	}
+
+	private function buildHashCondition($condition, &$params)
+	{
+		$parts = array();
+		foreach ($condition as $column => $value) {
+			if (is_array($value)) { // IN condition
+				$parts[] = $this->buildInCondition('in', array($column, $value), $params);
+			} else {
+				if (strpos($column, '(') === false) {
+					$column = $this->db->quoteColumnName($column);
+				}
+				if ($value === null) {
+					$parts[] = "$column IS NULL";
+				} elseif ($value instanceof Expression) {
+					$parts[] = "$column=" . $value->expression;
+					foreach ($value->params as $n => $v) {
+						$params[$n] = $v;
+					}
+				} else {
+					$phName = self::PARAM_PREFIX . count($params);
+					$parts[] = "$column=$phName";
+					$params[$phName] = $value;
+				}
+			}
+		}
+		return count($parts) === 1 ? $parts[0] : '(' . implode(') AND (', $parts) . ')';
+	}
+
+	private function buildAndCondition($operator, $operands, &$params)
+	{
+		$parts = array();
+		foreach ($operands as $operand) {
+			if (is_array($operand)) {
+				$operand = $this->buildCondition($operand, $params);
+			}
+			if ($operand !== '') {
+				$parts[] = $operand;
+			}
+		}
+		if (!empty($parts)) {
+			return '(' . implode(") $operator (", $parts) . ')';
+		} else {
+			return '';
+		}
+	}
+
+	private function buildBetweenCondition($operator, $operands, &$params)
+	{
+		if (!isset($operands[0], $operands[1], $operands[2])) {
+			throw new Exception("Operator '$operator' requires three operands.");
+		}
+
+		list($column, $value1, $value2) = $operands;
+
+		if (strpos($column, '(') === false) {
+			$column = $this->db->quoteColumnName($column);
+		}
+		$phName1 = self::PARAM_PREFIX . count($params);
+		$phName2 = self::PARAM_PREFIX . count($params);
+		$params[$phName1] = $value1;
+		$params[$phName2] = $value2;
+
+		return "$column $operator $phName1 AND $phName2";
+	}
+
+	private function buildInCondition($operator, $operands, &$params)
+	{
+		if (!isset($operands[0], $operands[1])) {
+			throw new Exception("Operator '$operator' requires two operands.");
+		}
+
+		list($column, $values) = $operands;
+
+		$values = (array)$values;
+
+		if (empty($values) || $column === array()) {
+			return $operator === 'IN' ? '0=1' : '';
+		}
+
+		if (count($column) > 1) {
+			return $this->buildCompositeInCondition($operator, $column, $values, $params);
+		} elseif (is_array($column)) {
+			$column = reset($column);
+		}
+		foreach ($values as $i => $value) {
+			if (is_array($value)) {
+				$value = isset($value[$column]) ? $value[$column] : null;
+			}
+			if ($value === null) {
+				$values[$i] = 'NULL';
+			} elseif ($value instanceof Expression) {
+				$values[$i] = $value->expression;
+				foreach ($value->params as $n => $v) {
+					$params[$n] = $v;
+				}
+			} else {
+				$phName = self::PARAM_PREFIX . count($params);
+				$params[$phName] = $value;
+				$values[$i] = $phName;
+			}
+		}
+		if (strpos($column, '(') === false) {
+			$column = $this->db->quoteColumnName($column);
+		}
+
+		if (count($values) > 1) {
+			return "$column $operator (" . implode(', ', $values) . ')';
+		} else {
+			$operator = $operator === 'IN' ? '=' : '<>';
+			return "$column$operator{$values[0]}";
+		}
+	}
+
+	protected function buildCompositeInCondition($operator, $columns, $values, &$params)
+	{
+		foreach ($columns as $i => $column) {
+			if (strpos($column, '(') === false) {
+				$columns[$i] = $this->db->quoteColumnName($column);
+			}
+		}
+		$vss = array();
+		foreach ($values as $value) {
+			$vs = array();
+			foreach ($columns as $column) {
+				if (isset($value[$column])) {
+					$phName = self::PARAM_PREFIX . count($params);
+					$params[$phName] = $value[$column];
+					$vs[] = $phName;
+				} else {
+					$vs[] = 'NULL';
+				}
+			}
+			$vss[] = '(' . implode(', ', $vs) . ')';
+		}
+		return '(' . implode(', ', $columns) . ") $operator (" . implode(', ', $vss) . ')';
+	}
+
+	private function buildLikeCondition($operator, $operands, &$params)
+	{
+		if (!isset($operands[0], $operands[1])) {
+			throw new Exception("Operator '$operator' requires two operands.");
+		}
+
+		list($column, $values) = $operands;
+
+		$values = (array)$values;
+
+		if (empty($values)) {
+			return $operator === 'LIKE' || $operator === 'OR LIKE' ? '0=1' : '';
+		}
+
+		if ($operator === 'LIKE' || $operator === 'NOT LIKE') {
+			$andor = ' AND ';
+		} else {
+			$andor = ' OR ';
+			$operator = $operator === 'OR LIKE' ? 'LIKE' : 'NOT LIKE';
+		}
+
+		if (strpos($column, '(') === false) {
+			$column = $this->db->quoteColumnName($column);
+		}
+
+		$parts = array();
+		foreach ($values as $value) {
+			$phName = self::PARAM_PREFIX . count($params);
+			$params[$phName] = $value;
+			$parts[] = "$column $operator $phName";
+		}
+
+		return implode($andor, $parts);
+	}
+}
diff --git a/yii/db/Schema.php b/yii/db/Schema.php
new file mode 100644
index 0000000..9538e4c
--- /dev/null
+++ b/yii/db/Schema.php
@@ -0,0 +1,363 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\db;
+
+use Yii;
+use yii\base\NotSupportedException;
+use yii\base\InvalidCallException;
+use yii\caching\Cache;
+
+/**
+ * Schema is the base class for concrete DBMS-specific schema classes.
+ *
+ * Schema represents the database schema information that is DBMS specific.
+ *
+ * @property QueryBuilder $queryBuilder the query builder for the DBMS represented by this schema
+ * @property array $tableNames the names of all tables in this database.
+ * @property array $tableSchemas the schema information for all tables in this database.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+abstract class Schema extends \yii\base\Object
+{
+	/**
+	 * The followings are the supported abstract column data types.
+	 */
+	const TYPE_PK = 'pk';
+	const TYPE_STRING = 'string';
+	const TYPE_TEXT = 'text';
+	const TYPE_SMALLINT = 'smallint';
+	const TYPE_INTEGER = 'integer';
+	const TYPE_BIGINT = 'bigint';
+	const TYPE_FLOAT = 'float';
+	const TYPE_DECIMAL = 'decimal';
+	const TYPE_DATETIME = 'datetime';
+	const TYPE_TIMESTAMP = 'timestamp';
+	const TYPE_TIME = 'time';
+	const TYPE_DATE = 'date';
+	const TYPE_BINARY = 'binary';
+	const TYPE_BOOLEAN = 'boolean';
+	const TYPE_MONEY = 'money';
+
+	/**
+	 * @var Connection the database connection
+	 */
+	public $db;
+	/**
+	 * @var array list of ALL table names in the database
+	 */
+	private $_tableNames = array();
+	/**
+	 * @var array list of loaded table metadata (table name => TableSchema)
+	 */
+	private $_tables = array();
+	/**
+	 * @var QueryBuilder the query builder for this database
+	 */
+	private $_builder;
+
+	/**
+	 * Loads the metadata for the specified table.
+	 * @param string $name table name
+	 * @return TableSchema DBMS-dependent table metadata, null if the table does not exist.
+	 */
+	abstract protected function loadTableSchema($name);
+
+
+	/**
+	 * Obtains the metadata for the named table.
+	 * @param string $name table name. The table name may contain schema name if any. Do not quote the table name.
+	 * @param boolean $refresh whether to reload the table schema even if it is found in the cache.
+	 * @return TableSchema table metadata. Null if the named table does not exist.
+	 */
+	public function getTableSchema($name, $refresh = false)
+	{
+		if (isset($this->_tables[$name]) && !$refresh) {
+			return $this->_tables[$name];
+		}
+
+		$db = $this->db;
+		$realName = $this->getRawTableName($name);
+
+		if ($db->enableSchemaCache && !in_array($name, $db->schemaCacheExclude, true)) {
+			/** @var $cache Cache */
+			$cache = is_string($db->schemaCache) ? Yii::$app->getComponent($db->schemaCache) : $db->schemaCache;
+			if ($cache instanceof Cache) {
+				$key = $this->getCacheKey($cache, $name);
+				if ($refresh || ($table = $cache->get($key)) === false) {
+					$table = $this->loadTableSchema($realName);
+					if ($table !== null) {
+						$cache->set($key, $table, $db->schemaCacheDuration);
+					}
+				}
+				return $this->_tables[$name] = $table;
+			}
+		}
+		return $this->_tables[$name] = $table = $this->loadTableSchema($realName);
+	}
+
+	/**
+	 * Returns the cache key for the specified table name.
+	 * @param Cache $cache the cache component
+	 * @param string $name the table name
+	 * @return string the cache key
+	 */
+	public function getCacheKey($cache, $name)
+	{
+		return $cache->buildKey(array(
+			__CLASS__,
+			$this->db->dsn,
+			$this->db->username,
+			$name,
+		));
+	}
+
+	/**
+	 * Returns the metadata for all tables in the database.
+	 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema name.
+	 * @param boolean $refresh whether to fetch the latest available table schemas. If this is false,
+	 * cached data may be returned if available.
+	 * @return array the metadata for all tables in the database.
+	 * Each array element is an instance of [[TableSchema]] or its child class.
+	 */
+	public function getTableSchemas($schema = '', $refresh = false)
+	{
+		$tables = array();
+		foreach ($this->getTableNames($schema, $refresh) as $name) {
+			if ($schema !== '') {
+				$name = $schema . '.' . $name;
+			}
+			if (($table = $this->getTableSchema($name, $refresh)) !== null) {
+				$tables[] = $table;
+			}
+		}
+		return $tables;
+	}
+
+	/**
+	 * Returns all table names in the database.
+	 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema name.
+	 * If not empty, the returned table names will be prefixed with the schema name.
+	 * @param boolean $refresh whether to fetch the latest available table names. If this is false,
+	 * table names fetched previously (if available) will be returned.
+	 * @return array all table names in the database.
+	 */
+	public function getTableNames($schema = '', $refresh = false)
+	{
+		if (!isset($this->_tableNames[$schema]) || $refresh) {
+			$this->_tableNames[$schema] = $this->findTableNames($schema);
+		}
+		return $this->_tableNames[$schema];
+	}
+
+	/**
+	 * @return QueryBuilder the query builder for this connection.
+	 */
+	public function getQueryBuilder()
+	{
+		if ($this->_builder === null) {
+			$this->_builder = $this->createQueryBuilder();
+		}
+		return $this->_builder;
+	}
+
+	/**
+	 * Refreshes the schema.
+	 * This method cleans up all cached table schemas so that they can be re-created later
+	 * to reflect the database schema change.
+	 */
+	public function refresh()
+	{
+		/** @var $cache Cache */
+		$cache = is_string($this->db->schemaCache) ? Yii::$app->getComponent($this->db->schemaCache) : $this->db->schemaCache;
+		if ($this->db->enableSchemaCache && $cache instanceof Cache) {
+			foreach ($this->_tables as $name => $table) {
+				$cache->delete($this->getCacheKey($cache, $name));
+			}
+		}
+		$this->_tableNames = array();
+		$this->_tables = array();
+	}
+
+	/**
+	 * Creates a query builder for the database.
+	 * This method may be overridden by child classes to create a DBMS-specific query builder.
+	 * @return QueryBuilder query builder instance
+	 */
+	public function createQueryBuilder()
+	{
+		return new QueryBuilder($this->db);
+	}
+
+	/**
+	 * Returns all table names in the database.
+	 * This method should be overridden by child classes in order to support this feature
+	 * because the default implementation simply throws an exception.
+	 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
+	 * @return array all table names in the database. The names have NO the schema name prefix.
+	 * @throws NotSupportedException if this method is called
+	 */
+	protected function findTableNames($schema = '')
+	{
+		throw new NotSupportedException(get_class($this) . ' does not support fetching all table names.');
+	}
+
+	/**
+	 * Returns the ID of the last inserted row or sequence value.
+	 * @param string $sequenceName name of the sequence object (required by some DBMS)
+	 * @return string the row ID of the last row inserted, or the last value retrieved from the sequence object
+	 * @throws InvalidCallException if the DB connection is not active
+	 * @see http://www.php.net/manual/en/function.PDO-lastInsertId.php
+	 */
+	public function getLastInsertID($sequenceName = '')
+	{
+		if ($this->db->isActive) {
+			return $this->db->pdo->lastInsertId($sequenceName);
+		} else {
+			throw new InvalidCallException('DB Connection is not active.');
+		}
+	}
+
+	/**
+	 * Quotes a string value for use in a query.
+	 * Note that if the parameter is not a string, it will be returned without change.
+	 * @param string $str string to be quoted
+	 * @return string the properly quoted string
+	 * @see http://www.php.net/manual/en/function.PDO-quote.php
+	 */
+	public function quoteValue($str)
+	{
+		if (!is_string($str)) {
+			return $str;
+		}
+
+		$this->db->open();
+		if (($value = $this->db->pdo->quote($str)) !== false) {
+			return $value;
+		} else { // the driver doesn't support quote (e.g. oci)
+			return "'" . addcslashes(str_replace("'", "''", $str), "\000\n\r\\\032") . "'";
+		}
+	}
+
+	/**
+	 * Quotes a table name for use in a query.
+	 * If the table name contains schema prefix, the prefix will also be properly quoted.
+	 * If the table name is already quoted or contains '(' or '{{',
+	 * then this method will do nothing.
+	 * @param string $name table name
+	 * @return string the properly quoted table name
+	 * @see quoteSimpleTableName
+	 */
+	public function quoteTableName($name)
+	{
+		if (strpos($name, '(') !== false || strpos($name, '{{') !== false) {
+			return $name;
+		}
+		if (strpos($name, '.') === false) {
+			return $this->quoteSimpleTableName($name);
+		}
+		$parts = explode('.', $name);
+		foreach ($parts as $i => $part) {
+			$parts[$i] = $this->quoteSimpleTableName($part);
+		}
+		return implode('.', $parts);
+
+	}
+
+	/**
+	 * Quotes a column name for use in a query.
+	 * If the column name contains prefix, the prefix will also be properly quoted.
+	 * If the column name is already quoted or contains '(', '[[' or '{{',
+	 * then this method will do nothing.
+	 * @param string $name column name
+	 * @return string the properly quoted column name
+	 * @see quoteSimpleColumnName
+	 */
+	public function quoteColumnName($name)
+	{
+		if (strpos($name, '(') !== false || strpos($name, '[[') !== false || strpos($name, '{{') !== false) {
+			return $name;
+		}
+		if (($pos = strrpos($name, '.')) !== false) {
+			$prefix = $this->quoteTableName(substr($name, 0, $pos)) . '.';
+			$name = substr($name, $pos + 1);
+		} else {
+			$prefix = '';
+		}
+		return $prefix . $this->quoteSimpleColumnName($name);
+	}
+
+	/**
+	 * Quotes a simple table name for use in a query.
+	 * A simple table name should contain the table name only without any schema prefix.
+	 * If the table name is already quoted, this method will do nothing.
+	 * @param string $name table name
+	 * @return string the properly quoted table name
+	 */
+	public function quoteSimpleTableName($name)
+	{
+		return strpos($name, "'") !== false ? $name : "'" . $name . "'";
+	}
+
+	/**
+	 * Quotes a simple column name for use in a query.
+	 * A simple column name should contain the column name only without any prefix.
+	 * If the column name is already quoted or is the asterisk character '*', this method will do nothing.
+	 * @param string $name column name
+	 * @return string the properly quoted column name
+	 */
+	public function quoteSimpleColumnName($name)
+	{
+		return strpos($name, '"') !== false || $name === '*' ? $name : '"' . $name . '"';
+	}
+
+	/**
+	 * Returns the actual name of a given table name.
+	 * This method will strip off curly brackets from the given table name
+	 * and replace the percentage character '%' with [[Connection::tablePrefix]].
+	 * @param string $name the table name to be converted
+	 * @return string the real name of the given table name
+	 */
+	public function getRawTableName($name)
+	{
+		if (strpos($name, '{{') !== false) {
+			$name = preg_replace('/\\{\\{(.*?)\\}\\}/', '\1', $name);
+			return str_replace('%', $this->db->tablePrefix, $name);
+		} else {
+			return $name;
+		}
+	}
+
+	/**
+	 * Extracts the PHP type from abstract DB type.
+	 * @param ColumnSchema $column the column schema information
+	 * @return string PHP type name
+	 */
+	protected function getColumnPhpType($column)
+	{
+		static $typeMap = array( // abstract type => php type
+			'smallint' => 'integer',
+			'integer' => 'integer',
+			'bigint' => 'integer',
+			'boolean' => 'boolean',
+			'float' => 'double',
+		);
+		if (isset($typeMap[$column->type])) {
+			if ($column->type === 'bigint') {
+				return PHP_INT_SIZE == 8 && !$column->unsigned ? 'integer' : 'string';
+			} elseif ($column->type === 'integer') {
+				return PHP_INT_SIZE == 4 && $column->unsigned ? 'string' : 'integer';
+			} else {
+				return $typeMap[$column->type];
+			}
+		} else {
+			return 'string';
+		}
+	}
+}
diff --git a/yii/db/StaleObjectException.php b/yii/db/StaleObjectException.php
new file mode 100644
index 0000000..0a04bd3
--- /dev/null
+++ b/yii/db/StaleObjectException.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\db;
+
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class StaleObjectException extends Exception
+{
+	/**
+	 * @return string the user-friendly name of this exception
+	 */
+	public function getName()
+	{
+		return \Yii::t('yii|Stale Object Exception');
+	}
+}
diff --git a/yii/db/TableSchema.php b/yii/db/TableSchema.php
new file mode 100644
index 0000000..1065b51
--- /dev/null
+++ b/yii/db/TableSchema.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\db;
+
+use yii\base\InvalidParamException;
+
+/**
+ * TableSchema represents the metadata of a database table.
+ *
+ * @property array $columnNames list of column names
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class TableSchema extends \yii\base\Object
+{
+	/**
+	 * @var string name of the catalog (database) that this table belongs to.
+	 * Defaults to null, meaning no catalog (or the current database).
+	 * This property is only meaningful for MSSQL.
+	 */
+	public $catalogName;
+	/**
+	 * @var string name of the schema that this table belongs to.
+	 */
+	public $schemaName;
+	/**
+	 * @var string name of this table.
+	 */
+	public $name;
+	/**
+	 * @var string[] primary keys of this table.
+	 */
+	public $primaryKey = array();
+	/**
+	 * @var string sequence name for the primary key. Null if no sequence.
+	 */
+	public $sequenceName;
+	/**
+	 * @var array foreign keys of this table. Each array element is of the following structure:
+	 *
+	 * ~~~
+	 * array(
+	 *	 'ForeignTableName',
+	 *	 'fk1' => 'pk1',  // pk1 is in foreign table
+	 *	 'fk2' => 'pk2',  // if composite foreign key
+	 * )
+	 * ~~~
+	 */
+	public $foreignKeys = array();
+	/**
+	 * @var ColumnSchema[] column metadata of this table. Each array element is a [[ColumnSchema]] object, indexed by column names.
+	 */
+	public $columns = array();
+
+	/**
+	 * Gets the named column metadata.
+	 * This is a convenient method for retrieving a named column even if it does not exist.
+	 * @param string $name column name
+	 * @return ColumnSchema metadata of the named column. Null if the named column does not exist.
+	 */
+	public function getColumn($name)
+	{
+		return isset($this->columns[$name]) ? $this->columns[$name] : null;
+	}
+
+	/**
+	 * Returns the names of all columns in this table.
+	 * @return array list of column names
+	 */
+	public function getColumnNames()
+	{
+		return array_keys($this->columns);
+	}
+
+	/**
+	 * Manually specifies the primary key for this table.
+	 * @param string|array $keys the primary key (can be composite)
+	 * @throws InvalidParamException if the specified key cannot be found in the table.
+	 */
+	public function fixPrimaryKey($keys)
+	{
+		if (!is_array($keys)) {
+			$keys = array($keys);
+		}
+		$this->primaryKey = $keys;
+		foreach ($this->columns as $column) {
+			$column->isPrimaryKey = false;
+		}
+		foreach ($keys as $key) {
+			if (isset($this->columns[$key])) {
+				$this->columns[$key]->isPrimaryKey = true;
+			} else {
+				throw new InvalidParamException("Primary key '$key' cannot be found in table '{$this->name}'.");
+			}
+		}
+	}
+}
diff --git a/yii/db/Transaction.php b/yii/db/Transaction.php
new file mode 100644
index 0000000..195a8c8
--- /dev/null
+++ b/yii/db/Transaction.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\db;
+
+use yii\base\InvalidConfigException;
+
+/**
+ * Transaction represents a DB transaction.
+ *
+ * It is usually created by calling [[Connection::beginTransaction()]].
+ *
+ * The following code is a typical example of using transactions (note that some
+ * DBMS may not support transactions):
+ *
+ * ~~~
+ * $transaction = $connection->beginTransaction();
+ * try {
+ *     $connection->createCommand($sql1)->execute();
+ *     $connection->createCommand($sql2)->execute();
+ *     //.... other SQL executions
+ *     $transaction->commit();
+ * } catch(Exception $e) {
+ *     $transaction->rollback();
+ * }
+ * ~~~
+ *
+ * @property boolean $isActive Whether the transaction is active. This property is read-only.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Transaction extends \yii\base\Object
+{
+	/**
+	 * @var Connection the database connection that this transaction is associated with.
+	 */
+	public $db;
+	/**
+	 * @var boolean whether this transaction is active. Only an active transaction
+	 * can [[commit()]] or [[rollback()]]. This property is set true when the transaction is started.
+	 */
+	private $_active = false;
+
+	/**
+	 * Returns a value indicating whether this transaction is active.
+	 * @return boolean whether this transaction is active. Only an active transaction
+	 * can [[commit()]] or [[rollback()]].
+	 */
+	public function getIsActive()
+	{
+		return $this->_active;
+	}
+
+	/**
+	 * Begins a transaction.
+	 * @throws InvalidConfigException if [[connection]] is null
+	 */
+	public function begin()
+	{
+		if (!$this->_active) {
+			if ($this->db === null) {
+				throw new InvalidConfigException('Transaction::db must be set.');
+			}
+			\Yii::trace('Starting transaction', __METHOD__);
+			$this->db->open();
+			$this->db->pdo->beginTransaction();
+			$this->_active = true;
+		}
+	}
+
+	/**
+	 * Commits a transaction.
+	 * @throws Exception if the transaction or the DB connection is not active.
+	 */
+	public function commit()
+	{
+		if ($this->_active && $this->db && $this->db->isActive) {
+			\Yii::trace('Committing transaction', __METHOD__);
+			$this->db->pdo->commit();
+			$this->_active = false;
+		} else {
+			throw new Exception('Failed to commit transaction: transaction was inactive.');
+		}
+	}
+
+	/**
+	 * Rolls back a transaction.
+	 * @throws Exception if the transaction or the DB connection is not active.
+	 */
+	public function rollback()
+	{
+		if ($this->_active && $this->db && $this->db->isActive) {
+			\Yii::trace('Rolling back transaction', __METHOD__);
+			$this->db->pdo->rollBack();
+			$this->_active = false;
+		} else {
+			throw new Exception('Failed to roll back transaction: transaction was inactive.');
+		}
+	}
+}
diff --git a/yii/db/mysql/QueryBuilder.php b/yii/db/mysql/QueryBuilder.php
new file mode 100644
index 0000000..a078b9a
--- /dev/null
+++ b/yii/db/mysql/QueryBuilder.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\db\mysql;
+
+use yii\db\Exception;
+use yii\base\InvalidParamException;
+
+/**
+ * QueryBuilder is the query builder for MySQL databases.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class QueryBuilder extends \yii\db\QueryBuilder
+{
+	/**
+	 * @var array mapping from abstract column types (keys) to physical column types (values).
+	 */
+	public $typeMap = array(
+		Schema::TYPE_PK => 'int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY',
+		Schema::TYPE_STRING => 'varchar(255)',
+		Schema::TYPE_TEXT => 'text',
+		Schema::TYPE_SMALLINT => 'smallint(6)',
+		Schema::TYPE_INTEGER => 'int(11)',
+		Schema::TYPE_BIGINT => 'bigint(20)',
+		Schema::TYPE_FLOAT => 'float',
+		Schema::TYPE_DECIMAL => 'decimal',
+		Schema::TYPE_DATETIME => 'datetime',
+		Schema::TYPE_TIMESTAMP => 'timestamp',
+		Schema::TYPE_TIME => 'time',
+		Schema::TYPE_DATE => 'date',
+		Schema::TYPE_BINARY => 'blob',
+		Schema::TYPE_BOOLEAN => 'tinyint(1)',
+		Schema::TYPE_MONEY => 'decimal(19,4)',
+	);
+
+	/**
+	 * Builds a SQL statement for renaming a column.
+	 * @param string $table the table whose column is to be renamed. The name will be properly quoted by the method.
+	 * @param string $oldName the old name of the column. The name will be properly quoted by the method.
+	 * @param string $newName the new name of the column. The name will be properly quoted by the method.
+	 * @return string the SQL statement for renaming a DB column.
+	 * @throws Exception
+	 */
+	public function renameColumn($table, $oldName, $newName)
+	{
+		$quotedTable = $this->db->quoteTableName($table);
+		$row = $this->db->createCommand('SHOW CREATE TABLE ' . $quotedTable)->queryRow();
+		if ($row === false) {
+			throw new Exception("Unable to find column '$oldName' in table '$table'.");
+		}
+		if (isset($row['Create Table'])) {
+			$sql = $row['Create Table'];
+		} else {
+			$row = array_values($row);
+			$sql = $row[1];
+		}
+		if (preg_match_all('/^\s*`(.*?)`\s+(.*?),?$/m', $sql, $matches)) {
+			foreach ($matches[1] as $i => $c) {
+				if ($c === $oldName) {
+					return "ALTER TABLE $quotedTable CHANGE "
+						. $this->db->quoteColumnName($oldName) . ' '
+						. $this->db->quoteColumnName($newName) . ' '
+						. $matches[2][$i];
+				}
+			}
+		}
+		// try to give back a SQL anyway
+		return "ALTER TABLE $quotedTable CHANGE "
+			. $this->db->quoteColumnName($oldName) . ' '
+			. $this->db->quoteColumnName($newName);
+	}
+
+	/**
+	 * Builds a SQL statement for dropping a foreign key constraint.
+	 * @param string $name the name of the foreign key constraint to be dropped. The name will be properly quoted by the method.
+	 * @param string $table the table whose foreign is to be dropped. The name will be properly quoted by the method.
+	 * @return string the SQL statement for dropping a foreign key constraint.
+	 */
+	public function dropForeignKey($name, $table)
+	{
+		return 'ALTER TABLE ' . $this->db->quoteTableName($table)
+			. ' DROP FOREIGN KEY ' . $this->db->quoteColumnName($name);
+	}
+
+	/**
+	 * Creates a SQL statement for resetting the sequence value of a table's primary key.
+	 * The sequence will be reset such that the primary key of the next new row inserted
+	 * will have the specified value or 1.
+	 * @param string $tableName the name of the table whose primary key sequence will be reset
+	 * @param mixed $value the value for the primary key of the next new row inserted. If this is not set,
+	 * the next new row's primary key will have a value 1.
+	 * @return string the SQL statement for resetting sequence
+	 * @throws InvalidParamException if the table does not exist or there is no sequence associated with the table.
+	 */
+	public function resetSequence($tableName, $value = null)
+	{
+		$table = $this->db->getTableSchema($tableName);
+		if ($table !== null && $table->sequenceName !== null) {
+			$tableName = $this->db->quoteTableName($tableName);
+			if ($value === null) {
+				$key = reset($table->primaryKey);
+				$value = $this->db->createCommand("SELECT MAX(`$key`) FROM $tableName")->queryScalar() + 1;
+			} else {
+				$value = (int)$value;
+			}
+			return "ALTER TABLE $tableName AUTO_INCREMENT=$value";
+		} elseif ($table === null) {
+			throw new InvalidParamException("Table not found: $tableName");
+		} else {
+			throw new InvalidParamException("There is not sequence associated with table '$tableName'.'");
+		}
+	}
+
+	/**
+	 * Builds a SQL statement for enabling or disabling integrity check.
+	 * @param boolean $check whether to turn on or off the integrity check.
+	 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
+	 * @return string the SQL statement for checking integrity
+	 */
+	public function checkIntegrity($check = true, $schema = '')
+	{
+		return 'SET FOREIGN_KEY_CHECKS=' . ($check ? 1 : 0);
+	}
+
+	/**
+	 * Generates a batch INSERT SQL statement.
+	 * For example,
+	 *
+	 * ~~~
+	 * $connection->createCommand()->batchInsert('tbl_user', array('name', 'age'), array(
+	 *     array('Tom', 30),
+	 *     array('Jane', 20),
+	 *     array('Linda', 25),
+	 * ))->execute();
+	 * ~~~
+	 *
+	 * Not that the values in each row must match the corresponding column names.
+	 *
+	 * @param string $table the table that new rows will be inserted into.
+	 * @param array $columns the column names
+	 * @param array $rows the rows to be batch inserted into the table
+	 * @return string the batch INSERT SQL statement
+	 */
+	public function batchInsert($table, $columns, $rows)
+	{
+		$values = array();
+		foreach ($rows as $row) {
+			$vs = array();
+			foreach ($row as $value) {
+				$vs[] = is_string($value) ? $this->db->quoteValue($value) : $value;
+			}
+			$values[] = $vs;
+		}
+
+		return 'INSERT INTO ' . $this->db->quoteTableName($table)
+			. ' (' . implode(', ', $columns) . ') VALUES ('
+			. implode(', ', $values) . ')';
+	}
+}
diff --git a/yii/db/mysql/Schema.php b/yii/db/mysql/Schema.php
new file mode 100644
index 0000000..501149a
--- /dev/null
+++ b/yii/db/mysql/Schema.php
@@ -0,0 +1,246 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\db\mysql;
+
+use yii\db\TableSchema;
+use yii\db\ColumnSchema;
+
+/**
+ * Schema is the class for retrieving metadata from a MySQL database (version 4.1.x and 5.x).
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Schema extends \yii\db\Schema
+{
+	/**
+	 * @var array mapping from physical column types (keys) to abstract column types (values)
+	 */
+	public $typeMap = array(
+		'tinyint' => self::TYPE_SMALLINT,
+		'bit' => self::TYPE_SMALLINT,
+		'smallint' => self::TYPE_SMALLINT,
+		'mediumint' => self::TYPE_INTEGER,
+		'int' => self::TYPE_INTEGER,
+		'integer' => self::TYPE_INTEGER,
+		'bigint' => self::TYPE_BIGINT,
+		'float' => self::TYPE_FLOAT,
+		'double' => self::TYPE_FLOAT,
+		'real' => self::TYPE_FLOAT,
+		'decimal' => self::TYPE_DECIMAL,
+		'numeric' => self::TYPE_DECIMAL,
+		'tinytext' => self::TYPE_TEXT,
+		'mediumtext' => self::TYPE_TEXT,
+		'longtext' => self::TYPE_TEXT,
+		'text' => self::TYPE_TEXT,
+		'varchar' => self::TYPE_STRING,
+		'string' => self::TYPE_STRING,
+		'char' => self::TYPE_STRING,
+		'datetime' => self::TYPE_DATETIME,
+		'year' => self::TYPE_DATE,
+		'date' => self::TYPE_DATE,
+		'time' => self::TYPE_TIME,
+		'timestamp' => self::TYPE_TIMESTAMP,
+		'enum' => self::TYPE_STRING,
+	);
+
+	/**
+	 * Quotes a table name for use in a query.
+	 * A simple table name has no schema prefix.
+	 * @param string $name table name
+	 * @return string the properly quoted table name
+	 */
+	public function quoteSimpleTableName($name)
+	{
+		return strpos($name, "`") !== false ? $name : "`" . $name . "`";
+	}
+
+	/**
+	 * Quotes a column name for use in a query.
+	 * A simple column name has no prefix.
+	 * @param string $name column name
+	 * @return string the properly quoted column name
+	 */
+	public function quoteSimpleColumnName($name)
+	{
+		return strpos($name, '`') !== false || $name === '*' ? $name : '`' . $name . '`';
+	}
+
+	/**
+	 * Creates a query builder for the MySQL database.
+	 * @return QueryBuilder query builder instance
+	 */
+	public function createQueryBuilder()
+	{
+		return new QueryBuilder($this->db);
+	}
+
+	/**
+	 * Loads the metadata for the specified table.
+	 * @param string $name table name
+	 * @return TableSchema driver dependent table metadata. Null if the table does not exist.
+	 */
+	protected function loadTableSchema($name)
+	{
+		$table = new TableSchema;
+		$this->resolveTableNames($table, $name);
+
+		if ($this->findColumns($table)) {
+			$this->findConstraints($table);
+			return $table;
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * Resolves the table name and schema name (if any).
+	 * @param TableSchema $table the table metadata object
+	 * @param string $name the table name
+	 */
+	protected function resolveTableNames($table, $name)
+	{
+		$parts = explode('.', str_replace('`', '', $name));
+		if (isset($parts[1])) {
+			$table->schemaName = $parts[0];
+			$table->name = $parts[1];
+		} else {
+			$table->name = $parts[0];
+		}
+	}
+
+	/**
+	 * Loads the column information into a [[ColumnSchema]] object.
+	 * @param array $info column information
+	 * @return ColumnSchema the column schema object
+	 */
+	protected function loadColumnSchema($info)
+	{
+		$column = new ColumnSchema;
+
+		$column->name = $info['Field'];
+		$column->allowNull = $info['Null'] === 'YES';
+		$column->isPrimaryKey = strpos($info['Key'], 'PRI') !== false;
+		$column->autoIncrement = stripos($info['Extra'], 'auto_increment') !== false;
+		$column->comment = $info['Comment'];
+
+
+		$column->dbType = $info['Type'];
+		$column->unsigned = strpos($column->dbType, 'unsigned') !== false;
+
+		$column->type = self::TYPE_STRING;
+		if (preg_match('/^(\w+)(?:\(([^\)]+)\))?/', $column->dbType, $matches)) {
+			$type = $matches[1];
+			if (isset($this->typeMap[$type])) {
+				$column->type = $this->typeMap[$type];
+			}
+			if (!empty($matches[2])) {
+				if ($type === 'enum') {
+					$values = explode(',', $matches[2]);
+					foreach ($values as $i => $value) {
+						$values[$i] = trim($value, "'");
+					}
+					$column->enumValues = $values;
+				} else {
+					$values = explode(',', $matches[2]);
+					$column->size = $column->precision = (int)$values[0];
+					if (isset($values[1])) {
+						$column->scale = (int)$values[1];
+					}
+					if ($column->size === 1 && ($type === 'tinyint' || $type === 'bit')) {
+						$column->type = 'boolean';
+					} elseif ($type === 'bit') {
+						if ($column->size > 32) {
+							$column->type = 'bigint';
+						} elseif ($column->size === 32) {
+							$column->type = 'integer';
+						}
+					}
+				}
+			}
+		}
+
+		$column->phpType = $this->getColumnPhpType($column);
+
+		if ($column->type !== 'timestamp' || $info['Default'] !== 'CURRENT_TIMESTAMP') {
+			$column->defaultValue = $column->typecast($info['Default']);
+		}
+
+		return $column;
+	}
+
+	/**
+	 * Collects the metadata of table columns.
+	 * @param TableSchema $table the table metadata
+	 * @return boolean whether the table exists in the database
+	 */
+	protected function findColumns($table)
+	{
+		$sql = 'SHOW FULL COLUMNS FROM ' . $this->quoteSimpleTableName($table->name);
+		try {
+			$columns = $this->db->createCommand($sql)->queryAll();
+		} catch (\Exception $e) {
+			return false;
+		}
+		foreach ($columns as $info) {
+			$column = $this->loadColumnSchema($info);
+			$table->columns[$column->name] = $column;
+			if ($column->isPrimaryKey) {
+				$table->primaryKey[] = $column->name;
+				if ($column->autoIncrement) {
+					$table->sequenceName = '';
+				}
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * Collects the foreign key column details for the given table.
+	 * @param TableSchema $table the table metadata
+	 */
+	protected function findConstraints($table)
+	{
+		$row = $this->db->createCommand('SHOW CREATE TABLE ' . $this->quoteSimpleTableName($table->name))->queryRow();
+		if (isset($row['Create Table'])) {
+			$sql = $row['Create Table'];
+		} else {
+			$row = array_values($row);
+			$sql = $row[1];
+		}
+
+		$regexp = '/FOREIGN KEY\s+\(([^\)]+)\)\s+REFERENCES\s+([^\(^\s]+)\s*\(([^\)]+)\)/mi';
+		if (preg_match_all($regexp, $sql, $matches, PREG_SET_ORDER)) {
+			foreach ($matches as $match) {
+				$fks = array_map('trim', explode(',', str_replace('`', '', $match[1])));
+				$pks = array_map('trim', explode(',', str_replace('`', '', $match[3])));
+				$constraint = array(str_replace('`', '', $match[2]));
+				foreach ($fks as $k => $name) {
+					$constraint[$name] = $pks[$k];
+				}
+				$table->foreignKeys[] = $constraint;
+			}
+		}
+	}
+
+	/**
+	 * Returns all table names in the database.
+	 * This method should be overridden by child classes in order to support this feature
+	 * because the default implementation simply throws an exception.
+	 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
+	 * @return array all table names in the database. The names have NO the schema name prefix.
+	 */
+	protected function findTableNames($schema = '')
+	{
+		$sql = 'SHOW TABLES';
+		if ($schema !== '') {
+			$sql .= ' FROM ' . $this->quoteSimpleTableName($schema);
+		}
+		return $this->db->createCommand($sql)->queryColumn();
+	}
+}
diff --git a/yii/db/sqlite/QueryBuilder.php b/yii/db/sqlite/QueryBuilder.php
new file mode 100644
index 0000000..3aa89e7
--- /dev/null
+++ b/yii/db/sqlite/QueryBuilder.php
@@ -0,0 +1,181 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\db\sqlite;
+
+use yii\db\Exception;
+use yii\base\InvalidParamException;
+use yii\base\NotSupportedException;
+
+/**
+ * QueryBuilder is the query builder for SQLite databases.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class QueryBuilder extends \yii\db\QueryBuilder
+{
+	/**
+	 * @var array mapping from abstract column types (keys) to physical column types (values).
+	 */
+	public $typeMap = array(
+		Schema::TYPE_PK => 'integer PRIMARY KEY AUTOINCREMENT NOT NULL',
+		Schema::TYPE_STRING => 'varchar(255)',
+		Schema::TYPE_TEXT => 'text',
+		Schema::TYPE_SMALLINT => 'smallint',
+		Schema::TYPE_INTEGER => 'integer',
+		Schema::TYPE_BIGINT => 'bigint',
+		Schema::TYPE_FLOAT => 'float',
+		Schema::TYPE_DECIMAL => 'decimal',
+		Schema::TYPE_DATETIME => 'datetime',
+		Schema::TYPE_TIMESTAMP => 'timestamp',
+		Schema::TYPE_TIME => 'time',
+		Schema::TYPE_DATE => 'date',
+		Schema::TYPE_BINARY => 'blob',
+		Schema::TYPE_BOOLEAN => 'tinyint(1)',
+		Schema::TYPE_MONEY => 'decimal(19,4)',
+	);
+
+	/**
+	 * Creates a SQL statement for resetting the sequence value of a table's primary key.
+	 * The sequence will be reset such that the primary key of the next new row inserted
+	 * will have the specified value or 1.
+	 * @param string $tableName the name of the table whose primary key sequence will be reset
+	 * @param mixed $value the value for the primary key of the next new row inserted. If this is not set,
+	 * the next new row's primary key will have a value 1.
+	 * @return string the SQL statement for resetting sequence
+	 * @throws InvalidParamException if the table does not exist or there is no sequence associated with the table.
+	 */
+	public function resetSequence($tableName, $value = null)
+	{
+		$db = $this->db;
+		$table = $db->getTableSchema($tableName);
+		if ($table !== null && $table->sequenceName !== null) {
+			if ($value === null) {
+				$key = reset($table->primaryKey);
+				$tableName = $db->quoteTableName($tableName);
+				$value = $db->createCommand("SELECT MAX('$key') FROM $tableName")->queryScalar();
+			} else {
+				$value = (int)$value - 1;
+			}
+			try {
+				// it's possible sqlite_sequence does not exist
+				$db->createCommand("UPDATE sqlite_sequence SET seq='$value' WHERE name='{$table->name}'")->execute();
+			} catch (Exception $e) {
+			}
+		} elseif ($table === null) {
+			throw new InvalidParamException("Table not found: $tableName");
+		} else {
+			throw new InvalidParamException("There is not sequence associated with table '$tableName'.'");
+		}
+	}
+
+	/**
+	 * Enables or disables integrity check.
+	 * @param boolean $check whether to turn on or off the integrity check.
+	 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
+	 * @throws NotSupportedException this is not supported by SQLite
+	 */
+	public function checkIntegrity($check = true, $schema = '')
+	{
+		throw new NotSupportedException(__METHOD__ . ' is not supported by SQLite.');
+	}
+
+	/**
+	 * Builds a SQL statement for truncating a DB table.
+	 * @param string $table the table to be truncated. The name will be properly quoted by the method.
+	 * @return string the SQL statement for truncating a DB table.
+	 */
+	public function truncateTable($table)
+	{
+		return "DELETE FROM " . $this->db->quoteTableName($table);
+	}
+
+	/**
+	 * Builds a SQL statement for dropping an index.
+	 * @param string $name the name of the index to be dropped. The name will be properly quoted by the method.
+	 * @param string $table the table whose index is to be dropped. The name will be properly quoted by the method.
+	 * @return string the SQL statement for dropping an index.
+	 */
+	public function dropIndex($name, $table)
+	{
+		return 'DROP INDEX ' . $this->db->quoteTableName($name);
+	}
+
+	/**
+	 * Builds a SQL statement for dropping a DB column.
+	 * @param string $table the table whose column is to be dropped. The name will be properly quoted by the method.
+	 * @param string $column the name of the column to be dropped. The name will be properly quoted by the method.
+	 * @return string the SQL statement for dropping a DB column.
+	 * @throws NotSupportedException this is not supported by SQLite
+	 */
+	public function dropColumn($table, $column)
+	{
+		throw new NotSupportedException(__METHOD__ . ' is not supported by SQLite.');
+	}
+
+	/**
+	 * Builds a SQL statement for renaming a column.
+	 * @param string $table the table whose column is to be renamed. The name will be properly quoted by the method.
+	 * @param string $oldName the old name of the column. The name will be properly quoted by the method.
+	 * @param string $newName the new name of the column. The name will be properly quoted by the method.
+	 * @return string the SQL statement for renaming a DB column.
+	 * @throws NotSupportedException this is not supported by SQLite
+	 */
+	public function renameColumn($table, $oldName, $newName)
+	{
+		throw new NotSupportedException(__METHOD__ . ' is not supported by SQLite.');
+	}
+
+	/**
+	 * Builds a SQL statement for adding a foreign key constraint to an existing table.
+	 * The method will properly quote the table and column names.
+	 * @param string $name the name of the foreign key constraint.
+	 * @param string $table the table that the foreign key constraint will be added to.
+	 * @param string|array $columns the name of the column to that the constraint will be added on.
+	 * If there are multiple columns, separate them with commas or use an array to represent them.
+	 * @param string $refTable the table that the foreign key references to.
+	 * @param string|array $refColumns the name of the column that the foreign key references to.
+	 * If there are multiple columns, separate them with commas or use an array to represent them.
+	 * @param string $delete the ON DELETE option. Most DBMS support these options: RESTRICT, CASCADE, NO ACTION, SET DEFAULT, SET NULL
+	 * @param string $update the ON UPDATE option. Most DBMS support these options: RESTRICT, CASCADE, NO ACTION, SET DEFAULT, SET NULL
+	 * @return string the SQL statement for adding a foreign key constraint to an existing table.
+	 * @throws NotSupportedException this is not supported by SQLite
+	 */
+	public function addForeignKey($name, $table, $columns, $refTable, $refColumns, $delete = null, $update = null)
+	{
+		throw new NotSupportedException(__METHOD__ . ' is not supported by SQLite.');
+	}
+
+	/**
+	 * Builds a SQL statement for dropping a foreign key constraint.
+	 * @param string $name the name of the foreign key constraint to be dropped. The name will be properly quoted by the method.
+	 * @param string $table the table whose foreign is to be dropped. The name will be properly quoted by the method.
+	 * @return string the SQL statement for dropping a foreign key constraint.
+	 * @throws NotSupportedException this is not supported by SQLite
+	 */
+	public function dropForeignKey($name, $table)
+	{
+		throw new NotSupportedException(__METHOD__ . ' is not supported by SQLite.');
+	}
+
+	/**
+	 * Builds a SQL statement for changing the definition of a column.
+	 * @param string $table the table whose column is to be changed. The table name will be properly quoted by the method.
+	 * @param string $column the name of the column to be changed. The name will be properly quoted by the method.
+	 * @param string $type the new column type. The [[getColumnType()]] method will be invoked to convert abstract
+	 * column type (if any) into the physical one. Anything that is not recognized as abstract type will be kept
+	 * in the generated SQL. For example, 'string' will be turned into 'varchar(255)', while 'string not null'
+	 * will become 'varchar(255) not null'.
+	 * @return string the SQL statement for changing the definition of a column.
+	 * @throws NotSupportedException this is not supported by SQLite
+	 */
+	public function alterColumn($table, $column, $type)
+	{
+		throw new NotSupportedException(__METHOD__ . ' is not supported by SQLite.');
+	}
+}
diff --git a/yii/db/sqlite/Schema.php b/yii/db/sqlite/Schema.php
new file mode 100644
index 0000000..45f8392
--- /dev/null
+++ b/yii/db/sqlite/Schema.php
@@ -0,0 +1,183 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\db\sqlite;
+
+use yii\db\TableSchema;
+use yii\db\ColumnSchema;
+
+/**
+ * Schema is the class for retrieving metadata from a SQLite (2/3) database.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Schema extends \yii\db\Schema
+{
+	/**
+	 * @var array mapping from physical column types (keys) to abstract column types (values)
+	 */
+	public $typeMap = array(
+		'tinyint' => self::TYPE_SMALLINT,
+		'bit' => self::TYPE_SMALLINT,
+		'smallint' => self::TYPE_SMALLINT,
+		'mediumint' => self::TYPE_INTEGER,
+		'int' => self::TYPE_INTEGER,
+		'integer' => self::TYPE_INTEGER,
+		'bigint' => self::TYPE_BIGINT,
+		'float' => self::TYPE_FLOAT,
+		'double' => self::TYPE_FLOAT,
+		'real' => self::TYPE_FLOAT,
+		'decimal' => self::TYPE_DECIMAL,
+		'numeric' => self::TYPE_DECIMAL,
+		'tinytext' => self::TYPE_TEXT,
+		'mediumtext' => self::TYPE_TEXT,
+		'longtext' => self::TYPE_TEXT,
+		'text' => self::TYPE_TEXT,
+		'varchar' => self::TYPE_STRING,
+		'string' => self::TYPE_STRING,
+		'char' => self::TYPE_STRING,
+		'datetime' => self::TYPE_DATETIME,
+		'year' => self::TYPE_DATE,
+		'date' => self::TYPE_DATE,
+		'time' => self::TYPE_TIME,
+		'timestamp' => self::TYPE_TIMESTAMP,
+		'enum' => self::TYPE_STRING,
+	);
+
+	/**
+	 * Creates a query builder for the MySQL database.
+	 * This method may be overridden by child classes to create a DBMS-specific query builder.
+	 * @return QueryBuilder query builder instance
+	 */
+	public function createQueryBuilder()
+	{
+		return new QueryBuilder($this->db);
+	}
+
+	/**
+	 * Returns all table names in the database.
+	 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
+	 * If not empty, the returned table names will be prefixed with the schema name.
+	 * @return array all table names in the database.
+	 */
+	protected function findTableNames($schema = '')
+	{
+		$sql = "SELECT DISTINCT tbl_name FROM sqlite_master WHERE tbl_name<>'sqlite_sequence'";
+		return $this->db->createCommand($sql)->queryColumn();
+	}
+
+	/**
+	 * Loads the metadata for the specified table.
+	 * @param string $name table name
+	 * @return TableSchema driver dependent table metadata. Null if the table does not exist.
+	 */
+	protected function loadTableSchema($name)
+	{
+		$table = new TableSchema;
+		$table->name = $name;
+
+		if ($this->findColumns($table)) {
+			$this->findConstraints($table);
+			return $table;
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * Collects the table column metadata.
+	 * @param TableSchema $table the table metadata
+	 * @return boolean whether the table exists in the database
+	 */
+	protected function findColumns($table)
+	{
+		$sql = "PRAGMA table_info(" . $this->quoteSimpleTableName($table->name) . ')';
+		$columns = $this->db->createCommand($sql)->queryAll();
+		if (empty($columns)) {
+			return false;
+		}
+
+		foreach ($columns as $info) {
+			$column = $this->loadColumnSchema($info);
+			$table->columns[$column->name] = $column;
+			if ($column->isPrimaryKey) {
+				$table->primaryKey[] = $column->name;
+			}
+		}
+		if (count($table->primaryKey) === 1 && !strncasecmp($table->columns[$table->primaryKey[0]]->dbType, 'int', 3)) {
+			$table->sequenceName = '';
+			$table->columns[$table->primaryKey[0]]->autoIncrement = true;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Collects the foreign key column details for the given table.
+	 * @param TableSchema $table the table metadata
+	 */
+	protected function findConstraints($table)
+	{
+		$sql = "PRAGMA foreign_key_list(" . $this->quoteSimpleTableName($table->name) . ')';
+		$keys = $this->db->createCommand($sql)->queryAll();
+		foreach ($keys as $key) {
+			$table->foreignKeys[] = array($key['table'], $key['from'] => $key['to']);
+		}
+	}
+
+	/**
+	 * Loads the column information into a [[ColumnSchema]] object.
+	 * @param array $info column information
+	 * @return ColumnSchema the column schema object
+	 */
+	protected function loadColumnSchema($info)
+	{
+		$column = new ColumnSchema;
+		$column->name = $info['name'];
+		$column->allowNull = !$info['notnull'];
+		$column->isPrimaryKey = $info['pk'] != 0;
+
+		$column->dbType = $info['type'];
+		$column->unsigned = strpos($column->dbType, 'unsigned') !== false;
+
+		$column->type = self::TYPE_STRING;
+		if (preg_match('/^(\w+)(?:\(([^\)]+)\))?/', $column->dbType, $matches)) {
+			$type = $matches[1];
+			if (isset($this->typeMap[$type])) {
+				$column->type = $this->typeMap[$type];
+			}
+
+			if (!empty($matches[2])) {
+				$values = explode(',', $matches[2]);
+				$column->size = $column->precision = (int)$values[0];
+				if (isset($values[1])) {
+					$column->scale = (int)$values[1];
+				}
+				if ($column->size === 1 && ($type === 'tinyint' || $type === 'bit')) {
+					$column->type = 'boolean';
+				} elseif ($type === 'bit') {
+					if ($column->size > 32) {
+						$column->type = 'bigint';
+					} elseif ($column->size === 32) {
+						$column->type = 'integer';
+					}
+				}
+			}
+		}
+		$column->phpType = $this->getColumnPhpType($this->type);
+
+		$value = $info['dflt_value'];
+		if ($column->type === 'string') {
+			$column->defaultValue = trim($value, "'\"");
+		} else {
+			$column->defaultValue = $column->typecast(strcasecmp($value, 'null') ? $value : null);
+		}
+
+		return $column;
+	}
+}
diff --git a/yii/debug/Module.php b/yii/debug/Module.php
new file mode 100644
index 0000000..3421d95
--- /dev/null
+++ b/yii/debug/Module.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\debug;
+
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Module extends \yii\base\Module
+{
+	public $controllerNamespace = 'yii\debug\controllers';
+}
\ No newline at end of file
diff --git a/yii/debug/Toolbar.php b/yii/debug/Toolbar.php
new file mode 100644
index 0000000..84b55c8
--- /dev/null
+++ b/yii/debug/Toolbar.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\debug;
+
+use Yii;
+use yii\base\Widget;
+use yii\helpers\Html;
+
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Toolbar extends Widget
+{
+	public $debugAction = 'debug';
+	public $enabled = YII_DEBUG;
+
+	public function run()
+	{
+		if ($this->enabled) {
+			$id = 'yii-debug-toolbar';
+			$url = Yii::$app->getUrlManager()->createUrl($this->debugAction, array(
+				'tag' => Yii::getLogger()->tag,
+			));
+			$this->view->registerJs("yii.debug.load('$id', '$url');");
+			$this->view->registerAssetBundle('yii/debug');
+			echo Html::tag('div', '', array(
+				'id' => $id,
+				'style' => 'display: none',
+			));
+		}
+	}
+}
diff --git a/yii/debug/controllers/DefaultController.php b/yii/debug/controllers/DefaultController.php
new file mode 100644
index 0000000..ca90920
--- /dev/null
+++ b/yii/debug/controllers/DefaultController.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\debug\controllers;
+
+use yii\web\Controller;
+
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class DefaultController extends Controller
+{
+	public function actionIndex($tag)
+	{
+		echo $tag;
+	}
+}
\ No newline at end of file
diff --git a/yii/helpers/ArrayHelper.php b/yii/helpers/ArrayHelper.php
new file mode 100644
index 0000000..d58341c
--- /dev/null
+++ b/yii/helpers/ArrayHelper.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @link http://www.yiiframework.com/
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\helpers;
+
+/**
+ * ArrayHelper provides additional array functionality you can use in your
+ * application.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class ArrayHelper extends base\ArrayHelper
+{
+}
diff --git a/yii/helpers/Console.php b/yii/helpers/Console.php
new file mode 100644
index 0000000..0055107
--- /dev/null
+++ b/yii/helpers/Console.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\helpers;
+
+/**
+ * TODO adjust phpdoc
+ * Console View is the base class for console view components
+ *
+ * A console view provides functionality to create rich console application by allowing to format output
+ * by adding color and font style to it.
+ *
+ * @author Carsten Brandt <mail@cebe.cc>
+ * @since 2.0
+ */
+class Console extends base\Console
+{
+}
diff --git a/yii/helpers/FileHelper.php b/yii/helpers/FileHelper.php
new file mode 100644
index 0000000..04ce4e1
--- /dev/null
+++ b/yii/helpers/FileHelper.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Filesystem helper class file.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\helpers;
+
+/**
+ * Filesystem helper
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Alex Makarov <sam@rmcreative.ru>
+ * @since 2.0
+ */
+class FileHelper extends base\FileHelper
+{
+}
diff --git a/yii/helpers/Html.php b/yii/helpers/Html.php
new file mode 100644
index 0000000..b3a0743
--- /dev/null
+++ b/yii/helpers/Html.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\helpers;
+
+/**
+ * Html provides a set of static methods for generating commonly used HTML tags.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Html extends base\Html
+{
+}
diff --git a/yii/helpers/Json.php b/yii/helpers/Json.php
new file mode 100644
index 0000000..5e77c3f
--- /dev/null
+++ b/yii/helpers/Json.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\helpers;
+
+/**
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Json extends base\Json
+{
+	
+}
diff --git a/yii/helpers/Markdown.php b/yii/helpers/Markdown.php
new file mode 100644
index 0000000..3f6c98e
--- /dev/null
+++ b/yii/helpers/Markdown.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @link http://www.yiiframework.com/
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\helpers;
+
+/**
+ * Markdown provides an ability to transform markdown into HTML.
+ *
+ * Basic usage is the following:
+ *
+ * ```php
+ * $myHtml = Markdown::process($myText);
+ * ```
+ *
+ * If you want to configure the parser:
+ *
+ * ```php
+ * $myHtml = Markdown::process($myText, array(
+ *     'fn_id_prefix' => 'footnote_',
+ * ));
+ * ```
+ *
+ * For more details please refer to [PHP Markdown library documentation](http://michelf.ca/projects/php-markdown/).
+ * @author Alexander Makarov <sam@rmcreative.ru>
+ * @since 2.0
+ */
+class Markdown extends base\Markdown
+{
+}
diff --git a/yii/helpers/Purifier.php b/yii/helpers/Purifier.php
new file mode 100644
index 0000000..b659531
--- /dev/null
+++ b/yii/helpers/Purifier.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @link http://www.yiiframework.com/
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\helpers;
+
+/**
+ * Purifier provides an ability to clean up HTML from any harmful code.
+ *
+ * Basic usage is the following:
+ *
+ * ```php
+ * $my_html = Purifier::process($my_text);
+ * ```
+ *
+ * If you want to configure it:
+ *
+ * ```php
+ * $my_html = Purifier::process($my_text, array(
+ *     'Attr.EnableID' => true,
+ * ));
+ * ```
+ *
+ * For more details please refer to HTMLPurifier documentation](http://htmlpurifier.org/).
+ *
+ * @author Alexander Makarov <sam@rmcreative.ru>
+ * @since 2.0
+ */
+class Purifier extends base\Purifier
+{
+}
diff --git a/yii/helpers/SecurityHelper.php b/yii/helpers/SecurityHelper.php
new file mode 100644
index 0000000..d16e7e6
--- /dev/null
+++ b/yii/helpers/SecurityHelper.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\helpers;
+
+/**
+ * SecurityHelper provides a set of methods to handle common security-related tasks.
+ *
+ * In particular, SecurityHelper supports the following features:
+ *
+ * - Encryption/decryption: [[encrypt()]] and [[decrypt()]]
+ * - Data tampering prevention: [[hashData()]] and [[validateData()]]
+ * - Password validation: [[generatePasswordHash()]] and [[validatePassword()]]
+ *
+ * Additionally, SecurityHelper provides [[getSecretKey()]] to support generating
+ * named secret keys. These secret keys, once generated, will be stored in a file
+ * and made available in future requests.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Tom Worster <fsb@thefsb.org>
+ * @since 2.0
+ */
+class SecurityHelper extends base\SecurityHelper
+{
+}
diff --git a/yii/helpers/StringHelper.php b/yii/helpers/StringHelper.php
new file mode 100644
index 0000000..22b881a
--- /dev/null
+++ b/yii/helpers/StringHelper.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\helpers;
+
+/**
+ * StringHelper
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Alex Makarov <sam@rmcreative.ru>
+ * @since 2.0
+ */
+class StringHelper extends base\StringHelper
+{
+}
diff --git a/yii/helpers/VarDumper.php b/yii/helpers/VarDumper.php
new file mode 100644
index 0000000..59a1718
--- /dev/null
+++ b/yii/helpers/VarDumper.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\helpers;
+
+/**
+ * VarDumper is intended to replace the buggy PHP function var_dump and print_r.
+ * It can correctly identify the recursively referenced objects in a complex
+ * object structure. It also has a recursive depth control to avoid indefinite
+ * recursive display of some peculiar variables.
+ *
+ * VarDumper can be used as follows,
+ *
+ * ~~~
+ * VarDumper::dump($var);
+ * ~~~
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class VarDumper extends base\VarDumper
+{
+}
diff --git a/yii/helpers/base/ArrayHelper.php b/yii/helpers/base/ArrayHelper.php
new file mode 100644
index 0000000..672c7b9
--- /dev/null
+++ b/yii/helpers/base/ArrayHelper.php
@@ -0,0 +1,352 @@
+<?php
+/**
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @link http://www.yiiframework.com/
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\helpers\base;
+
+use Yii;
+use yii\base\InvalidParamException;
+
+/**
+ * ArrayHelper provides additional array functionality you can use in your
+ * application.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class ArrayHelper
+{
+	/**
+	 * Merges two or more arrays into one recursively.
+	 * If each array has an element with the same string key value, the latter
+	 * will overwrite the former (different from array_merge_recursive).
+	 * Recursive merging will be conducted if both arrays have an element of array
+	 * type and are having the same key.
+	 * For integer-keyed elements, the elements from the latter array will
+	 * be appended to the former array.
+	 * @param array $a array to be merged to
+	 * @param array $b array to be merged from. You can specify additional
+	 * arrays via third argument, fourth argument etc.
+	 * @return array the merged array (the original arrays are not changed.)
+	 */
+	public static function merge($a, $b)
+	{
+		$args = func_get_args();
+		$res = array_shift($args);
+		while (!empty($args)) {
+			$next = array_shift($args);
+			foreach ($next as $k => $v) {
+				if (is_integer($k)) {
+					isset($res[$k]) ? $res[] = $v : $res[$k] = $v;
+				} elseif (is_array($v) && isset($res[$k]) && is_array($res[$k])) {
+					$res[$k] = self::merge($res[$k], $v);
+				} else {
+					$res[$k] = $v;
+				}
+			}
+		}
+		return $res;
+	}
+
+	/**
+	 * Retrieves the value of an array element or object property with the given key or property name.
+	 * If the key does not exist in the array, the default value will be returned instead.
+	 *
+	 * Below are some usage examples,
+	 *
+	 * ~~~
+	 * // working with array
+	 * $username = \yii\helpers\ArrayHelper::getValue($_POST, 'username');
+	 * // working with object
+	 * $username = \yii\helpers\ArrayHelper::getValue($user, 'username');
+	 * // working with anonymous function
+	 * $fullName = \yii\helpers\ArrayHelper::getValue($user, function($user, $defaultValue) {
+	 *     return $user->firstName . ' ' . $user->lastName;
+	 * });
+	 * ~~~
+	 *
+	 * @param array|object $array array or object to extract value from
+	 * @param string|\Closure $key key name of the array element, or property name of the object,
+	 * or an anonymous function returning the value. The anonymous function signature should be:
+	 * `function($array, $defaultValue)`.
+	 * @param mixed $default the default value to be returned if the specified key does not exist
+	 * @return mixed the value of the
+	 */
+	public static function getValue($array, $key, $default = null)
+	{
+		if ($key instanceof \Closure) {
+			return $key($array, $default);
+		} elseif (is_array($array)) {
+			return isset($array[$key]) || array_key_exists($key, $array) ? $array[$key] : $default;
+		} else {
+			return $array->$key;
+		}
+	}
+
+	/**
+	 * Indexes an array according to a specified key.
+	 * The input array should be multidimensional or an array of objects.
+	 *
+	 * The key can be a key name of the sub-array, a property name of object, or an anonymous
+	 * function which returns the key value given an array element.
+	 *
+	 * If a key value is null, the corresponding array element will be discarded and not put in the result.
+	 *
+	 * For example,
+	 *
+	 * ~~~
+	 * $array = array(
+	 *     array('id' => '123', 'data' => 'abc'),
+	 *     array('id' => '345', 'data' => 'def'),
+	 * );
+	 * $result = ArrayHelper::index($array, 'id');
+	 * // the result is:
+	 * // array(
+	 * //     '123' => array('id' => '123', 'data' => 'abc'),
+	 * //     '345' => array('id' => '345', 'data' => 'def'),
+	 * // )
+	 *
+	 * // using anonymous function
+	 * $result = ArrayHelper::index($array, function(element) {
+	 *     return $element['id'];
+	 * });
+	 * ~~~
+	 *
+	 * @param array $array the array that needs to be indexed
+	 * @param string|\Closure $key the column name or anonymous function whose result will be used to index the array
+	 * @return array the indexed array
+	 */
+	public static function index($array, $key)
+	{
+		$result = array();
+		foreach ($array as $element) {
+			$value = static::getValue($element, $key);
+			$result[$value] = $element;
+		}
+		return $result;
+	}
+
+	/**
+	 * Returns the values of a specified column in an array.
+	 * The input array should be multidimensional or an array of objects.
+	 *
+	 * For example,
+	 *
+	 * ~~~
+	 * $array = array(
+	 *     array('id' => '123', 'data' => 'abc'),
+	 *     array('id' => '345', 'data' => 'def'),
+	 * );
+	 * $result = ArrayHelper::getColumn($array, 'id');
+	 * // the result is: array( '123', '345')
+	 *
+	 * // using anonymous function
+	 * $result = ArrayHelper::getColumn($array, function(element) {
+	 *     return $element['id'];
+	 * });
+	 * ~~~
+	 *
+	 * @param array $array
+	 * @param string|\Closure $name
+	 * @param boolean $keepKeys whether to maintain the array keys. If false, the resulting array
+	 * will be re-indexed with integers.
+	 * @return array the list of column values
+	 */
+	public static function getColumn($array, $name, $keepKeys = true)
+	{
+		$result = array();
+		if ($keepKeys) {
+			foreach ($array as $k => $element) {
+				$result[$k] = static::getValue($element, $name);
+			}
+		} else {
+			foreach ($array as $element) {
+				$result[] = static::getValue($element, $name);
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Builds a map (key-value pairs) from a multidimensional array or an array of objects.
+	 * The `$from` and `$to` parameters specify the key names or property names to set up the map.
+	 * Optionally, one can further group the map according to a grouping field `$group`.
+	 *
+	 * For example,
+	 *
+	 * ~~~
+	 * $array = array(
+	 *     array('id' => '123', 'name' => 'aaa', 'class' => 'x'),
+	 *     array('id' => '124', 'name' => 'bbb', 'class' => 'x'),
+	 *     array('id' => '345', 'name' => 'ccc', 'class' => 'y'),
+	 * );
+	 *
+	 * $result = ArrayHelper::map($array, 'id', 'name');
+	 * // the result is:
+	 * // array(
+	 * //     '123' => 'aaa',
+	 * //     '124' => 'bbb',
+	 * //     '345' => 'ccc',
+	 * // )
+	 *
+	 * $result = ArrayHelper::map($array, 'id', 'name', 'class');
+	 * // the result is:
+	 * // array(
+	 * //     'x' => array(
+	 * //         '123' => 'aaa',
+	 * //         '124' => 'bbb',
+	 * //     ),
+	 * //     'y' => array(
+	 * //         '345' => 'ccc',
+	 * //     ),
+	 * // )
+	 * ~~~
+	 *
+	 * @param array $array
+	 * @param string|\Closure $from
+	 * @param string|\Closure $to
+	 * @param string|\Closure $group
+	 * @return array
+	 */
+	public static function map($array, $from, $to, $group = null)
+	{
+		$result = array();
+		foreach ($array as $element) {
+			$key = static::getValue($element, $from);
+			$value = static::getValue($element, $to);
+			if ($group !== null) {
+				$result[static::getValue($element, $group)][$key] = $value;
+			} else {
+				$result[$key] = $value;
+			}
+		}
+		return $result;
+	}
+
+	/**
+	 * Sorts an array of objects or arrays (with the same structure) by one or several keys.
+	 * @param array $array the array to be sorted. The array will be modified after calling this method.
+	 * @param string|\Closure|array $key the key(s) to be sorted by. This refers to a key name of the sub-array
+	 * elements, a property name of the objects, or an anonymous function returning the values for comparison
+	 * purpose. The anonymous function signature should be: `function($item)`.
+	 * To sort by multiple keys, provide an array of keys here.
+	 * @param boolean|array $ascending whether to sort in ascending or descending order. When
+	 * sorting by multiple keys with different ascending orders, use an array of ascending flags.
+	 * @param integer|array $sortFlag the PHP sort flag. Valid values include
+	 * `SORT_REGULAR`, `SORT_NUMERIC`, `SORT_STRING` and `SORT_LOCALE_STRING`.
+	 * Please refer to [PHP manual](http://php.net/manual/en/function.sort.php)
+	 * for more details. When sorting by multiple keys with different sort flags, use an array of sort flags.
+	 * @param boolean|array $caseSensitive whether to sort string in case-sensitive manner. This parameter
+	 * is used only when `$sortFlag` is `SORT_STRING`.
+	 * When sorting by multiple keys with different case sensitivities, use an array of boolean values.
+	 * @throws InvalidParamException if the $ascending or $sortFlag parameters do not have
+	 * correct number of elements as that of $key.
+	 */
+	public static function multisort(&$array, $key, $ascending = true, $sortFlag = SORT_REGULAR, $caseSensitive = true)
+	{
+		$keys = is_array($key) ? $key : array($key);
+		if (empty($keys) || empty($array)) {
+			return;
+		}
+		$n = count($keys);
+		if (is_scalar($ascending)) {
+			$ascending = array_fill(0, $n, $ascending);
+		} elseif (count($ascending) !== $n) {
+			throw new InvalidParamException('The length of $ascending parameter must be the same as that of $keys.');
+		}
+		if (is_scalar($sortFlag)) {
+			$sortFlag = array_fill(0, $n, $sortFlag);
+		} elseif (count($sortFlag) !== $n) {
+			throw new InvalidParamException('The length of $sortFlag parameter must be the same as that of $keys.');
+		}
+		if (is_scalar($caseSensitive)) {
+			$caseSensitive = array_fill(0, $n, $caseSensitive);
+		} elseif (count($caseSensitive) !== $n) {
+			throw new InvalidParamException('The length of $caseSensitive parameter must be the same as that of $keys.');
+		}
+		$args = array();
+		foreach ($keys as $i => $key) {
+			$flag = $sortFlag[$i];
+			$cs = $caseSensitive[$i];
+			if (!$cs && ($flag === SORT_STRING)) {
+				if (defined('SORT_FLAG_CASE')) {
+					$flag = $flag | SORT_FLAG_CASE;
+					$args[] = static::getColumn($array, $key);
+				} else {
+					$column = array();
+					foreach (static::getColumn($array, $key) as $k => $value) {
+						$column[$k] = mb_strtolower($value);
+					}
+					$args[] = $column;
+				}
+			} else {
+				$args[] =  static::getColumn($array, $key);
+			}
+			$args[] = $ascending[$i] ? SORT_ASC : SORT_DESC;
+			$args[] = $flag;
+		}
+		$args[] = &$array;
+		call_user_func_array('array_multisort', $args);
+	}
+
+	/**
+	 * Encodes special characters in an array of strings into HTML entities.
+	 * Both the array keys and values will be encoded.
+	 * If a value is an array, this method will also encode it recursively.
+	 * @param array $data data to be encoded
+	 * @param boolean $valuesOnly whether to encode array values only. If false,
+	 * both the array keys and array values will be encoded.
+	 * @param string $charset the charset that the data is using. If not set,
+	 * [[\yii\base\Application::charset]] will be used.
+	 * @return array the encoded data
+	 * @see http://www.php.net/manual/en/function.htmlspecialchars.php
+	 */
+	public static function htmlEncode($data, $valuesOnly = true, $charset = null)
+	{
+		if ($charset === null) {
+			$charset = Yii::$app->charset;
+		}
+		$d = array();
+		foreach ($data as $key => $value) {
+			if (!$valuesOnly && is_string($key)) {
+				$key = htmlspecialchars($key, ENT_QUOTES, $charset);
+			}
+			if (is_string($value)) {
+				$d[$key] = htmlspecialchars($value, ENT_QUOTES, $charset);
+			} elseif (is_array($value)) {
+				$d[$key] = static::htmlEncode($value, $charset);
+			}
+		}
+		return $d;
+	}
+
+	/**
+	 * Decodes HTML entities into the corresponding characters in an array of strings.
+	 * Both the array keys and values will be decoded.
+	 * If a value is an array, this method will also decode it recursively.
+	 * @param array $data data to be decoded
+	 * @param boolean $valuesOnly whether to decode array values only. If false,
+	 * both the array keys and array values will be decoded.
+	 * @return array the decoded data
+	 * @see http://www.php.net/manual/en/function.htmlspecialchars-decode.php
+	 */
+	public static function htmlDecode($data, $valuesOnly = true)
+	{
+		$d = array();
+		foreach ($data as $key => $value) {
+			if (!$valuesOnly && is_string($key)) {
+				$key = htmlspecialchars_decode($key, ENT_QUOTES);
+			}
+			if (is_string($value)) {
+				$d[$key] = htmlspecialchars_decode($value, ENT_QUOTES);
+			} elseif (is_array($value)) {
+				$d[$key] = static::htmlDecode($value);
+			}
+		}
+		return $d;
+	}
+}
diff --git a/yii/helpers/base/Console.php b/yii/helpers/base/Console.php
new file mode 100644
index 0000000..b611919
--- /dev/null
+++ b/yii/helpers/base/Console.php
@@ -0,0 +1,781 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\helpers\base;
+
+/**
+ * TODO adjust phpdoc
+ * TODO test this on all kinds of terminals, especially windows (check out lib ncurses)
+ *
+ * Console View is the base class for console view components
+ *
+ * A console view provides functionality to create rich console application by allowing to format output
+ * by adding color and font style to it.
+ *
+ * The following constants are available for formatting:
+ *
+ * TODO document constants
+ *
+ *
+ *
+ * @author Carsten Brandt <mail@cebe.cc>
+ * @since 2.0
+ */
+class Console
+{
+	const FG_BLACK  = 30;
+	const FG_RED    = 31;
+	const FG_GREEN  = 32;
+	const FG_YELLOW = 33;
+	const FG_BLUE   = 34;
+	const FG_PURPLE = 35;
+	const FG_CYAN   = 36;
+	const FG_GREY   = 37;
+
+	const BG_BLACK  = 40;
+	const BG_RED    = 41;
+	const BG_GREEN  = 42;
+	const BG_YELLOW = 43;
+	const BG_BLUE   = 44;
+	const BG_PURPLE = 45;
+	const BG_CYAN   = 46;
+	const BG_GREY   = 47;
+
+	const NORMAL      = 0;
+	const BOLD        = 1;
+	const ITALIC      = 3;
+	const UNDERLINE   = 4;
+	const BLINK       = 5;
+	const NEGATIVE    = 7;
+	const CONCEALED   = 8;
+	const CROSSED_OUT = 9;
+	const FRAMED      = 51;
+	const ENCIRCLED   = 52;
+	const OVERLINED   = 53;
+
+	/**
+	 * Moves the terminal cursor up by sending ANSI control code CUU to the terminal.
+	 * If the cursor is already at the edge of the screen, this has no effect.
+	 * @param integer $rows number of rows the cursor should be moved up
+	 */
+	public static function moveCursorUp($rows = 1)
+	{
+		echo "\033[" . (int)$rows . 'A';
+	}
+
+	/**
+	 * Moves the terminal cursor down by sending ANSI control code CUD to the terminal.
+	 * If the cursor is already at the edge of the screen, this has no effect.
+	 * @param integer $rows number of rows the cursor should be moved down
+	 */
+	public static function moveCursorDown($rows = 1)
+	{
+		echo "\033[" . (int)$rows . 'B';
+	}
+
+	/**
+	 * Moves the terminal cursor forward by sending ANSI control code CUF to the terminal.
+	 * If the cursor is already at the edge of the screen, this has no effect.
+	 * @param integer $steps number of steps the cursor should be moved forward
+	 */
+	public static function moveCursorForward($steps = 1)
+	{
+		echo "\033[" . (int)$steps . 'C';
+	}
+
+	/**
+	 * Moves the terminal cursor backward by sending ANSI control code CUB to the terminal.
+	 * If the cursor is already at the edge of the screen, this has no effect.
+	 * @param integer $steps number of steps the cursor should be moved backward
+	 */
+	public static function moveCursorBackward($steps = 1)
+	{
+		echo "\033[" . (int)$steps . 'D';
+	}
+
+	/**
+	 * Moves the terminal cursor to the beginning of the next line by sending ANSI control code CNL to the terminal.
+	 * @param integer $lines number of lines the cursor should be moved down
+	 */
+	public static function moveCursorNextLine($lines = 1)
+	{
+		echo "\033[" . (int)$lines . 'E';
+	}
+
+	/**
+	 * Moves the terminal cursor to the beginning of the previous line by sending ANSI control code CPL to the terminal.
+	 * @param integer $lines number of lines the cursor should be moved up
+	 */
+	public static function moveCursorPrevLine($lines = 1)
+	{
+		echo "\033[" . (int)$lines . 'F';
+	}
+
+	/**
+	 * Moves the cursor to an absolute position given as column and row by sending ANSI control code CUP or CHA to the terminal.
+	 * @param integer $column 1-based column number, 1 is the left edge of the screen.
+	 * @param integer|null $row 1-based row number, 1 is the top edge of the screen. if not set, will move cursor only in current line.
+	 */
+	public static function moveCursorTo($column, $row = null)
+	{
+		if ($row === null) {
+			echo "\033[" . (int)$column . 'G';
+		} else {
+			echo "\033[" . (int)$row . ';' . (int)$column . 'H';
+		}
+	}
+
+	/**
+	 * Scrolls whole page up by sending ANSI control code SU to the terminal.
+	 * New lines are added at the bottom. This is not supported by ANSI.SYS used in windows.
+	 * @param int $lines number of lines to scroll up
+	 */
+	public static function scrollUp($lines = 1)
+	{
+		echo "\033[" . (int)$lines . "S";
+	}
+
+	/**
+	 * Scrolls whole page down by sending ANSI control code SD to the terminal.
+	 * New lines are added at the top. This is not supported by ANSI.SYS used in windows.
+	 * @param int $lines number of lines to scroll down
+	 */
+	public static function scrollDown($lines = 1)
+	{
+		echo "\033[" . (int)$lines . "T";
+	}
+
+	/**
+	 * Saves the current cursor position by sending ANSI control code SCP to the terminal.
+	 * Position can then be restored with {@link restoreCursorPosition}.
+	 */
+	public static function saveCursorPosition()
+	{
+		echo "\033[s";
+	}
+
+	/**
+	 * Restores the cursor position saved with {@link saveCursorPosition} by sending ANSI control code RCP to the terminal.
+	 */
+	public static function restoreCursorPosition()
+	{
+		echo "\033[u";
+	}
+
+	/**
+	 * Hides the cursor by sending ANSI DECTCEM code ?25l to the terminal.
+	 * Use {@link showCursor} to bring it back.
+	 * Do not forget to show cursor when your application exits. Cursor might stay hidden in terminal after exit.
+	 */
+	public static function hideCursor()
+	{
+		echo "\033[?25l";
+	}
+
+	/**
+	 * Will show a cursor again when it has been hidden by {@link hideCursor}  by sending ANSI DECTCEM code ?25h to the terminal.
+	 */
+	public static function showCursor()
+	{
+		echo "\033[?25h";
+	}
+
+	/**
+	 * Clears entire screen content by sending ANSI control code ED with argument 2 to the terminal.
+	 * Cursor position will not be changed.
+	 * **Note:** ANSI.SYS implementation used in windows will reset cursor position to upper left corner of the screen.
+	 */
+	public static function clearScreen()
+	{
+		echo "\033[2J";
+	}
+
+	/**
+	 * Clears text from cursor to the beginning of the screen by sending ANSI control code ED with argument 1 to the terminal.
+	 * Cursor position will not be changed.
+	 */
+	public static function clearScreenBeforeCursor()
+	{
+		echo "\033[1J";
+	}
+
+	/**
+	 * Clears text from cursor to the end of the screen by sending ANSI control code ED with argument 0 to the terminal.
+	 * Cursor position will not be changed.
+	 */
+	public static function clearScreenAfterCursor()
+	{
+		echo "\033[0J";
+	}
+
+	/**
+	 * Clears the line, the cursor is currently on by sending ANSI control code EL with argument 2 to the terminal.
+	 * Cursor position will not be changed.
+	 */
+	public static function clearLine()
+	{
+		echo "\033[2K";
+	}
+
+	/**
+	 * Clears text from cursor position to the beginning of the line by sending ANSI control code EL with argument 1 to the terminal.
+	 * Cursor position will not be changed.
+	 */
+	public static function clearLineBeforeCursor()
+	{
+		echo "\033[1K";
+	}
+
+	/**
+	 * Clears text from cursor position to the end of the line by sending ANSI control code EL with argument 0 to the terminal.
+	 * Cursor position will not be changed.
+	 */
+	public static function clearLineAfterCursor()
+	{
+		echo "\033[0K";
+	}
+
+	/**
+	 * Sets the ANSI format for any text that is printed afterwards.
+	 *
+	 * You can pass any of the FG_*, BG_* and TEXT_* constants and also [[xterm256ColorFg]] and [[xterm256ColorBg]].
+	 * TODO: documentation
+	 */
+	public static function ansiFormatBegin()
+	{
+		echo "\033[" . implode(';', func_get_args()) . 'm';
+	}
+
+	/**
+	 * Resets any ANSI format set by previous method [[ansiFormatBegin()]]
+	 * Any output after this is will have default text style.
+	 */
+	public static function ansiFormatReset()
+	{
+		echo "\033[0m";
+	}
+
+	/**
+	 * Returns the ANSI format code.
+	 *
+	 * You can pass any of the FG_*, BG_* and TEXT_* constants and also [[xterm256ColorFg]] and [[xterm256ColorBg]].
+	 * TODO: documentation
+	 */
+	public static function ansiFormatCode($format)
+	{
+		return "\033[" . implode(';', $format) . 'm';
+	}
+
+	/**
+	 * Will return a string formatted with the given ANSI style
+	 *
+	 * @param string $string the string to be formatted
+	 * @param array $format array containing formatting values.
+	 * You can pass any of the FG_*, BG_* and TEXT_* constants and also [[xterm256ColorFg]] and [[xterm256ColorBg]].
+	 * @return string
+	 */
+	public static function ansiFormat($string, $format=array())
+	{
+		$code = implode(';', $format);
+		return "\033[0m" . ($code !== '' ? "\033[" . $code . "m" : '') . $string . "\033[0m";
+	}
+
+	//const COLOR_XTERM256 = 38;// http://en.wikipedia.org/wiki/Talk:ANSI_escape_code#xterm-256colors
+	public static function xterm256ColorFg($i) // TODO naming!
+	{
+		return '38;5;' . $i;
+	}
+
+	public static function xterm256ColorBg($i) // TODO naming!
+	{
+		return '48;5;' . $i;
+	}
+
+	/**
+	 * Strips ANSI control codes from a string
+	 *
+	 * @param string $string String to strip
+	 * @return string
+	 */
+	public static function stripAnsiFormat($string)
+	{
+		return preg_replace('/\033\[[\d;]+m/', '', $string); // TODO currently only strips color
+	}
+
+	// TODO refactor and review
+	public static function ansiToHtml($string)
+	{
+		$tags = 0;
+		return preg_replace_callback(
+			'/\033\[[\d;]+m/',
+			function ($ansi) use (&$tags) {
+				$styleA = array();
+				foreach (explode(';', $ansi) as $controlCode) {
+					switch ($controlCode) {
+						case self::FG_BLACK:
+							$style = array('color' => '#000000');
+							break;
+						case self::FG_BLUE:
+							$style = array('color' => '#000078');
+							break;
+						case self::FG_CYAN:
+							$style = array('color' => '#007878');
+							break;
+						case self::FG_GREEN:
+							$style = array('color' => '#007800');
+							break;
+						case self::FG_GREY:
+							$style = array('color' => '#787878');
+							break;
+						case self::FG_PURPLE:
+							$style = array('color' => '#780078');
+							break;
+						case self::FG_RED:
+							$style = array('color' => '#780000');
+							break;
+						case self::FG_YELLOW:
+							$style = array('color' => '#787800');
+							break;
+						case self::BG_BLACK:
+							$style = array('background-color' => '#000000');
+							break;
+						case self::BG_BLUE:
+							$style = array('background-color' => '#000078');
+							break;
+						case self::BG_CYAN:
+							$style = array('background-color' => '#007878');
+							break;
+						case self::BG_GREEN:
+							$style = array('background-color' => '#007800');
+							break;
+						case self::BG_GREY:
+							$style = array('background-color' => '#787878');
+							break;
+						case self::BG_PURPLE:
+							$style = array('background-color' => '#780078');
+							break;
+						case self::BG_RED:
+							$style = array('background-color' => '#780000');
+							break;
+						case self::BG_YELLOW:
+							$style = array('background-color' => '#787800');
+							break;
+						case self::BOLD:
+							$style = array('font-weight' => 'bold');
+							break;
+						case self::ITALIC:
+							$style = array('font-style' => 'italic');
+							break;
+						case self::UNDERLINE:
+							$style = array('text-decoration' => array('underline'));
+							break;
+						case self::OVERLINED:
+							$style = array('text-decoration' => array('overline'));
+							break;
+						case self::CROSSED_OUT:
+							$style = array('text-decoration' => array('line-through'));
+							break;
+						case self::BLINK:
+							$style = array('text-decoration' => array('blink'));
+							break;
+						case self::NEGATIVE: // ???
+						case self::CONCEALED:
+						case self::ENCIRCLED:
+						case self::FRAMED:
+							// TODO allow resetting codes
+							break;
+						case 0: // ansi reset
+							$return = '';
+							for ($n = $tags; $tags > 0; $tags--) {
+								$return .= '</span>';
+							}
+							return $return;
+					}
+
+					$styleA = ArrayHelper::merge($styleA, $style);
+				}
+				$styleString[] = array();
+				foreach ($styleA as $name => $content) {
+					if ($name === 'text-decoration') {
+						$content = implode(' ', $content);
+					}
+					$styleString[] = $name . ':' . $content;
+				}
+				$tags++;
+				return '<span' . (!empty($styleString) ? 'style="' . implode(';', $styleString) : '') . '>';
+			},
+			$string
+		);
+	}
+
+	public function markdownToAnsi()
+	{
+		// TODO implement
+	}
+
+	/**
+	 * TODO syntax copied from https://github.com/pear/Console_Color2/blob/master/Console/Color2.php
+	 *
+	 * Converts colorcodes in the format %y (for yellow) into ansi-control
+	 * codes. The conversion table is: ('bold' meaning 'light' on some
+	 * terminals). It's almost the same conversion table irssi uses.
+	 * <pre>
+	 *                  text      text            background
+	 *      ------------------------------------------------
+	 *      %k %K %0    black     dark grey       black
+	 *      %r %R %1    red       bold red        red
+	 *      %g %G %2    green     bold green      green
+	 *      %y %Y %3    yellow    bold yellow     yellow
+	 *      %b %B %4    blue      bold blue       blue
+	 *      %m %M %5    magenta   bold magenta    magenta
+	 *      %p %P       magenta (think: purple)
+	 *      %c %C %6    cyan      bold cyan       cyan
+	 *      %w %W %7    white     bold white      white
+	 *
+	 *      %F     Blinking, Flashing
+	 *      %U     Underline
+	 *      %8     Reverse
+	 *      %_,%9  Bold
+	 *
+	 *      %n     Resets the color
+	 *      %%     A single %
+	 * </pre>
+	 * First param is the string to convert, second is an optional flag if
+	 * colors should be used. It defaults to true, if set to false, the
+	 * colorcodes will just be removed (And %% will be transformed into %)
+	 *
+	 * @param string $string  String to convert
+	 * @param bool   $colored Should the string be colored?
+	 *
+	 * @return string
+	 */
+	public static function renderColoredString($string, $colored = true)
+	{
+		static $conversions = array(
+			'%y' => array(self::FG_YELLOW),
+			'%g' => array(self::FG_GREEN),
+			'%b' => array(self::FG_BLUE),
+			'%r' => array(self::FG_RED),
+			'%p' => array(self::FG_PURPLE),
+			'%m' => array(self::FG_PURPLE),
+			'%c' => array(self::FG_CYAN),
+			'%w' => array(self::FG_GREY),
+			'%k' => array(self::FG_BLACK),
+			'%n' => array(0), // reset
+			'%Y' => array(self::FG_YELLOW, self::BOLD),
+			'%G' => array(self::FG_GREEN, self::BOLD),
+			'%B' => array(self::FG_BLUE, self::BOLD),
+			'%R' => array(self::FG_RED, self::BOLD),
+			'%P' => array(self::FG_PURPLE, self::BOLD),
+			'%M' => array(self::FG_PURPLE, self::BOLD),
+			'%C' => array(self::FG_CYAN, self::BOLD),
+			'%W' => array(self::FG_GREY, self::BOLD),
+			'%K' => array(self::FG_BLACK, self::BOLD),
+			'%N' => array(0, self::BOLD),
+			'%3' => array(self::BG_YELLOW),
+			'%2' => array(self::BG_GREEN),
+			'%4' => array(self::BG_BLUE),
+			'%1' => array(self::BG_RED),
+			'%5' => array(self::BG_PURPLE),
+			'%6' => array(self::BG_PURPLE),
+			'%7' => array(self::BG_CYAN),
+			'%0' => array(self::BG_GREY),
+			'%F' => array(self::BLINK),
+			'%U' => array(self::UNDERLINE),
+			'%8' => array(self::NEGATIVE),
+			'%9' => array(self::BOLD),
+			'%_' => array(self::BOLD)
+		);
+
+		if ($colored) {
+			$string = str_replace('%%', '% ', $string);
+			foreach ($conversions as $key => $value) {
+				$string = str_replace(
+					$key,
+					static::ansiFormatCode($value),
+					$string
+				);
+			}
+			$string = str_replace('% ', '%', $string);
+		} else {
+			$string = preg_replace('/%((%)|.)/', '$2', $string);
+		}
+		return $string;
+	}
+
+	/**
+	* Escapes % so they don't get interpreted as color codes
+	*
+	* @param string $string String to escape
+	*
+	* @access public
+	* @return string
+	*/
+	public static function escape($string)
+	{
+		return str_replace('%', '%%', $string);
+	}
+
+	/**
+	 * Returns true if the stream supports colorization. ANSI colors is disabled if not supported by the stream.
+	 *
+	 * - windows without asicon
+	 * - not tty consoles
+	 *
+	 * @param mixed $stream
+	 * @return bool true if the stream supports ANSI colors, otherwise false.
+	 */
+	public static function streamSupportsAnsiColors($stream)
+	{
+		return DIRECTORY_SEPARATOR == '\\'
+			? null !== getenv('ANSICON')
+			: function_exists('posix_isatty') && @posix_isatty($stream);
+	}
+
+	/**
+	 * Returns true if the console is running on windows
+	 * @return bool
+	 */
+	public static function isRunningOnWindows()
+	{
+		return strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
+	}
+
+	/**
+	 * Usage: list($w, $h) = ConsoleHelper::getScreenSize();
+	 *
+	 * @return array
+	 */
+	public static function getScreenSize()
+	{
+		// TODO implement
+		return array(150, 50);
+	}
+
+	/**
+	 * Gets input from STDIN and returns a string right-trimmed for EOLs.
+	 *
+	 * @param bool $raw If set to true, returns the raw string without trimming
+	 * @return string
+	 */
+	public static function stdin($raw = false)
+	{
+		return $raw ? fgets(STDIN) : rtrim(fgets(STDIN), PHP_EOL);
+	}
+
+	/**
+	 * Prints a string to STDOUT.
+	 *
+	 * @param string $string the string to print
+	 * @return int|boolean Number of bytes printed or false on error
+	 */
+	public static function stdout($string)
+	{
+		return fwrite(STDOUT, $string);
+	}
+
+	/**
+	 * Prints a string to STDERR.
+	 *
+	 * @param string $string the string to print
+	 * @return int|boolean Number of bytes printed or false on error
+	 */
+	public static function stderr($string)
+	{
+		return fwrite(STDERR, $string);
+	}
+
+	/**
+	 * Asks the user for input. Ends when the user types a carriage return (PHP_EOL). Optionally, It also provides a
+	 * prompt.
+	 *
+	 * @param string $prompt the prompt (optional)
+	 * @return string the user's input
+	 */
+	public static function input($prompt = null)
+	{
+		if (isset($prompt)) {
+			static::stdout($prompt);
+		}
+		return static::stdin();
+	}
+
+	/**
+	 * Prints text to STDOUT appended with a carriage return (PHP_EOL).
+	 *
+	 * @param string $text
+	 * @param bool $raw
+	 *
+	 * @return mixed Number of bytes printed or bool false on error
+	 */
+	public static function output($text = null)
+	{
+		return static::stdout($text . PHP_EOL);
+	}
+
+	/**
+	 * Prints text to STDERR appended with a carriage return (PHP_EOL).
+	 *
+	 * @param string $text
+	 * @param bool   $raw
+	 *
+	 * @return mixed Number of bytes printed or false on error
+	 */
+	public static function error($text = null)
+	{
+		return static::stderr($text . PHP_EOL);
+	}
+
+	/**
+	 * Prompts the user for input and validates it
+	 *
+	 * @param string $text prompt string
+	 * @param array $options the options to validate the input:
+	 *  - required: whether it is required or not
+	 *  - default: default value if no input is inserted by the user
+	 *  - pattern: regular expression pattern to validate user input
+	 *  - validator: a callable function to validate input. The function must accept two parameters:
+	 *      - $input: the user input to validate
+	 *      - $error: the error value passed by reference if validation failed.
+	 * @return string the user input
+	 */
+	public static function prompt($text, $options = array())
+	{
+		$options = ArrayHelper::merge(
+			$options,
+			array(
+				'required'  => false,
+				'default'   => null,
+				'pattern'   => null,
+				'validator' => null,
+				'error'     => 'Invalid input.',
+			)
+		);
+		$error   = null;
+
+		top:
+		$input = $options['default']
+			? static::input("$text [" . $options['default'] . ']: ')
+			: static::input("$text: ");
+
+		if (!strlen($input)) {
+			if (isset($options['default'])) {
+				$input = $options['default'];
+			} elseif ($options['required']) {
+				static::output($options['error']);
+				goto top;
+			}
+		} elseif ($options['pattern'] && !preg_match($options['pattern'], $input)) {
+			static::output($options['error']);
+			goto top;
+		} elseif ($options['validator'] &&
+			!call_user_func_array($options['validator'], array($input, &$error))
+		) {
+			static::output(isset($error) ? $error : $options['error']);
+			goto top;
+		}
+
+		return $input;
+	}
+
+	/**
+	 * Asks user to confirm by typing y or n.
+	 *
+	 * @param string $message to echo out before waiting for user input
+	 * @param boolean $default this value is returned if no selection is made.
+	 * @return boolean whether user confirmed
+	 */
+	public static function confirm($message, $default = true)
+	{
+		echo $message . ' (yes|no) [' . ($default ? 'yes' : 'no') . ']:';
+		$input = trim(static::stdin());
+		return empty($input) ? $default : !strncasecmp($input, 'y', 1);
+	}
+
+	/**
+	 * Gives the user an option to choose from. Giving '?' as an input will show
+	 * a list of options to choose from and their explanations.
+	 *
+	 * @param string $prompt the prompt message
+	 * @param array  $options Key-value array of options to choose from
+	 *
+	 * @return string An option character the user chose
+	 */
+	public static function select($prompt, $options = array())
+	{
+		top:
+		static::stdout("$prompt [" . implode(',', array_keys($options)) . ",?]: ");
+		$input = static::stdin();
+		if ($input === '?') {
+			foreach ($options as $key => $value) {
+				echo " $key - $value\n";
+			}
+			echo " ? - Show help\n";
+			goto top;
+		} elseif (!in_array($input, array_keys($options))) {
+			goto top;
+		}
+		return $input;
+	}
+
+	/**
+	 * Displays and updates a simple progress bar on screen.
+	 *
+	 * @param integer $done the number of items that are completed
+	 * @param integer $total the total value of items that are to be done
+	 * @param integer $size the size of the status bar (optional)
+	 * @see http://snipplr.com/view/29548/
+	 */
+	public static function showProgress($done, $total, $size = 30)
+	{
+		static $start;
+
+		// if we go over our bound, just ignore it
+		if ($done > $total) {
+			return;
+		}
+
+		if (empty($start)) {
+			$start = time();
+		}
+
+		$now = time();
+
+		$percent = (double)($done / $total);
+		$bar     = floor($percent * $size);
+
+		$status = "\r[";
+		$status .= str_repeat("=", $bar);
+		if ($bar < $size) {
+			$status .= ">";
+			$status .= str_repeat(" ", $size - $bar);
+		} else {
+			$status .= "=";
+		}
+
+		$display = number_format($percent * 100, 0);
+
+		$status .= "] $display%  $done/$total";
+
+		$rate = ($now - $start) / $done;
+		$left = $total - $done;
+		$eta  = round($rate * $left, 2);
+
+		$elapsed = $now - $start;
+
+		$status .= " remaining: " . number_format($eta) . " sec.  elapsed: " . number_format($elapsed) . " sec.";
+
+		static::stdout("$status  ");
+
+		flush();
+
+		// when done, send a newline
+		if ($done == $total) {
+			echo "\n";
+		}
+	}
+}
diff --git a/yii/helpers/base/FileHelper.php b/yii/helpers/base/FileHelper.php
new file mode 100644
index 0000000..954c86e
--- /dev/null
+++ b/yii/helpers/base/FileHelper.php
@@ -0,0 +1,172 @@
+<?php
+/**
+ * Filesystem helper class file.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\helpers\base;
+
+use Yii;
+
+/**
+ * Filesystem helper
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Alex Makarov <sam@rmcreative.ru>
+ * @since 2.0
+ */
+class FileHelper
+{
+	/**
+	 * Normalizes a file/directory path.
+	 * After normalization, the directory separators in the path will be `DIRECTORY_SEPARATOR`,
+	 * and any trailing directory separators will be removed. For example, '/home\demo/' on Linux
+	 * will be normalized as '/home/demo'.
+	 * @param string $path the file/directory path to be normalized
+	 * @param string $ds the directory separator to be used in the normalized result. Defaults to `DIRECTORY_SEPARATOR`.
+	 * @return string the normalized file/directory path
+	 */
+	public static function normalizePath($path, $ds = DIRECTORY_SEPARATOR)
+	{
+		return rtrim(strtr($path, array('/' => $ds, '\\' => $ds)), $ds);
+	}
+
+	/**
+	 * Returns the localized version of a specified file.
+	 *
+	 * The searching is based on the specified language code. In particular,
+	 * a file with the same name will be looked for under the subdirectory
+	 * whose name is the same as the language code. For example, given the file "path/to/view.php"
+	 * and language code "zh_CN", the localized file will be looked for as
+	 * "path/to/zh_CN/view.php". If the file is not found, the original file
+	 * will be returned.
+	 *
+	 * If the target and the source language codes are the same,
+	 * the original file will be returned.
+	 *
+	 * @param string $file the original file
+	 * @param string $language the target language that the file should be localized to.
+	 * If not set, the value of [[\yii\base\Application::language]] will be used.
+	 * @param string $sourceLanguage the language that the original file is in.
+	 * If not set, the value of [[\yii\base\Application::sourceLanguage]] will be used.
+	 * @return string the matching localized file, or the original file if the localized version is not found.
+	 * If the target and the source language codes are the same, the original file will be returned.
+	 */
+	public static function localize($file, $language = null, $sourceLanguage = null)
+	{
+		if ($language === null) {
+			$language = Yii::$app->language;
+		}
+		if ($sourceLanguage === null) {
+			$sourceLanguage = Yii::$app->sourceLanguage;
+		}
+		if ($language === $sourceLanguage) {
+			return $file;
+		}
+		$desiredFile = dirname($file) . DIRECTORY_SEPARATOR . $sourceLanguage . DIRECTORY_SEPARATOR . basename($file);
+		return is_file($desiredFile) ? $desiredFile : $file;
+	}
+
+	/**
+	 * Determines the MIME type of the specified file.
+	 * This method will first try to determine the MIME type based on
+	 * [finfo_open](http://php.net/manual/en/function.finfo-open.php). If this doesn't work, it will
+	 * fall back to [[getMimeTypeByExtension()]].
+	 * @param string $file the file name.
+	 * @param string $magicFile name of the optional magic database file, usually something like `/path/to/magic.mime`.
+	 * This will be passed as the second parameter to [finfo_open](http://php.net/manual/en/function.finfo-open.php).
+	 * @param boolean $checkExtension whether to use the file extension to determine the MIME type in case
+	 * `finfo_open()` cannot determine it.
+	 * @return string the MIME type (e.g. `text/plain`). Null is returned if the MIME type cannot be determined.
+	 */
+	public static function getMimeType($file, $magicFile = null, $checkExtension = true)
+	{
+		if (function_exists('finfo_open')) {
+			$info = finfo_open(FILEINFO_MIME_TYPE, $magicFile);
+			if ($info) {
+				$result = finfo_file($info, $file);
+				finfo_close($info);
+				if ($result !== false) {
+					return $result;
+				}
+			}
+		}
+
+		return $checkExtension ? self::getMimeTypeByExtension($file) : null;
+	}
+
+	/**
+	 * Determines the MIME type based on the extension name of the specified file.
+	 * This method will use a local map between extension names and MIME types.
+	 * @param string $file the file name.
+	 * @param string $magicFile the path of the file that contains all available MIME type information.
+	 * If this is not set, the default file aliased by `@yii/util/mimeTypes.php` will be used.
+	 * @return string the MIME type. Null is returned if the MIME type cannot be determined.
+	 */
+	public static function getMimeTypeByExtension($file, $magicFile = null)
+	{
+		static $mimeTypes = array();
+		if ($magicFile === null) {
+			$magicFile = __DIR__ . '/mimeTypes.php';
+		}
+		if (!isset($mimeTypes[$magicFile])) {
+			$mimeTypes[$magicFile] = require($magicFile);
+		}
+		if (($ext = pathinfo($file, PATHINFO_EXTENSION)) !== '') {
+			$ext = strtolower($ext);
+			if (isset($mimeTypes[$magicFile][$ext])) {
+				return $mimeTypes[$magicFile][$ext];
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Copies a whole directory as another one.
+	 * The files and sub-directories will also be copied over.
+	 * @param string $src the source directory
+	 * @param string $dst the destination directory
+	 * @param array $options options for directory copy. Valid options are:
+	 *
+	 * - dirMode: integer, the permission to be set for newly copied directories. Defaults to 0777.
+	 * - fileMode:  integer, the permission to be set for newly copied files. Defaults to the current environment setting.
+	 * - beforeCopy: callback, a PHP callback that is called before copying each sub-directory or file.
+	 *   If the callback returns false, the copy operation for the sub-directory or file will be cancelled.
+	 *   The signature of the callback should be: `function ($from, $to)`, where `$from` is the sub-directory or
+ 	 *   file to be copied from, while `$to` is the copy target.
+	 * - afterCopy: callback, a PHP callback that is called after a sub-directory or file is successfully copied.
+	 *   The signature of the callback is similar to that of `beforeCopy`.
+	 */
+	public static function copyDirectory($src, $dst, $options = array())
+	{
+		if (!is_dir($dst)) {
+			mkdir($dst, isset($options['dirMode']) ? $options['dirMode'] : 0777, true);
+		}
+
+		$handle = opendir($src);
+		while (($file = readdir($handle)) !== false) {
+			if ($file === '.' || $file === '..') {
+				continue;
+			}
+			$from = $src . DIRECTORY_SEPARATOR . $file;
+			$to = $dst . DIRECTORY_SEPARATOR . $file;
+			if (!isset($options['beforeCopy']) || call_user_func($options['beforeCopy'], $from, $to)) {
+				if (is_file($from)) {
+					copy($from, $to);
+					if (isset($options['fileMode'])) {
+						@chmod($to, $options['fileMode']);
+					}
+				} else {
+					static::copyDirectory($from, $to, $options);
+				}
+				if (isset($options['afterCopy'])) {
+					call_user_func($options['afterCopy'], $from, $to);
+				}
+			}
+		}
+		closedir($handle);
+	}
+}
diff --git a/yii/helpers/base/Html.php b/yii/helpers/base/Html.php
new file mode 100644
index 0000000..f601772
--- /dev/null
+++ b/yii/helpers/base/Html.php
@@ -0,0 +1,1483 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\helpers\base;
+
+use Yii;
+use yii\base\InvalidParamException;
+use yii\web\Request;
+use yii\base\Model;
+
+/**
+ * Html provides a set of static methods for generating commonly used HTML tags.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Html
+{
+	/**
+	 * @var boolean whether to close void (empty) elements. Defaults to true.
+	 * @see voidElements
+	 */
+	public static $closeVoidElements = true;
+	/**
+	 * @var array list of void elements (element name => 1)
+	 * @see closeVoidElements
+	 * @see http://www.w3.org/TR/html-markup/syntax.html#void-element
+	 */
+	public static $voidElements = array(
+		'area' => 1,
+		'base' => 1,
+		'br' => 1,
+		'col' => 1,
+		'command' => 1,
+		'embed' => 1,
+		'hr' => 1,
+		'img' => 1,
+		'input' => 1,
+		'keygen' => 1,
+		'link' => 1,
+		'meta' => 1,
+		'param' => 1,
+		'source' => 1,
+		'track' => 1,
+		'wbr' => 1,
+	);
+	/**
+	 * @var boolean whether to show the values of boolean attributes in element tags.
+	 * If false, only the attribute names will be generated.
+	 * @see booleanAttributes
+	 */
+	public static $showBooleanAttributeValues = true;
+	/**
+	 * @var array list of boolean attributes. The presence of a boolean attribute on
+	 * an element represents the true value, and the absence of the attribute represents the false value.
+	 * @see showBooleanAttributeValues
+	 * @see http://www.w3.org/TR/html5/infrastructure.html#boolean-attributes
+	 */
+	public static $booleanAttributes = array(
+		'async' => 1,
+		'autofocus' => 1,
+		'autoplay' => 1,
+		'checked' => 1,
+		'controls' => 1,
+		'declare' => 1,
+		'default' => 1,
+		'defer' => 1,
+		'disabled' => 1,
+		'formnovalidate' => 1,
+		'hidden' => 1,
+		'ismap' => 1,
+		'loop' => 1,
+		'multiple' => 1,
+		'muted' => 1,
+		'nohref' => 1,
+		'noresize' => 1,
+		'novalidate' => 1,
+		'open' => 1,
+		'readonly' => 1,
+		'required' => 1,
+		'reversed' => 1,
+		'scoped' => 1,
+		'seamless' => 1,
+		'selected' => 1,
+		'typemustmatch' => 1,
+	);
+	/**
+	 * @var array the preferred order of attributes in a tag. This mainly affects the order of the attributes
+	 * that are rendered by [[renderAttributes()]].
+	 */
+	public static $attributeOrder = array(
+		'type',
+		'id',
+		'class',
+		'name',
+		'value',
+
+		'href',
+		'src',
+		'action',
+		'method',
+
+		'selected',
+		'checked',
+		'readonly',
+		'disabled',
+		'multiple',
+
+		'size',
+		'maxlength',
+		'width',
+		'height',
+		'rows',
+		'cols',
+
+		'alt',
+		'title',
+		'rel',
+		'media',
+	);
+
+	/**
+	 * Encodes special characters into HTML entities.
+	 * The [[yii\base\Application::charset|application charset]] will be used for encoding.
+	 * @param string $content the content to be encoded
+	 * @param boolean $doubleEncode whether to encode HTML entities in `$content`. If false,
+	 * HTML entities in `$content` will not be further encoded.
+	 * @return string the encoded content
+	 * @see decode
+	 * @see http://www.php.net/manual/en/function.htmlspecialchars.php
+	 */
+	public static function encode($content, $doubleEncode = true)
+	{
+		return htmlspecialchars($content, ENT_QUOTES, Yii::$app->charset, $doubleEncode);
+	}
+
+	/**
+	 * Decodes special HTML entities back to the corresponding characters.
+	 * This is the opposite of [[encode()]].
+	 * @param string $content the content to be decoded
+	 * @return string the decoded content
+	 * @see encode
+	 * @see http://www.php.net/manual/en/function.htmlspecialchars-decode.php
+	 */
+	public static function decode($content)
+	{
+		return htmlspecialchars_decode($content, ENT_QUOTES);
+	}
+
+	/**
+	 * Generates a complete HTML tag.
+	 * @param string $name the tag name
+	 * @param string $content the content to be enclosed between the start and end tags. It will not be HTML-encoded.
+	 * If this is coming from end users, you should consider [[encode()]] it to prevent XSS attacks.
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * If a value is null, the corresponding attribute will not be rendered.
+	 * @return string the generated HTML tag
+	 * @see beginTag
+	 * @see endTag
+	 */
+	public static function tag($name, $content = '', $options = array())
+	{
+		$html = '<' . $name . static::renderTagAttributes($options);
+		if (isset(static::$voidElements[strtolower($name)])) {
+			return $html . (static::$closeVoidElements ? ' />' : '>');
+		} else {
+			return $html . ">$content</$name>";
+		}
+	}
+
+	/**
+	 * Generates a start tag.
+	 * @param string $name the tag name
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * If a value is null, the corresponding attribute will not be rendered.
+	 * @return string the generated start tag
+	 * @see endTag
+	 * @see tag
+	 */
+	public static function beginTag($name, $options = array())
+	{
+		return '<' . $name . static::renderTagAttributes($options) . '>';
+	}
+
+	/**
+	 * Generates an end tag.
+	 * @param string $name the tag name
+	 * @return string the generated end tag
+	 * @see beginTag
+	 * @see tag
+	 */
+	public static function endTag($name)
+	{
+		return "</$name>";
+	}
+
+	/**
+	 * Encloses the given content within a CDATA tag.
+	 * @param string $content the content to be enclosed within the CDATA tag
+	 * @return string the CDATA tag with the enclosed content.
+	 */
+	public static function cdata($content)
+	{
+		return '<![CDATA[' . $content . ']]>';
+	}
+
+	/**
+	 * Generates a style tag.
+	 * @param string $content the style content
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * If a value is null, the corresponding attribute will not be rendered.
+	 * If the options does not contain "type", a "type" attribute with value "text/css" will be used.
+	 * @return string the generated style tag
+	 */
+	public static function style($content, $options = array())
+	{
+		if (!isset($options['type'])) {
+			$options['type'] = 'text/css';
+		}
+		return static::tag('style', "/*<![CDATA[*/\n{$content}\n/*]]>*/", $options);
+	}
+
+	/**
+	 * Generates a script tag.
+	 * @param string $content the script content
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * If a value is null, the corresponding attribute will not be rendered.
+	 * If the options does not contain "type", a "type" attribute with value "text/javascript" will be rendered.
+	 * @return string the generated script tag
+	 */
+	public static function script($content, $options = array())
+	{
+		if (!isset($options['type'])) {
+			$options['type'] = 'text/javascript';
+		}
+		return static::tag('script', "/*<![CDATA[*/\n{$content}\n/*]]>*/", $options);
+	}
+
+	/**
+	 * Generates a link tag that refers to an external CSS file.
+	 * @param array|string $url the URL of the external CSS file. This parameter will be processed by [[url()]].
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * If a value is null, the corresponding attribute will not be rendered.
+	 * @return string the generated link tag
+	 * @see url
+	 */
+	public static function cssFile($url, $options = array())
+	{
+		$options['rel'] = 'stylesheet';
+		$options['type'] = 'text/css';
+		$options['href'] = static::url($url);
+		return static::tag('link', '', $options);
+	}
+
+	/**
+	 * Generates a script tag that refers to an external JavaScript file.
+	 * @param string $url the URL of the external JavaScript file. This parameter will be processed by [[url()]].
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * If a value is null, the corresponding attribute will not be rendered.
+	 * @return string the generated script tag
+	 * @see url
+	 */
+	public static function jsFile($url, $options = array())
+	{
+		$options['type'] = 'text/javascript';
+		$options['src'] = static::url($url);
+		return static::tag('script', '', $options);
+	}
+
+	/**
+	 * Generates a form start tag.
+	 * @param array|string $action the form action URL. This parameter will be processed by [[url()]].
+	 * @param string $method the form submission method, such as "post", "get", "put", "delete" (case-insensitive).
+	 * Since most browsers only support "post" and "get", if other methods are given, they will
+	 * be simulated using "post", and a hidden input will be added which contains the actual method type.
+	 * See [[\yii\web\Request::restVar]] for more details.
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * If a value is null, the corresponding attribute will not be rendered.
+	 * @return string the generated form start tag.
+	 * @see endForm
+	 */
+	public static function beginForm($action = '', $method = 'post', $options = array())
+	{
+		$action = static::url($action);
+
+		$hiddenInputs = array();
+
+		$request = Yii::$app->getRequest();
+		if ($request instanceof Request) {
+			if (strcasecmp($method, 'get') && strcasecmp($method, 'post')) {
+				// simulate PUT, DELETE, etc. via POST
+				$hiddenInputs[] = static::hiddenInput($request->restVar, $method);
+				$method = 'post';
+			}
+			if ($request->enableCsrfValidation) {
+				$hiddenInputs[] = static::hiddenInput($request->csrfTokenName, $request->getCsrfToken());
+			}
+		}
+
+		if (!strcasecmp($method, 'get') && ($pos = strpos($action, '?')) !== false) {
+			// query parameters in the action are ignored for GET method
+			// we use hidden fields to add them back
+			foreach (explode('&', substr($action, $pos + 1)) as $pair) {
+				if (($pos1 = strpos($pair, '=')) !== false) {
+					$hiddenInputs[] = static::hiddenInput(urldecode(substr($pair, 0, $pos1)), urldecode(substr($pair, $pos1 + 1)));
+				} else {
+					$hiddenInputs[] = static::hiddenInput(urldecode($pair), '');
+				}
+			}
+			$action = substr($action, 0, $pos);
+		}
+
+		$options['action'] = $action;
+		$options['method'] = $method;
+		$form = static::beginTag('form', $options);
+		if (!empty($hiddenInputs)) {
+			$form .= "\n" . implode("\n", $hiddenInputs);
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Generates a form end tag.
+	 * @return string the generated tag
+	 * @see beginForm
+	 */
+	public static function endForm()
+	{
+		return '</form>';
+	}
+
+	/**
+	 * Generates a hyperlink tag.
+	 * @param string $text link body. It will NOT be HTML-encoded. Therefore you can pass in HTML code
+	 * such as an image tag. If this is is coming from end users, you should consider [[encode()]]
+	 * it to prevent XSS attacks.
+	 * @param array|string|null $url the URL for the hyperlink tag. This parameter will be processed by [[url()]]
+	 * and will be used for the "href" attribute of the tag. If this parameter is null, the "href" attribute
+	 * will not be generated.
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * If a value is null, the corresponding attribute will not be rendered.
+	 * @return string the generated hyperlink
+	 * @see url
+	 */
+	public static function a($text, $url = null, $options = array())
+	{
+		if ($url !== null) {
+			$options['href'] = static::url($url);
+		}
+		return static::tag('a', $text, $options);
+	}
+
+	/**
+	 * Generates a mailto hyperlink.
+	 * @param string $text link body. It will NOT be HTML-encoded. Therefore you can pass in HTML code
+	 * such as an image tag. If this is is coming from end users, you should consider [[encode()]]
+	 * it to prevent XSS attacks.
+	 * @param string $email email address. If this is null, the first parameter (link body) will be treated
+	 * as the email address and used.
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * If a value is null, the corresponding attribute will not be rendered.
+	 * @return string the generated mailto link
+	 */
+	public static function mailto($text, $email = null, $options = array())
+	{
+		$options['href'] = 'mailto:' . ($email === null ? $text : $email);
+		return static::tag('a', $text, $options);
+	}
+
+	/**
+	 * Generates an image tag.
+	 * @param string $src the image URL. This parameter will be processed by [[url()]].
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * If a value is null, the corresponding attribute will not be rendered.
+	 * @return string the generated image tag
+	 */
+	public static function img($src, $options = array())
+	{
+		$options['src'] = static::url($src);
+		if (!isset($options['alt'])) {
+			$options['alt'] = '';
+		}
+		return static::tag('img', null, $options);
+	}
+
+	/**
+	 * Generates a label tag.
+	 * @param string $content label text. It will NOT be HTML-encoded. Therefore you can pass in HTML code
+	 * such as an image tag. If this is is coming from end users, you should [[encode()]]
+	 * it to prevent XSS attacks.
+	 * @param string $for the ID of the HTML element that this label is associated with.
+	 * If this is null, the "for" attribute will not be generated.
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * If a value is null, the corresponding attribute will not be rendered.
+	 * @return string the generated label tag
+	 */
+	public static function label($content, $for = null, $options = array())
+	{
+		$options['for'] = $for;
+		return static::tag('label', $content, $options);
+	}
+
+	/**
+	 * Generates a button tag.
+	 * @param string $content the content enclosed within the button tag. It will NOT be HTML-encoded.
+	 * Therefore you can pass in HTML code such as an image tag. If this is is coming from end users,
+	 * you should consider [[encode()]] it to prevent XSS attacks.
+	 * @param string $name the name attribute. If it is null, the name attribute will not be generated.
+	 * @param string $value the value attribute. If it is null, the value attribute will not be generated.
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * If a value is null, the corresponding attribute will not be rendered.
+	 * If the options does not contain "type", a "type" attribute with value "button" will be rendered.
+	 * @return string the generated button tag
+	 */
+	public static function button($content = 'Button', $name = null, $value = null, $options = array())
+	{
+		$options['name'] = $name;
+		$options['value'] = $value;
+		if (!isset($options['type'])) {
+			$options['type'] = 'button';
+		}
+		return static::tag('button', $content, $options);
+	}
+
+	/**
+	 * Generates a submit button tag.
+	 * @param string $content the content enclosed within the button tag. It will NOT be HTML-encoded.
+	 * Therefore you can pass in HTML code such as an image tag. If this is is coming from end users,
+	 * you should consider [[encode()]] it to prevent XSS attacks.
+	 * @param string $name the name attribute. If it is null, the name attribute will not be generated.
+	 * @param string $value the value attribute. If it is null, the value attribute will not be generated.
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * If a value is null, the corresponding attribute will not be rendered.
+	 * @return string the generated submit button tag
+	 */
+	public static function submitButton($content = 'Submit', $name = null, $value = null, $options = array())
+	{
+		$options['type'] = 'submit';
+		return static::button($content, $name, $value, $options);
+	}
+
+	/**
+	 * Generates a reset button tag.
+	 * @param string $content the content enclosed within the button tag. It will NOT be HTML-encoded.
+	 * Therefore you can pass in HTML code such as an image tag. If this is is coming from end users,
+	 * you should consider [[encode()]] it to prevent XSS attacks.
+	 * @param string $name the name attribute. If it is null, the name attribute will not be generated.
+	 * @param string $value the value attribute. If it is null, the value attribute will not be generated.
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * If a value is null, the corresponding attribute will not be rendered.
+	 * @return string the generated reset button tag
+	 */
+	public static function resetButton($content = 'Reset', $name = null, $value = null, $options = array())
+	{
+		$options['type'] = 'reset';
+		return static::button($content, $name, $value, $options);
+	}
+
+	/**
+	 * Generates an input type of the given type.
+	 * @param string $type the type attribute.
+	 * @param string $name the name attribute. If it is null, the name attribute will not be generated.
+	 * @param string $value the value attribute. If it is null, the value attribute will not be generated.
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * If a value is null, the corresponding attribute will not be rendered.
+	 * @return string the generated input tag
+	 */
+	public static function input($type, $name = null, $value = null, $options = array())
+	{
+		$options['type'] = $type;
+		$options['name'] = $name;
+		$options['value'] = $value;
+		return static::tag('input', null, $options);
+	}
+
+	/**
+	 * Generates an input button.
+	 * @param string $name the name attribute.
+	 * @param string $value the value attribute. If it is null, the value attribute will not be generated.
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * If a value is null, the corresponding attribute will not be rendered.
+	 * @return string the generated button tag
+	 */
+	public static function buttonInput($name, $value = 'Button', $options = array())
+	{
+		return static::input('button', $name, $value, $options);
+	}
+
+	/**
+	 * Generates a submit input button.
+	 * @param string $name the name attribute. If it is null, the name attribute will not be generated.
+	 * @param string $value the value attribute. If it is null, the value attribute will not be generated.
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * If a value is null, the corresponding attribute will not be rendered.
+	 * @return string the generated button tag
+	 */
+	public static function submitInput($name = null, $value = 'Submit', $options = array())
+	{
+		return static::input('submit', $name, $value, $options);
+	}
+
+	/**
+	 * Generates a reset input button.
+	 * @param string $name the name attribute. If it is null, the name attribute will not be generated.
+	 * @param string $value the value attribute. If it is null, the value attribute will not be generated.
+	 * @param array $options the attributes of the button tag. The values will be HTML-encoded using [[encode()]].
+	 * Attributes whose value is null will be ignored and not put in the tag returned.
+	 * @return string the generated button tag
+	 */
+	public static function resetInput($name = null, $value = 'Reset', $options = array())
+	{
+		return static::input('reset', $name, $value, $options);
+	}
+
+	/**
+	 * Generates a text input field.
+	 * @param string $name the name attribute.
+	 * @param string $value the value attribute. If it is null, the value attribute will not be generated.
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * If a value is null, the corresponding attribute will not be rendered.
+	 * @return string the generated button tag
+	 */
+	public static function textInput($name, $value = null, $options = array())
+	{
+		return static::input('text', $name, $value, $options);
+	}
+
+	/**
+	 * Generates a hidden input field.
+	 * @param string $name the name attribute.
+	 * @param string $value the value attribute. If it is null, the value attribute will not be generated.
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * If a value is null, the corresponding attribute will not be rendered.
+	 * @return string the generated button tag
+	 */
+	public static function hiddenInput($name, $value = null, $options = array())
+	{
+		return static::input('hidden', $name, $value, $options);
+	}
+
+	/**
+	 * Generates a password input field.
+	 * @param string $name the name attribute.
+	 * @param string $value the value attribute. If it is null, the value attribute will not be generated.
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * If a value is null, the corresponding attribute will not be rendered.
+	 * @return string the generated button tag
+	 */
+	public static function passwordInput($name, $value = null, $options = array())
+	{
+		return static::input('password', $name, $value, $options);
+	}
+
+	/**
+	 * Generates a file input field.
+	 * To use a file input field, you should set the enclosing form's "enctype" attribute to
+	 * be "multipart/form-data". After the form is submitted, the uploaded file information
+	 * can be obtained via $_FILES[$name] (see PHP documentation).
+	 * @param string $name the name attribute.
+	 * @param string $value the value attribute. If it is null, the value attribute will not be generated.
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * If a value is null, the corresponding attribute will not be rendered.
+	 * @return string the generated button tag
+	 */
+	public static function fileInput($name, $value = null, $options = array())
+	{
+		return static::input('file', $name, $value, $options);
+	}
+
+	/**
+	 * Generates a text area input.
+	 * @param string $name the input name
+	 * @param string $value the input value. Note that it will be encoded using [[encode()]].
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * If a value is null, the corresponding attribute will not be rendered.
+	 * @return string the generated text area tag
+	 */
+	public static function textarea($name, $value = '', $options = array())
+	{
+		$options['name'] = $name;
+		return static::tag('textarea', static::encode($value), $options);
+	}
+
+	/**
+	 * Generates a radio button input.
+	 * @param string $name the name attribute.
+	 * @param boolean $checked whether the radio button should be checked.
+	 * @param array $options the tag options in terms of name-value pairs. The following options are specially handled:
+	 *
+	 * - uncheck: string, the value associated with the uncheck state of the radio button. When this attribute
+	 *   is present, a hidden input will be generated so that if the radio button is not checked and is submitted,
+	 *   the value of this attribute will still be submitted to the server via the hidden input.
+	 *
+	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will
+	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
+	 *
+	 * @return string the generated radio button tag
+	 */
+	public static function radio($name, $checked = false, $options = array())
+	{
+		$options['checked'] = $checked;
+		$value = array_key_exists('value', $options) ? $options['value'] : '1';
+		if (isset($options['uncheck'])) {
+			// add a hidden field so that if the radio button is not selected, it still submits a value
+			$hidden = static::hiddenInput($name, $options['uncheck']);
+			unset($options['uncheck']);
+		} else {
+			$hidden = '';
+		}
+		return $hidden . static::input('radio', $name, $value, $options);
+	}
+
+	/**
+	 * Generates a checkbox input.
+	 * @param string $name the name attribute.
+	 * @param boolean $checked whether the checkbox should be checked.
+	 * @param array $options the tag options in terms of name-value pairs. The following options are specially handled:
+	 *
+	 * - uncheck: string, the value associated with the uncheck state of the checkbox. When this attribute
+	 *   is present, a hidden input will be generated so that if the checkbox is not checked and is submitted,
+	 *   the value of this attribute will still be submitted to the server via the hidden input.
+	 *
+	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will
+	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
+	 *
+	 * @return string the generated checkbox tag
+	 */
+	public static function checkbox($name, $checked = false, $options = array())
+	{
+		$options['checked'] = $checked;
+		$value = array_key_exists('value', $options) ? $options['value'] : '1';
+		if (isset($options['uncheck'])) {
+			// add a hidden field so that if the checkbox is not selected, it still submits a value
+			$hidden = static::hiddenInput($name, $options['uncheck']);
+			unset($options['uncheck']);
+		} else {
+			$hidden = '';
+		}
+		return $hidden . static::input('checkbox', $name, $value, $options);
+	}
+
+	/**
+	 * Generates a drop-down list.
+	 * @param string $name the input name
+	 * @param string $selection the selected value
+	 * @param array $items the option data items. The array keys are option values, and the array values
+	 * are the corresponding option labels. The array can also be nested (i.e. some array values are arrays too).
+	 * For each sub-array, an option group will be generated whose label is the key associated with the sub-array.
+	 * If you have a list of data models, you may convert them into the format described above using
+	 * [[\yii\helpers\ArrayHelper::map()]].
+	 *
+	 * Note, the values and labels will be automatically HTML-encoded by this method, and the blank spaces in
+	 * the labels will also be HTML-encoded.
+	 * @param array $options the tag options in terms of name-value pairs. The following options are specially handled:
+	 *
+	 * - prompt: string, a prompt text to be displayed as the first option;
+	 * - options: array, the attributes for the select option tags. The array keys must be valid option values,
+	 *   and the array values are the extra attributes for the corresponding option tags. For example,
+	 *
+	 * ~~~
+	 * array(
+	 *     'value1' => array('disabled' => true),
+	 *     'value2' => array('label' => 'value 2'),
+	 * );
+	 * ~~~
+	 *
+	 * - groups: array, the attributes for the optgroup tags. The structure of this is similar to that of 'options',
+	 *   except that the array keys represent the optgroup labels specified in $items.
+	 *
+	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will
+	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
+	 *
+	 * @return string the generated drop-down list tag
+	 */
+	public static function dropDownList($name, $selection = null, $items = array(), $options = array())
+	{
+		$options['name'] = $name;
+		$selectOptions = static::renderSelectOptions($selection, $items, $options);
+		return static::tag('select', "\n" . $selectOptions . "\n", $options);
+	}
+
+	/**
+	 * Generates a list box.
+	 * @param string $name the input name
+	 * @param string|array $selection the selected value(s)
+	 * @param array $items the option data items. The array keys are option values, and the array values
+	 * are the corresponding option labels. The array can also be nested (i.e. some array values are arrays too).
+	 * For each sub-array, an option group will be generated whose label is the key associated with the sub-array.
+	 * If you have a list of data models, you may convert them into the format described above using
+	 * [[\yii\helpers\ArrayHelper::map()]].
+	 *
+	 * Note, the values and labels will be automatically HTML-encoded by this method, and the blank spaces in
+	 * the labels will also be HTML-encoded.
+	 * @param array $options the tag options in terms of name-value pairs. The following options are specially handled:
+	 *
+	 * - prompt: string, a prompt text to be displayed as the first option;
+	 * - options: array, the attributes for the select option tags. The array keys must be valid option values,
+	 *   and the array values are the extra attributes for the corresponding option tags. For example,
+	 *
+	 * ~~~
+	 * array(
+	 *     'value1' => array('disabled' => true),
+	 *     'value2' => array('label' => 'value 2'),
+	 * );
+	 * ~~~
+	 *
+	 * - groups: array, the attributes for the optgroup tags. The structure of this is similar to that of 'options',
+	 *   except that the array keys represent the optgroup labels specified in $items.
+	 * - unselect: string, the value that will be submitted when no option is selected.
+	 *   When this attribute is set, a hidden field will be generated so that if no option is selected in multiple
+	 *   mode, we can still obtain the posted unselect value.
+	 *
+	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will
+	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
+	 *
+	 * @return string the generated list box tag
+	 */
+	public static function listBox($name, $selection = null, $items = array(), $options = array())
+	{
+		if (!isset($options['size'])) {
+			$options['size'] = 4;
+		}
+		if (!empty($options['multiple']) && substr($name, -2) !== '[]') {
+			$name .= '[]';
+		}
+		$options['name'] = $name;
+		if (isset($options['unselect'])) {
+			// add a hidden field so that if the list box has no option being selected, it still submits a value
+			if (substr($name, -2) === '[]') {
+				$name = substr($name, 0, -2);
+			}
+			$hidden = static::hiddenInput($name, $options['unselect']);
+			unset($options['unselect']);
+		} else {
+			$hidden = '';
+		}
+		$selectOptions = static::renderSelectOptions($selection, $items, $options);
+		return $hidden . static::tag('select', "\n" . $selectOptions . "\n", $options);
+	}
+
+	/**
+	 * Generates a list of checkboxes.
+	 * A checkbox list allows multiple selection, like [[listBox()]].
+	 * As a result, the corresponding submitted value is an array.
+	 * @param string $name the name attribute of each checkbox.
+	 * @param string|array $selection the selected value(s).
+	 * @param array $items the data item used to generate the checkboxes.
+	 * The array keys are the labels, while the array values are the corresponding checkbox values.
+	 * Note that the labels will NOT be HTML-encoded, while the values will.
+	 * @param array $options options (name => config) for the checkbox list. The following options are supported:
+	 *
+	 * - unselect: string, the value that should be submitted when none of the checkboxes is selected.
+	 *   By setting this option, a hidden input will be generated.
+	 * - separator: string, the HTML code that separates items.
+	 * - item: callable, a callback that can be used to customize the generation of the HTML code
+	 *   corresponding to a single item in $items. The signature of this callback must be:
+	 *
+	 * ~~~
+	 * function ($index, $label, $name, $checked, $value)
+	 * ~~~
+	 *
+	 * where $index is the zero-based index of the checkbox in the whole list; $label
+	 * is the label for the checkbox; and $name, $value and $checked represent the name,
+	 * value and the checked status of the checkbox input, respectively.
+	 * @return string the generated checkbox list
+	 */
+	public static function checkboxList($name, $selection = null, $items = array(), $options = array())
+	{
+		if (substr($name, -2) !== '[]') {
+			$name .= '[]';
+		}
+
+		$formatter = isset($options['item']) ? $options['item'] : null;
+		$lines = array();
+		$index = 0;
+		foreach ($items as $value => $label) {
+			$checked = $selection !== null &&
+				(!is_array($selection) && !strcmp($value, $selection)
+					|| is_array($selection) && in_array($value, $selection));
+			if ($formatter !== null) {
+				$lines[] = call_user_func($formatter, $index, $label, $name, $checked, $value);
+			} else {
+				$lines[] = static::label(static::checkbox($name, $checked, array('value' => $value)) . ' ' . $label);
+			}
+			$index++;
+		}
+
+		if (isset($options['unselect'])) {
+			// add a hidden field so that if the list box has no option being selected, it still submits a value
+			$name2 = substr($name, -2) === '[]' ? substr($name, 0, -2) : $name;
+			$hidden = static::hiddenInput($name2, $options['unselect']);
+		} else {
+			$hidden = '';
+		}
+		$separator = isset($options['separator']) ? $options['separator'] : "\n";
+
+		return $hidden . implode($separator, $lines);
+	}
+
+	/**
+	 * Generates a list of radio buttons.
+	 * A radio button list is like a checkbox list, except that it only allows single selection.
+	 * @param string $name the name attribute of each radio button.
+	 * @param string|array $selection the selected value(s).
+	 * @param array $items the data item used to generate the radio buttons.
+	 * The array keys are the labels, while the array values are the corresponding radio button values.
+	 * Note that the labels will NOT be HTML-encoded, while the values will.
+	 * @param array $options options (name => config) for the radio button list. The following options are supported:
+	 *
+	 * - unselect: string, the value that should be submitted when none of the radio buttons is selected.
+	 *   By setting this option, a hidden input will be generated.
+	 * - separator: string, the HTML code that separates items.
+	 * - item: callable, a callback that can be used to customize the generation of the HTML code
+	 *   corresponding to a single item in $items. The signature of this callback must be:
+	 *
+	 * ~~~
+	 * function ($index, $label, $name, $checked, $value)
+	 * ~~~
+	 *
+	 * where $index is the zero-based index of the radio button in the whole list; $label
+	 * is the label for the radio button; and $name, $value and $checked represent the name,
+	 * value and the checked status of the radio button input, respectively.
+	 * @return string the generated radio button list
+	 */
+	public static function radioList($name, $selection = null, $items = array(), $options = array())
+	{
+		$formatter = isset($options['item']) ? $options['item'] : null;
+		$lines = array();
+		$index = 0;
+		foreach ($items as $value => $label) {
+			$checked = $selection !== null &&
+				(!is_array($selection) && !strcmp($value, $selection)
+					|| is_array($selection) && in_array($value, $selection));
+			if ($formatter !== null) {
+				$lines[] = call_user_func($formatter, $index, $label, $name, $checked, $value);
+			} else {
+				$lines[] = static::label(static::radio($name, $checked, array('value' => $value)) . ' ' . $label);
+			}
+			$index++;
+		}
+
+		$separator = isset($options['separator']) ? $options['separator'] : "\n";
+		if (isset($options['unselect'])) {
+			// add a hidden field so that if the list box has no option being selected, it still submits a value
+			$hidden = static::hiddenInput($name, $options['unselect']);
+		} else {
+			$hidden = '';
+		}
+
+		return $hidden . implode($separator, $lines);
+	}
+
+	/**
+	 * Generates a label tag for the given model attribute.
+	 * The label text is the label associated with the attribute, obtained via [[Model::getAttributeLabel()]].
+	 * @param Model $model the model object
+	 * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format
+	 * about attribute expression.
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * If a value is null, the corresponding attribute will not be rendered.
+	 * The following options are specially handled:
+	 *
+	 * - label: this specifies the label to be displayed. Note that this will NOT be [[encoded()]].
+	 *   If this is not set, [[Model::getAttributeLabel()]] will be called to get the label for display
+	 *   (after encoding).
+	 *
+	 * @return string the generated label tag
+	 */
+	public static function activeLabel($model, $attribute, $options = array())
+	{
+		$attribute = static::getAttributeName($attribute);
+		$label = isset($options['label']) ? $options['label'] : static::encode($model->getAttributeLabel($attribute));
+		$for = array_key_exists('for', $options) ? $options['for'] : static::getInputId($model, $attribute);
+		unset($options['label'], $options['for']);
+		return static::label($label, $for, $options);
+	}
+
+	/**
+	 * Generates an input tag for the given model attribute.
+	 * This method will generate the "name" and "value" tag attributes automatically for the model attribute
+	 * unless they are explicitly specified in `$options`.
+	 * @param string $type the input type (e.g. 'text', 'password')
+	 * @param Model $model the model object
+	 * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format
+	 * about attribute expression.
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * @return string the generated input tag
+	 */
+	public static function activeInput($type, $model, $attribute, $options = array())
+	{
+		$name = isset($options['name']) ? $options['name'] : static::getInputName($model, $attribute);
+		$value = isset($options['value']) ? $options['value'] : static::getAttributeValue($model, $attribute);
+		if (!array_key_exists('id', $options)) {
+			$options['id'] = static::getInputId($model, $attribute);
+		}
+		return static::input($type, $name, $value, $options);
+	}
+
+	/**
+	 * Generates a text input tag for the given model attribute.
+	 * This method will generate the "name" and "value" tag attributes automatically for the model attribute
+	 * unless they are explicitly specified in `$options`.
+	 * @param Model $model the model object
+	 * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format
+	 * about attribute expression.
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * @return string the generated input tag
+	 */
+	public static function activeTextInput($model, $attribute, $options = array())
+	{
+		return static::activeInput('text', $model, $attribute, $options);
+	}
+
+	/**
+	 * Generates a hidden input tag for the given model attribute.
+	 * This method will generate the "name" and "value" tag attributes automatically for the model attribute
+	 * unless they are explicitly specified in `$options`.
+	 * @param Model $model the model object
+	 * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format
+	 * about attribute expression.
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * @return string the generated input tag
+	 */
+	public static function activeHiddenInput($model, $attribute, $options = array())
+	{
+		return static::activeInput('hidden', $model, $attribute, $options);
+	}
+
+	/**
+	 * Generates a password input tag for the given model attribute.
+	 * This method will generate the "name" and "value" tag attributes automatically for the model attribute
+	 * unless they are explicitly specified in `$options`.
+	 * @param Model $model the model object
+	 * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format
+	 * about attribute expression.
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * @return string the generated input tag
+	 */
+	public static function activePasswordInput($model, $attribute, $options = array())
+	{
+		return static::activeInput('password', $model, $attribute, $options);
+	}
+
+	/**
+	 * Generates a file input tag for the given model attribute.
+	 * This method will generate the "name" and "value" tag attributes automatically for the model attribute
+	 * unless they are explicitly specified in `$options`.
+	 * @param Model $model the model object
+	 * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format
+	 * about attribute expression.
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * @return string the generated input tag
+	 */
+	public static function activeFileInput($model, $attribute, $options = array())
+	{
+		return static::activeInput('file', $model, $attribute, $options);
+	}
+
+	/**
+	 * Generates a textarea tag for the given model attribute.
+	 * The model attribute value will be used as the content in the textarea.
+	 * @param Model $model the model object
+	 * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format
+	 * about attribute expression.
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * @return string the generated textarea tag
+	 */
+	public static function activeTextarea($model, $attribute, $options = array())
+	{
+		$name = static::getInputName($model, $attribute);
+		$value = static::getAttributeValue($model, $attribute);
+		if (!array_key_exists('id', $options)) {
+			$options['id'] = static::getInputId($model, $attribute);
+		}
+		return static::textarea($name, $value, $options);
+	}
+
+	/**
+	 * Generates a radio button tag for the given model attribute.
+	 * This method will generate the "name" tag attribute automatically unless it is explicitly specified in `$options`.
+	 * This method will generate the "checked" tag attribute according to the model attribute value.
+	 * @param Model $model the model object
+	 * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format
+	 * about attribute expression.
+	 * @param array $options the tag options in terms of name-value pairs. The following options are specially handled:
+	 *
+	 * - uncheck: string, the value associated with the uncheck state of the radio button. If not set,
+	 *   it will take the default value '0'. This method will render a hidden input so that if the radio button
+	 *   is not checked and is submitted, the value of this attribute will still be submitted to the server
+	 *   via the hidden input.
+	 *
+	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will
+	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
+	 *
+	 * @return string the generated radio button tag
+	 */
+	public static function activeRadio($model, $attribute, $options = array())
+	{
+		$name = isset($options['name']) ? $options['name'] : static::getInputName($model, $attribute);
+		$checked = static::getAttributeValue($model, $attribute);
+		if (!array_key_exists('uncheck', $options)) {
+			$options['uncheck'] = '0';
+		}
+		if (!array_key_exists('id', $options)) {
+			$options['id'] = static::getInputId($model, $attribute);
+		}
+		return static::radio($name, $checked, $options);
+	}
+
+	/**
+	 * Generates a checkbox tag for the given model attribute.
+	 * This method will generate the "name" tag attribute automatically unless it is explicitly specified in `$options`.
+	 * This method will generate the "checked" tag attribute according to the model attribute value.
+	 * @param Model $model the model object
+	 * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format
+	 * about attribute expression.
+	 * @param array $options the tag options in terms of name-value pairs. The following options are specially handled:
+	 *
+	 * - uncheck: string, the value associated with the uncheck state of the radio button. If not set,
+	 *   it will take the default value '0'. This method will render a hidden input so that if the radio button
+	 *   is not checked and is submitted, the value of this attribute will still be submitted to the server
+	 *   via the hidden input.
+	 *
+	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will
+	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
+	 *
+	 * @return string the generated checkbox tag
+	 */
+	public static function activeCheckbox($model, $attribute, $options = array())
+	{
+		$name = isset($options['name']) ? $options['name'] : static::getInputName($model, $attribute);
+		$checked = static::getAttributeValue($model, $attribute);
+		if (!array_key_exists('uncheck', $options)) {
+			$options['uncheck'] = '0';
+		}
+		if (!array_key_exists('id', $options)) {
+			$options['id'] = static::getInputId($model, $attribute);
+		}
+		return static::checkbox($name, $checked, $options);
+	}
+
+	/**
+	 * Generates a drop-down list for the given model attribute.
+	 * The selection of the drop-down list is taken from the value of the model attribute.
+	 * @param Model $model the model object
+	 * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format
+	 * about attribute expression.
+	 * @param array $items the option data items. The array keys are option values, and the array values
+	 * are the corresponding option labels. The array can also be nested (i.e. some array values are arrays too).
+	 * For each sub-array, an option group will be generated whose label is the key associated with the sub-array.
+	 * If you have a list of data models, you may convert them into the format described above using
+	 * [[\yii\helpers\ArrayHelper::map()]].
+	 *
+	 * Note, the values and labels will be automatically HTML-encoded by this method, and the blank spaces in
+	 * the labels will also be HTML-encoded.
+	 * @param array $options the tag options in terms of name-value pairs. The following options are specially handled:
+	 *
+	 * - prompt: string, a prompt text to be displayed as the first option;
+	 * - options: array, the attributes for the select option tags. The array keys must be valid option values,
+	 *   and the array values are the extra attributes for the corresponding option tags. For example,
+	 *
+	 * ~~~
+	 * array(
+	 *     'value1' => array('disabled' => true),
+	 *     'value2' => array('label' => 'value 2'),
+	 * );
+	 * ~~~
+	 *
+	 * - groups: array, the attributes for the optgroup tags. The structure of this is similar to that of 'options',
+	 *   except that the array keys represent the optgroup labels specified in $items.
+	 *
+	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will
+	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
+	 *
+	 * @return string the generated drop-down list tag
+	 */
+	public static function activeDropDownList($model, $attribute, $items, $options = array())
+	{
+		$name = isset($options['name']) ? $options['name'] : static::getInputName($model, $attribute);
+		$checked = static::getAttributeValue($model, $attribute);
+		if (!array_key_exists('id', $options)) {
+			$options['id'] = static::getInputId($model, $attribute);
+		}
+		return static::dropDownList($name, $checked, $items, $options);
+	}
+
+	/**
+	 * Generates a list box.
+	 * The selection of the list box is taken from the value of the model attribute.
+	 * @param Model $model the model object
+	 * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format
+	 * about attribute expression.
+	 * @param array $items the option data items. The array keys are option values, and the array values
+	 * are the corresponding option labels. The array can also be nested (i.e. some array values are arrays too).
+	 * For each sub-array, an option group will be generated whose label is the key associated with the sub-array.
+	 * If you have a list of data models, you may convert them into the format described above using
+	 * [[\yii\helpers\ArrayHelper::map()]].
+	 *
+	 * Note, the values and labels will be automatically HTML-encoded by this method, and the blank spaces in
+	 * the labels will also be HTML-encoded.
+	 * @param array $options the tag options in terms of name-value pairs. The following options are specially handled:
+	 *
+	 * - prompt: string, a prompt text to be displayed as the first option;
+	 * - options: array, the attributes for the select option tags. The array keys must be valid option values,
+	 *   and the array values are the extra attributes for the corresponding option tags. For example,
+	 *
+	 * ~~~
+	 * array(
+	 *     'value1' => array('disabled' => true),
+	 *     'value2' => array('label' => 'value 2'),
+	 * );
+	 * ~~~
+	 *
+	 * - groups: array, the attributes for the optgroup tags. The structure of this is similar to that of 'options',
+	 *   except that the array keys represent the optgroup labels specified in $items.
+	 * - unselect: string, the value that will be submitted when no option is selected.
+	 *   When this attribute is set, a hidden field will be generated so that if no option is selected in multiple
+	 *   mode, we can still obtain the posted unselect value.
+	 *
+	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will
+	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
+	 *
+	 * @return string the generated list box tag
+	 */
+	public static function activeListBox($model, $attribute, $items, $options = array())
+	{
+		$name = isset($options['name']) ? $options['name'] : static::getInputName($model, $attribute);
+		$checked = static::getAttributeValue($model, $attribute);
+		if (!array_key_exists('unselect', $options)) {
+			$options['unselect'] = '0';
+		}
+		if (!array_key_exists('id', $options)) {
+			$options['id'] = static::getInputId($model, $attribute);
+		}
+		return static::listBox($name, $checked, $items, $options);
+	}
+
+	/**
+	 * Generates a list of checkboxes.
+	 * A checkbox list allows multiple selection, like [[listBox()]].
+	 * As a result, the corresponding submitted value is an array.
+	 * The selection of the checkbox list is taken from the value of the model attribute.
+	 * @param Model $model the model object
+	 * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format
+	 * about attribute expression.
+	 * @param array $items the data item used to generate the checkboxes.
+	 * The array keys are the labels, while the array values are the corresponding checkbox values.
+	 * Note that the labels will NOT be HTML-encoded, while the values will.
+	 * @param array $options options (name => config) for the checkbox list. The following options are specially handled:
+	 *
+	 * - unselect: string, the value that should be submitted when none of the checkboxes is selected.
+	 *   By setting this option, a hidden input will be generated.
+	 * - separator: string, the HTML code that separates items.
+	 * - item: callable, a callback that can be used to customize the generation of the HTML code
+	 *   corresponding to a single item in $items. The signature of this callback must be:
+	 *
+	 * ~~~
+	 * function ($index, $label, $name, $checked, $value)
+	 * ~~~
+	 *
+	 * where $index is the zero-based index of the checkbox in the whole list; $label
+	 * is the label for the checkbox; and $name, $value and $checked represent the name,
+	 * value and the checked status of the checkbox input.
+	 * @return string the generated checkbox list
+	 */
+	public static function activeCheckboxList($model, $attribute, $items, $options = array())
+	{
+		$name = isset($options['name']) ? $options['name'] : static::getInputName($model, $attribute);
+		$checked = static::getAttributeValue($model, $attribute);
+		if (!array_key_exists('unselect', $options)) {
+			$options['unselect'] = '0';
+		}
+		return static::checkboxList($name, $checked, $items, $options);
+	}
+
+	/**
+	 * Generates a list of radio buttons.
+	 * A radio button list is like a checkbox list, except that it only allows single selection.
+	 * The selection of the radio buttons is taken from the value of the model attribute.
+	 * @param Model $model the model object
+	 * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format
+	 * about attribute expression.
+	 * @param array $items the data item used to generate the radio buttons.
+	 * The array keys are the labels, while the array values are the corresponding radio button values.
+	 * Note that the labels will NOT be HTML-encoded, while the values will.
+	 * @param array $options options (name => config) for the radio button list. The following options are specially handled:
+	 *
+	 * - unselect: string, the value that should be submitted when none of the radio buttons is selected.
+	 *   By setting this option, a hidden input will be generated.
+	 * - separator: string, the HTML code that separates items.
+	 * - item: callable, a callback that can be used to customize the generation of the HTML code
+	 *   corresponding to a single item in $items. The signature of this callback must be:
+	 *
+	 * ~~~
+	 * function ($index, $label, $name, $checked, $value)
+	 * ~~~
+	 *
+	 * where $index is the zero-based index of the radio button in the whole list; $label
+	 * is the label for the radio button; and $name, $value and $checked represent the name,
+	 * value and the checked status of the radio button input.
+	 * @return string the generated radio button list
+	 */
+	public static function activeRadioList($model, $attribute, $items, $options = array())
+	{
+		$name = isset($options['name']) ? $options['name'] : static::getInputName($model, $attribute);
+		$checked = static::getAttributeValue($model, $attribute);
+		if (!array_key_exists('unselect', $options)) {
+			$options['unselect'] = '0';
+		}
+		return static::radioList($name, $checked, $items, $options);
+	}
+
+	/**
+	 * Renders the option tags that can be used by [[dropDownList()]] and [[listBox()]].
+	 * @param string|array $selection the selected value(s). This can be either a string for single selection
+	 * or an array for multiple selections.
+	 * @param array $items the option data items. The array keys are option values, and the array values
+	 * are the corresponding option labels. The array can also be nested (i.e. some array values are arrays too).
+	 * For each sub-array, an option group will be generated whose label is the key associated with the sub-array.
+	 * If you have a list of data models, you may convert them into the format described above using
+	 * [[\yii\helpers\ArrayHelper::map()]].
+	 *
+	 * Note, the values and labels will be automatically HTML-encoded by this method, and the blank spaces in
+	 * the labels will also be HTML-encoded.
+	 * @param array $tagOptions the $options parameter that is passed to the [[dropDownList()]] or [[listBox()]] call.
+	 * This method will take out these elements, if any: "prompt", "options" and "groups". See more details
+	 * in [[dropDownList()]] for the explanation of these elements.
+	 *
+	 * @return string the generated list options
+	 */
+	public static function renderSelectOptions($selection, $items, &$tagOptions = array())
+	{
+		$lines = array();
+		if (isset($tagOptions['prompt'])) {
+			$prompt = str_replace(' ', '&nbsp;', static::encode($tagOptions['prompt']));
+			$lines[] = static::tag('option', $prompt, array('value' => ''));
+		}
+
+		$options = isset($tagOptions['options']) ? $tagOptions['options'] : array();
+		$groups = isset($tagOptions['groups']) ? $tagOptions['groups'] : array();
+		unset($tagOptions['prompt'], $tagOptions['options'], $tagOptions['groups']);
+
+		foreach ($items as $key => $value) {
+			if (is_array($value)) {
+				$groupAttrs = isset($groups[$key]) ? $groups[$key] : array();
+				$groupAttrs['label'] = $key;
+				$attrs = array('options' => $options, 'groups' => $groups);
+				$content = static::renderSelectOptions($selection, $value, $attrs);
+				$lines[] = static::tag('optgroup', "\n" . $content . "\n", $groupAttrs);
+			} else {
+				$attrs = isset($options[$key]) ? $options[$key] : array();
+				$attrs['value'] = $key;
+				$attrs['selected'] = $selection !== null &&
+					(!is_array($selection) && !strcmp($key, $selection)
+						|| is_array($selection) && in_array($key, $selection));
+				$lines[] = static::tag('option', str_replace(' ', '&nbsp;', static::encode($value)), $attrs);
+			}
+		}
+
+		return implode("\n", $lines);
+	}
+
+	/**
+	 * Renders the HTML tag attributes.
+	 * Boolean attributes such as s 'checked', 'disabled', 'readonly', will be handled specially
+	 * according to [[booleanAttributes]] and [[showBooleanAttributeValues]].
+	 * @param array $attributes attributes to be rendered. The attribute values will be HTML-encoded using [[encode()]].
+	 * Attributes whose value is null will be ignored and not put in the rendering result.
+	 * @return string the rendering result. If the attributes are not empty, they will be rendered
+	 * into a string with a leading white space (such that it can be directly appended to the tag name
+	 * in a tag. If there is no attribute, an empty string will be returned.
+	 */
+	public static function renderTagAttributes($attributes)
+	{
+		if (count($attributes) > 1) {
+			$sorted = array();
+			foreach (static::$attributeOrder as $name) {
+				if (isset($attributes[$name])) {
+					$sorted[$name] = $attributes[$name];
+				}
+			}
+			$attributes = array_merge($sorted, $attributes);
+		}
+
+		$html = '';
+		foreach ($attributes as $name => $value) {
+			if (isset(static::$booleanAttributes[strtolower($name)])) {
+				if ($value || strcasecmp($name, $value) === 0) {
+					$html .= static::$showBooleanAttributeValues ? " $name=\"$name\"" : " $name";
+				}
+			} elseif ($value !== null) {
+				$html .= " $name=\"" . static::encode($value) . '"';
+			}
+		}
+		return $html;
+	}
+
+	/**
+	 * Normalizes the input parameter to be a valid URL.
+	 *
+	 * If the input parameter
+	 *
+	 * - is an empty string: the currently requested URL will be returned;
+	 * - is a non-empty string: it will first be processed by [[Yii::getAlias()]]. If the result
+	 *   is an absolute URL, it will be returned with any change further; Otherwise, the result
+	 *   will be prefixed with [[\yii\web\Request::baseUrl]] and returned.
+	 * - is an array: the first array element is considered a route, while the rest of the name-value
+	 *   pairs are treated as the parameters to be used for URL creation using [[\yii\web\Controller::createUrl()]].
+	 *   For example: `array('post/index', 'page' => 2)`, `array('index')`.
+	 *
+	 * @param array|string $url the parameter to be used to generate a valid URL
+	 * @return string the normalized URL
+	 * @throws InvalidParamException if the parameter is invalid.
+	 */
+	public static function url($url)
+	{
+		if (is_array($url)) {
+			if (isset($url[0])) {
+				$route = $url[0];
+				$params = array_splice($url, 1);
+				if (Yii::$app->controller !== null) {
+					return Yii::$app->controller->createUrl($route, $params);
+				} else {
+					return Yii::$app->getUrlManager()->createUrl($route, $params);
+				}
+			} else {
+				throw new InvalidParamException('The array specifying a URL must contain at least one element.');
+			}
+		} elseif ($url === '') {
+			return Yii::$app->getRequest()->getUrl();
+		} else {
+			$url = Yii::getAlias($url);
+			if ($url[0] === '/' || strpos($url, '://')) {
+				return $url;
+			} else {
+				return Yii::$app->getRequest()->getBaseUrl() . '/' . $url;
+			}
+		}
+	}
+
+	/**
+	 * Returns the real attribute name from the given attribute expression.
+	 *
+	 * An attribute expression is an attribute name prefixed and/or suffixed with array indexes.
+	 * It is mainly used in tabular data input and/or input of array type. Below are some examples:
+	 *
+	 * - `[0]content` is used in tabular data input to represent the "content" attribute
+	 *   for the first model in tabular input;
+	 * - `dates[0]` represents the first array element of the "dates" attribute;
+	 * - `[0]dates[0]` represents the first array element of the "dates" attribute
+	 *   for the first model in tabular input.
+	 *
+	 * If `$attribute` has neither prefix nor suffix, it will be returned back without change.
+	 * @param string $attribute the attribute name or expression
+	 * @return string the attribute name without prefix and suffix.
+	 * @throws InvalidParamException if the attribute name contains non-word characters.
+	 */
+	public static function getAttributeName($attribute)
+	{
+		if (preg_match('/(^|.*\])(\w+)(\[.*|$)/', $attribute, $matches)) {
+			return $matches[2];
+		} else {
+			throw new InvalidParamException('Attribute name must contain word characters only.');
+		}
+	}
+
+	/**
+	 * Returns the value of the specified attribute name or expression.
+	 *
+	 * For an attribute expression like `[0]dates[0]`, this method will return the value of `$model->dates[0]`.
+	 * See [[getAttributeName()]] for more details about attribute expression.
+	 *
+	 * @param Model $model the model object
+	 * @param string $attribute the attribute name or expression
+	 * @return mixed the corresponding attribute value
+	 * @throws InvalidParamException if the attribute name contains non-word characters.
+	 */
+	public static function getAttributeValue($model, $attribute)
+	{
+		if (!preg_match('/(^|.*\])(\w+)(\[.*|$)/', $attribute, $matches)) {
+			throw new InvalidParamException('Attribute name must contain word characters only.');
+		}
+		$attribute = $matches[2];
+		$index = $matches[3];
+		if ($index === '') {
+			return $model->$attribute;
+		} else {
+			$value = $model->$attribute;
+			foreach (explode('][', trim($index, '[]')) as $id) {
+				if ((is_array($value) || $value instanceof \ArrayAccess) && isset($value[$id])) {
+					$value = $value[$id];
+				} else {
+					return null;
+				}
+			}
+			return $value;
+		}
+	}
+
+	/**
+	 * Generates an appropriate input name for the specified attribute name or expression.
+	 *
+	 * This method generates a name that can be used as the input name to collect user input
+	 * for the specified attribute. The name is generated according to the [[Model::formName|form name]]
+	 * of the model and the given attribute name. For example, if the form name of the `Post` model
+	 * is `Post`, then the input name generated for the `content` attribute would be `Post[content]`.
+	 *
+	 * See [[getAttributeName()]] for explanation of attribute expression.
+	 *
+	 * @param Model $model the model object
+	 * @param string $attribute the attribute name or expression
+	 * @return string the generated input name
+	 * @throws InvalidParamException if the attribute name contains non-word characters.
+	 */
+	public static function getInputName($model, $attribute)
+	{
+		$formName = $model->formName();
+		if (!preg_match('/(^|.*\])(\w+)(\[.*|$)/', $attribute, $matches)) {
+			throw new InvalidParamException('Attribute name must contain word characters only.');
+		}
+		$prefix = $matches[1];
+		$attribute = $matches[2];
+		$suffix = $matches[3];
+		if ($formName === '' && $prefix === '') {
+			return $attribute . $suffix;
+		} elseif ($formName !== '') {
+			return $formName . $prefix . "[$attribute]" . $suffix;
+		} else {
+			throw new InvalidParamException(get_class($model) . '::formName() cannot be empty for tabular inputs.');
+		}
+	}
+
+	/**
+	 * Generates an appropriate input ID for the specified attribute name or expression.
+	 *
+	 * This method converts the result [[getInputName()]] into a valid input ID.
+	 * For example, [[getInputName()]] returns `Post[content]`, this method will return `Post-method`.
+	 * @param Model $model the model object
+	 * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for explanation of attribute expression.
+	 * @return string the generated input ID
+	 * @throws InvalidParamException if the attribute name contains non-word characters.
+	 */
+	public static function getInputId($model, $attribute)
+	{
+		$name = strtolower(static::getInputName($model, $attribute));
+		return str_replace(array('[]', '][', '[', ']', ' '), array('', '-', '-', '', '-'), $name);
+	}
+
+}
diff --git a/yii/helpers/base/Json.php b/yii/helpers/base/Json.php
new file mode 100644
index 0000000..8de55f9
--- /dev/null
+++ b/yii/helpers/base/Json.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\helpers\base;
+
+use yii\base\InvalidParamException;
+use yii\web\JsExpression;
+
+/**
+ * Json is a helper class providing JSON data encoding and decoding.
+ * It enhances the PHP built-in functions `json_encode()` and `json_decode()`
+ * by supporting encoding JavaScript expressions and throwing exceptions when decoding fails.
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Json
+{
+	/**
+	 * Encodes the given value into a JSON string.
+	 * The method enhances `json_encode()` by supporting JavaScript expressions.
+	 * In particular, the method will not encode a JavaScript expression that is
+	 * represented in terms of a [[JsExpression]] object.
+	 * @param mixed $value the data to be encoded
+	 * @param integer $options the encoding options. For more details please refer to
+	 * [[http://www.php.net/manual/en/function.json-encode.php]]
+	 * @return string the encoding result
+	 */
+	public static function encode($value, $options = 0)
+	{
+		$expressions = array();
+		$value = static::processData($value, $expressions);
+		$json = json_encode($value, $options);
+		return empty($expressions) ? $json : strtr($json, $expressions);
+	}
+
+	/**
+	 * Decodes the given JSON string into a PHP data structure.
+	 * @param string $json the JSON string to be decoded
+	 * @param boolean $asArray whether to return objects in terms of associative arrays.
+	 * @return mixed the PHP data
+	 * @throws InvalidParamException if there is any decoding error
+	 */
+	public static function decode($json, $asArray = true)
+	{
+		if (is_array($json)) {
+			throw new InvalidParamException('Invalid JSON data.');
+		}
+		$decode = json_decode((string)$json, $asArray);
+		switch (json_last_error()) {
+			case JSON_ERROR_NONE:
+				break;
+			case JSON_ERROR_DEPTH:
+				throw new InvalidParamException('The maximum stack depth has been exceeded.');
+			case JSON_ERROR_CTRL_CHAR:
+				throw new InvalidParamException('Control character error, possibly incorrectly encoded.');
+			case JSON_ERROR_SYNTAX:
+				throw new InvalidParamException('Syntax error.');
+			case JSON_ERROR_STATE_MISMATCH:
+				throw new InvalidParamException('Invalid or malformed JSON.');
+			case JSON_ERROR_UTF8:
+				throw new InvalidParamException('Malformed UTF-8 characters, possibly incorrectly encoded.');
+			default:
+				throw new InvalidParamException('Unknown JSON decoding error.');
+		}
+
+		return $decode;
+	}
+
+	/**
+	 * Pre-processes the data before sending it to `json_encode()`.
+	 * @param mixed $data the data to be processed
+	 * @param array $expressions collection of JavaScript expressions
+	 * @return mixed the processed data
+	 */
+	protected static function processData($data, &$expressions)
+	{
+		if (is_array($data)) {
+			foreach ($data as $key => $value) {
+				if (is_array($value) || is_object($value)) {
+					$data[$key] = static::processData($value, $expressions);
+				}
+			}
+			return $data;
+		} elseif (is_object($data)) {
+			if ($data instanceof JsExpression) {
+				$token = '!{[' . count($expressions) . ']}!';
+				$expressions['"' . $token . '"'] = $data->expression;
+				return $token;
+			}
+			$result = array();
+			foreach ($data as $key => $value) {
+				if (is_array($value) || is_object($value)) {
+					$result[$key] = static::processData($value, $expressions);
+				} else {
+					$result[$key] = $value;
+				}
+			}
+			return $result;
+		} else {
+			return $data;
+		}
+	}
+}
diff --git a/yii/helpers/base/Markdown.php b/yii/helpers/base/Markdown.php
new file mode 100644
index 0000000..1efdccb
--- /dev/null
+++ b/yii/helpers/base/Markdown.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @link http://www.yiiframework.com/
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\helpers\base;
+
+use Michelf\MarkdownExtra;
+
+/**
+ * Markdown provides an ability to transform markdown into HTML.
+ *
+ * Basic usage is the following:
+ *
+ * ```php
+ * $myHtml = Markdown::process($myText);
+ * ```
+ *
+ * If you want to configure the parser:
+ *
+ * ```php
+ * $myHtml = Markdown::process($myText, array(
+ *     'fn_id_prefix' => 'footnote_',
+ * ));
+ * ```
+ *
+ * For more details please refer to [PHP Markdown library documentation](http://michelf.ca/projects/php-markdown/).
+ * @author Alexander Makarov <sam@rmcreative.ru>
+ * @since 2.0
+ */
+class Markdown
+{
+	/**
+	 * @var MarkdownExtra
+	 */
+	protected static $markdown;
+
+	public static function process($content, $config = array())
+	{
+		if (static::$markdown===null) {
+			static::$markdown = new MarkdownExtra();
+		}
+		foreach ($config as $name => $value) {
+			static::$markdown->{$name} = $value;
+		}
+		return static::$markdown->transform($content);
+	}
+}
diff --git a/yii/helpers/base/Purifier.php b/yii/helpers/base/Purifier.php
new file mode 100644
index 0000000..2c5d334
--- /dev/null
+++ b/yii/helpers/base/Purifier.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @link http://www.yiiframework.com/
+ * @license http://www.yiiframework.com/license/
+ */
+namespace yii\helpers\base;
+
+/**
+ * Purifier provides an ability to clean up HTML from any harmful code.
+ *
+ * Basic usage is the following:
+ *
+ * ```php
+ * $my_html = Purifier::process($my_text);
+ * ```
+ *
+ * If you want to configure it:
+ *
+ * ```php
+ * $my_html = Purifier::process($my_text, array(
+ *     'Attr.EnableID' => true,
+ * ));
+ * ```
+ *
+ * For more details please refer to HTMLPurifier documentation](http://htmlpurifier.org/).
+ *
+ * @author Alexander Makarov <sam@rmcreative.ru>
+ * @since 2.0
+ */
+class Purifier
+{
+	public static function process($content, $config = null)
+	{
+		$purifier=\HTMLPurifier::instance($config);
+		$purifier->config->set('Cache.SerializerPath', \Yii::$app->getRuntimePath());
+		return $purifier->purify($content);
+	}
+}
diff --git a/yii/helpers/base/SecurityHelper.php b/yii/helpers/base/SecurityHelper.php
new file mode 100644
index 0000000..3f69fee
--- /dev/null
+++ b/yii/helpers/base/SecurityHelper.php
@@ -0,0 +1,275 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\helpers\base;
+
+use Yii;
+use yii\base\Exception;
+use yii\base\InvalidConfigException;
+use yii\base\InvalidParamException;
+
+/**
+ * SecurityHelper provides a set of methods to handle common security-related tasks.
+ *
+ * In particular, SecurityHelper supports the following features:
+ *
+ * - Encryption/decryption: [[encrypt()]] and [[decrypt()]]
+ * - Data tampering prevention: [[hashData()]] and [[validateData()]]
+ * - Password validation: [[generatePasswordHash()]] and [[validatePassword()]]
+ *
+ * Additionally, SecurityHelper provides [[getSecretKey()]] to support generating
+ * named secret keys. These secret keys, once generated, will be stored in a file
+ * and made available in future requests.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Tom Worster <fsb@thefsb.org>
+ * @since 2.0
+ */
+class SecurityHelper
+{
+	/**
+	 * Encrypts data.
+	 * @param string $data data to be encrypted.
+	 * @param string $key the encryption secret key
+	 * @return string the encrypted data
+	 * @throws Exception if PHP Mcrypt extension is not loaded or failed to be initialized
+	 * @see decrypt()
+	 */
+	public static function encrypt($data, $key)
+	{
+		$module = static::openCryptModule();
+		// 192-bit (24 bytes) key size
+		$key = StringHelper::substr($key, 0, 24);
+		srand();
+		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($module), MCRYPT_RAND);
+		mcrypt_generic_init($module, $key, $iv);
+		$encrypted = $iv . mcrypt_generic($module, $data);
+		mcrypt_generic_deinit($module);
+		mcrypt_module_close($module);
+		return $encrypted;
+	}
+
+	/**
+	 * Decrypts data
+	 * @param string $data data to be decrypted.
+	 * @param string $key the decryption secret key
+	 * @return string the decrypted data
+	 * @throws Exception if PHP Mcrypt extension is not loaded or failed to be initialized
+	 * @see encrypt()
+	 */
+	public static function decrypt($data, $key)
+	{
+		$module = static::openCryptModule();
+		// 192-bit (24 bytes) key size
+		$key = StringHelper::substr($key, 0, 24);
+		$ivSize = mcrypt_enc_get_iv_size($module);
+		$iv = StringHelper::substr($data, 0, $ivSize);
+		mcrypt_generic_init($module, $key, $iv);
+		$decrypted = mdecrypt_generic($module, StringHelper::substr($data, $ivSize, StringHelper::strlen($data)));
+		mcrypt_generic_deinit($module);
+		mcrypt_module_close($module);
+		return rtrim($decrypted, "\0");
+	}
+
+	/**
+	 * Prefixes data with a keyed hash value so that it can later be detected if it is tampered.
+	 * @param string $data the data to be protected
+	 * @param string $key the secret key to be used for generating hash
+	 * @param string $algorithm the hashing algorithm (e.g. "md5", "sha1", "sha256", etc.). Call PHP "hash_algos()"
+	 * function to see the supported hashing algorithms on your system.
+	 * @return string the data prefixed with the keyed hash
+	 * @see validateData()
+	 * @see getSecretKey()
+	 */
+	public static function hashData($data, $key, $algorithm = 'sha256')
+	{
+		return hash_hmac($algorithm, $data, $key) . $data;
+	}
+
+	/**
+	 * Validates if the given data is tampered.
+	 * @param string $data the data to be validated. The data must be previously
+	 * generated by [[hashData()]].
+	 * @param string $key the secret key that was previously used to generate the hash for the data in [[hashData()]].
+	 * @param string $algorithm the hashing algorithm (e.g. "md5", "sha1", "sha256", etc.). Call PHP "hash_algos()"
+	 * function to see the supported hashing algorithms on your system. This must be the same
+	 * as the value passed to [[hashData()]] when generating the hash for the data.
+	 * @return string the real data with the hash stripped off. False if the data is tampered.
+	 * @see hashData()
+	 */
+	public static function validateData($data, $key, $algorithm = 'sha256')
+	{
+		$hashSize = StringHelper::strlen(hash_hmac($algorithm, 'test', $key));
+		$n = StringHelper::strlen($data);
+		if ($n >= $hashSize) {
+			$hash = StringHelper::substr($data, 0, $hashSize);
+			$data2 = StringHelper::substr($data, $hashSize, $n - $hashSize);
+			return $hash === hash_hmac($algorithm, $data2, $key) ? $data2 : false;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Returns a secret key associated with the specified name.
+	 * If the secret key does not exist, a random key will be generated
+	 * and saved in the file "keys.php" under the application's runtime directory
+	 * so that the same secret key can be returned in future requests.
+	 * @param string $name the name that is associated with the secret key
+	 * @param integer $length the length of the key that should be generated if not exists
+	 * @return string the secret key associated with the specified name
+	 */
+	public static function getSecretKey($name, $length = 32)
+	{
+		static $keys;
+		$keyFile = Yii::$app->getRuntimePath() . '/keys.php';
+		if ($keys === null) {
+			$keys = is_file($keyFile) ? require($keyFile) : array();
+		}
+		if (!isset($keys[$name])) {
+			// generate a 32-char random key
+			$chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+			$keys[$name] = substr(str_shuffle(str_repeat($chars, 5)), 0, $length);
+			file_put_contents($keyFile, "<?php\nreturn " . var_export($keys, true) . ";\n");
+		}
+		return $keys[$name];
+	}
+
+	/**
+	 * Opens the mcrypt module.
+	 * @return resource the mcrypt module handle.
+	 * @throws InvalidConfigException if mcrypt extension is not installed
+	 * @throws Exception if mcrypt initialization fails
+	 */
+	protected static function openCryptModule()
+	{
+		if (!extension_loaded('mcrypt')) {
+			throw new InvalidConfigException('The mcrypt PHP extension is not installed.');
+		}
+		// AES uses a 128-bit block size
+		$module = @mcrypt_module_open('rijndael-128', '', 'cbc', '');
+		if ($module === false) {
+			throw new Exception('Failed to initialize the mcrypt module.');
+		}
+		return $module;
+	}
+
+	/**
+	 * Generates a secure hash from a password and a random salt.
+	 *
+	 * The generated hash can be stored in database (e.g. `CHAR(64) CHARACTER SET latin1` on MySQL).
+	 * Later when a password needs to be validated, the hash can be fetched and passed
+	 * to [[validatePassword()]]. For example,
+	 *
+	 * ~~~
+	 * // generates the hash (usually done during user registration or when the password is changed)
+	 * $hash = SecurityHelper::generatePasswordHash($password);
+	 * // ...save $hash in database...
+	 *
+	 * // during login, validate if the password entered is correct using $hash fetched from database
+	 * if (SecurityHelper::verifyPassword($password, $hash) {
+	 *     // password is good
+	 * } else {
+	 *     // password is bad
+	 * }
+	 * ~~~
+	 *
+	 * @param string $password The password to be hashed.
+	 * @param integer $cost Cost parameter used by the Blowfish hash algorithm.
+	 * The higher the value of cost,
+	 * the longer it takes to generate the hash and to verify a password against it. Higher cost
+	 * therefore slows down a brute-force attack. For best protection against brute for attacks,
+	 * set it to the highest value that is tolerable on production servers. The time taken to
+	 * compute the hash doubles for every increment by one of $cost. So, for example, if the
+	 * hash takes 1 second to compute when $cost is 14 then then the compute time varies as
+	 * 2^($cost - 14) seconds.
+	 * @throws Exception on bad password parameter or cost parameter
+	 * @return string The password hash string, ASCII and not longer than 64 characters.
+	 * @see validatePassword()
+	 */
+	public static function generatePasswordHash($password, $cost = 13)
+	{
+		$salt = static::generateSalt($cost);
+		$hash = crypt($password, $salt);
+
+		if (!is_string($hash) || strlen($hash) < 32) {
+			throw new Exception('Unknown error occurred while generating hash.');
+		}
+
+		return $hash;
+	}
+
+	/**
+	 * Verifies a password against a hash.
+	 * @param string $password The password to verify.
+	 * @param string $hash The hash to verify the password against.
+	 * @return boolean whether the password is correct.
+	 * @throws InvalidParamException on bad password or hash parameters or if crypt() with Blowfish hash is not available.
+	 * @see generatePasswordHash()
+	 */
+	public static function validatePassword($password, $hash)
+	{
+		if (!is_string($password) || $password === '') {
+			throw new InvalidParamException('Password must be a string and cannot be empty.');
+		}
+
+		if (!preg_match('/^\$2[axy]\$(\d\d)\$[\.\/0-9A-Za-z]{22}/', $hash, $matches) || $matches[1] < 4 || $matches[1] > 30) {
+			throw new InvalidParamException('Hash is invalid.');
+		}
+
+		$test = crypt($password, $hash);
+		$n = strlen($test);
+		if (strlen($test) < 32 || $n !== strlen($hash)) {
+			return false;
+		}
+
+		// Use a for-loop to compare two strings to prevent timing attacks. See:
+		// http://codereview.stackexchange.com/questions/13512
+		$check = 0;
+		for ($i = 0; $i < $n; ++$i) {
+			$check |= (ord($test[$i]) ^ ord($hash[$i]));
+		}
+
+		return $check === 0;
+	}
+
+	/**
+	 * Generates a salt that can be used to generate a password hash.
+	 *
+	 * The PHP [crypt()](http://php.net/manual/en/function.crypt.php) built-in function
+	 * requires, for the Blowfish hash algorithm, a salt string in a specific format:
+	 * "$2a$", "$2x$" or "$2y$", a two digit cost parameter, "$", and 22 characters
+	 * from the alphabet "./0-9A-Za-z".
+	 *
+	 * @param integer $cost the cost parameter
+	 * @return string the random salt value.
+	 * @throws InvalidParamException if the cost parameter is not between 4 and 30
+	 */
+	protected static function generateSalt($cost = 13)
+	{
+		$cost = (int)$cost;
+		if ($cost < 4 || $cost > 30) {
+			throw new InvalidParamException('Cost must be between 4 and 31.');
+		}
+
+		// Get 20 * 8bits of pseudo-random entropy from mt_rand().
+		$rand = '';
+		for ($i = 0; $i < 20; ++$i) {
+			$rand .= chr(mt_rand(0, 255));
+		}
+
+		// Add the microtime for a little more entropy.
+		$rand .= microtime();
+		// Mix the bits cryptographically into a 20-byte binary string.
+		$rand = sha1($rand, true);
+		// Form the prefix that specifies Blowfish algorithm and cost parameter.
+		$salt = sprintf("$2y$%02d$", $cost);
+		// Append the random salt data in the required base64 format.
+		$salt .= str_replace('+', '.', substr(base64_encode($rand), 0, 22));
+		return $salt;
+	}
+}
diff --git a/yii/helpers/base/StringHelper.php b/yii/helpers/base/StringHelper.php
new file mode 100644
index 0000000..646bcbb
--- /dev/null
+++ b/yii/helpers/base/StringHelper.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\helpers\base;
+
+/**
+ * StringHelper
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Alex Makarov <sam@rmcreative.ru>
+ * @since 2.0
+ */
+class StringHelper
+{
+	/**
+	 * Returns the number of bytes in the given string.
+	 * This method ensures the string is treated as a byte array.
+	 * It will use `mb_strlen()` if it is available.
+	 * @param string $string the string being measured for length
+	 * @return integer the number of bytes in the given string.
+	 */
+	public static function strlen($string)
+	{
+		return function_exists('mb_strlen') ? mb_strlen($string, '8bit') : strlen($string);
+	}
+
+	/**
+	 * Returns the portion of string specified by the start and length parameters.
+	 * This method ensures the string is treated as a byte array.
+	 * It will use `mb_substr()` if it is available.
+	 * @param string $string the input string. Must be one character or longer.
+	 * @param integer $start the starting position
+	 * @param integer $length the desired portion length
+	 * @return string the extracted part of string, or FALSE on failure or an empty string.
+	 * @see http://www.php.net/manual/en/function.substr.php
+	 */
+	public static function substr($string, $start, $length)
+	{
+		return function_exists('mb_substr') ? mb_substr($string, $start, $length, '8bit') : substr($string, $start, $length);
+	}
+
+	/**
+	 * Returns the trailing name component of a path.
+	 * This method does the same as the php function basename() except that it will
+	 * always use \ and / as directory separators, independent of the operating system.
+	 * Note: basename() operates naively on the input string, and is not aware of the
+	 * actual filesystem, or path components such as "..".
+	 * @param string $path A path string.
+	 * @param string $suffix If the name component ends in suffix this will also be cut off.
+	 * @return string the trailing name component of the given path.
+	 * @see http://www.php.net/manual/en/function.basename.php
+	 */
+	public static function basename($path, $suffix = '')
+	{
+		if (($len = mb_strlen($suffix)) > 0 && mb_substr($path, -$len) == $suffix) {
+			$path = mb_substr($path, 0, -$len);
+		}
+		$path = rtrim(str_replace('\\', '/', $path), '/\\');
+		if (($pos = mb_strrpos($path, '/')) !== false) {
+			return mb_substr($path, $pos + 1);
+		}
+		return $path;
+	}
+
+	/**
+	 * Converts a word to its plural form.
+	 * Note that this is for English only!
+	 * For example, 'apple' will become 'apples', and 'child' will become 'children'.
+	 * @param string $name the word to be pluralized
+	 * @return string the pluralized word
+	 */
+	public static function pluralize($name)
+	{
+		static $rules = array(
+			'/(m)ove$/i' => '\1oves',
+			'/(f)oot$/i' => '\1eet',
+			'/(c)hild$/i' => '\1hildren',
+			'/(h)uman$/i' => '\1umans',
+			'/(m)an$/i' => '\1en',
+			'/(s)taff$/i' => '\1taff',
+			'/(t)ooth$/i' => '\1eeth',
+			'/(p)erson$/i' => '\1eople',
+			'/([m|l])ouse$/i' => '\1ice',
+			'/(x|ch|ss|sh|us|as|is|os)$/i' => '\1es',
+			'/([^aeiouy]|qu)y$/i' => '\1ies',
+			'/(?:([^f])fe|([lr])f)$/i' => '\1\2ves',
+			'/(shea|lea|loa|thie)f$/i' => '\1ves',
+			'/([ti])um$/i' => '\1a',
+			'/(tomat|potat|ech|her|vet)o$/i' => '\1oes',
+			'/(bu)s$/i' => '\1ses',
+			'/(ax|test)is$/i' => '\1es',
+			'/s$/' => 's',
+		);
+		foreach ($rules as $rule => $replacement) {
+			if (preg_match($rule, $name)) {
+				return preg_replace($rule, $replacement, $name);
+			}
+		}
+		return $name . 's';
+	}
+
+	/**
+	 * Converts a CamelCase name into space-separated words.
+	 * For example, 'PostTag' will be converted to 'Post Tag'.
+	 * @param string $name the string to be converted
+	 * @param boolean $ucwords whether to capitalize the first letter in each word
+	 * @return string the resulting words
+	 */
+	public static function camel2words($name, $ucwords = true)
+	{
+		$label = trim(strtolower(str_replace(array('-', '_', '.'), ' ', preg_replace('/(?<![A-Z])[A-Z]/', ' \0', $name))));
+		return $ucwords ? ucwords($label) : $label;
+	}
+
+	/**
+	 * Converts a CamelCase name into an ID in lowercase.
+	 * Words in the ID may be concatenated using the specified character (defaults to '-').
+	 * For example, 'PostTag' will be converted to 'post-tag'.
+	 * @param string $name the string to be converted
+	 * @param string $separator the character used to concatenate the words in the ID
+	 * @return string the resulting ID
+	 */
+	public static function camel2id($name, $separator = '-')
+	{
+		if ($separator === '_') {
+			return trim(strtolower(preg_replace('/(?<![A-Z])[A-Z]/', '_\0', $name)), '_');
+		} else {
+			return trim(strtolower(str_replace('_', $separator, preg_replace('/(?<![A-Z])[A-Z]/', $separator . '\0', $name))), $separator);
+		}
+	}
+
+	/**
+	 * Converts an ID into a CamelCase name.
+	 * Words in the ID separated by `$separator` (defaults to '-') will be concatenated into a CamelCase name.
+	 * For example, 'post-tag' is converted to 'PostTag'.
+	 * @param string $id the ID to be converted
+	 * @param string $separator the character used to separate the words in the ID
+	 * @return string the resulting CamelCase name
+	 */
+	public static function id2camel($id, $separator = '-')
+	{
+		return str_replace(' ', '', ucwords(implode(' ', explode($separator, $id))));
+	}
+}
diff --git a/yii/helpers/base/VarDumper.php b/yii/helpers/base/VarDumper.php
new file mode 100644
index 0000000..730aafe
--- /dev/null
+++ b/yii/helpers/base/VarDumper.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\helpers\base;
+
+/**
+ * VarDumper is intended to replace the buggy PHP function var_dump and print_r.
+ * It can correctly identify the recursively referenced objects in a complex
+ * object structure. It also has a recursive depth control to avoid indefinite
+ * recursive display of some peculiar variables.
+ *
+ * VarDumper can be used as follows,
+ *
+ * ~~~
+ * VarDumper::dump($var);
+ * ~~~
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class VarDumper
+{
+	private static $_objects;
+	private static $_output;
+	private static $_depth;
+
+	/**
+	 * Displays a variable.
+	 * This method achieves the similar functionality as var_dump and print_r
+	 * but is more robust when handling complex objects such as Yii controllers.
+	 * @param mixed $var variable to be dumped
+	 * @param integer $depth maximum depth that the dumper should go into the variable. Defaults to 10.
+	 * @param boolean $highlight whether the result should be syntax-highlighted
+	 */
+	public static function dump($var, $depth = 10, $highlight = false)
+	{
+		echo static::dumpAsString($var, $depth, $highlight);
+	}
+
+	/**
+	 * Dumps a variable in terms of a string.
+	 * This method achieves the similar functionality as var_dump and print_r
+	 * but is more robust when handling complex objects such as Yii controllers.
+	 * @param mixed $var variable to be dumped
+	 * @param integer $depth maximum depth that the dumper should go into the variable. Defaults to 10.
+	 * @param boolean $highlight whether the result should be syntax-highlighted
+	 * @return string the string representation of the variable
+	 */
+	public static function dumpAsString($var, $depth = 10, $highlight = false)
+	{
+		self::$_output = '';
+		self::$_objects = array();
+		self::$_depth = $depth;
+		self::dumpInternal($var, 0);
+		if ($highlight) {
+			$result = highlight_string("<?php\n" . self::$_output, true);
+			self::$_output = preg_replace('/&lt;\\?php<br \\/>/', '', $result, 1);
+		}
+		return self::$_output;
+	}
+
+	/**
+	 * @param mixed $var variable to be dumped
+	 * @param integer $level depth level
+	 */
+	private static function dumpInternal($var, $level)
+	{
+		switch (gettype($var)) {
+			case 'boolean':
+				self::$_output .= $var ? 'true' : 'false';
+				break;
+			case 'integer':
+				self::$_output .= "$var";
+				break;
+			case 'double':
+				self::$_output .= "$var";
+				break;
+			case 'string':
+				self::$_output .= "'" . addslashes($var) . "'";
+				break;
+			case 'resource':
+				self::$_output .= '{resource}';
+				break;
+			case 'NULL':
+				self::$_output .= "null";
+				break;
+			case 'unknown type':
+				self::$_output .= '{unknown}';
+				break;
+			case 'array':
+				if (self::$_depth <= $level) {
+					self::$_output .= 'array(...)';
+				} elseif (empty($var)) {
+					self::$_output .= 'array()';
+				} else {
+					$keys = array_keys($var);
+					$spaces = str_repeat(' ', $level * 4);
+					self::$_output .= "array\n" . $spaces . '(';
+					foreach ($keys as $key) {
+						self::$_output .= "\n" . $spaces . '    ';
+						self::dumpInternal($key, 0);
+						self::$_output .= ' => ';
+						self::dumpInternal($var[$key], $level + 1);
+					}
+					self::$_output .= "\n" . $spaces . ')';
+				}
+				break;
+			case 'object':
+				if (($id = array_search($var, self::$_objects, true)) !== false) {
+					self::$_output .= get_class($var) . '#' . ($id + 1) . '(...)';
+				} elseif (self::$_depth <= $level) {
+					self::$_output .= get_class($var) . '(...)';
+				} else {
+					$id = array_push(self::$_objects, $var);
+					$className = get_class($var);
+					$members = (array)$var;
+					$spaces = str_repeat(' ', $level * 4);
+					self::$_output .= "$className#$id\n" . $spaces . '(';
+					foreach ($members as $key => $value) {
+						$keyDisplay = strtr(trim($key), array("\0" => ':'));
+						self::$_output .= "\n" . $spaces . "    [$keyDisplay] => ";
+						self::dumpInternal($value, $level + 1);
+					}
+					self::$_output .= "\n" . $spaces . ')';
+				}
+				break;
+		}
+	}
+}
diff --git a/yii/helpers/base/mimeTypes.php b/yii/helpers/base/mimeTypes.php
new file mode 100644
index 0000000..ffdba4b
--- /dev/null
+++ b/yii/helpers/base/mimeTypes.php
@@ -0,0 +1,187 @@
+<?php
+/**
+ * MIME types.
+ *
+ * This file contains most commonly used MIME types
+ * according to file extension names.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ * @since 2.0
+ */
+
+return array(
+	'ai' => 'application/postscript',
+	'aif' => 'audio/x-aiff',
+	'aifc' => 'audio/x-aiff',
+	'aiff' => 'audio/x-aiff',
+	'anx' => 'application/annodex',
+	'asc' => 'text/plain',
+	'au' => 'audio/basic',
+	'avi' => 'video/x-msvideo',
+	'axa' => 'audio/annodex',
+	'axv' => 'video/annodex',
+	'bcpio' => 'application/x-bcpio',
+	'bin' => 'application/octet-stream',
+	'bmp' => 'image/bmp',
+	'c' => 'text/plain',
+	'cc' => 'text/plain',
+	'ccad' => 'application/clariscad',
+	'cdf' => 'application/x-netcdf',
+	'class' => 'application/octet-stream',
+	'cpio' => 'application/x-cpio',
+	'cpt' => 'application/mac-compactpro',
+	'csh' => 'application/x-csh',
+	'css' => 'text/css',
+	'dcr' => 'application/x-director',
+	'dir' => 'application/x-director',
+	'dms' => 'application/octet-stream',
+	'doc' => 'application/msword',
+	'drw' => 'application/drafting',
+	'dvi' => 'application/x-dvi',
+	'dwg' => 'application/acad',
+	'dxf' => 'application/dxf',
+	'dxr' => 'application/x-director',
+	'eps' => 'application/postscript',
+	'etx' => 'text/x-setext',
+	'exe' => 'application/octet-stream',
+	'ez' => 'application/andrew-inset',
+	'f' => 'text/plain',
+	'f90' => 'text/plain',
+	'flac' => 'audio/flac',
+	'fli' => 'video/x-fli',
+	'flv' => 'video/x-flv',
+	'gif' => 'image/gif',
+	'gtar' => 'application/x-gtar',
+	'gz' => 'application/x-gzip',
+	'h' => 'text/plain',
+	'hdf' => 'application/x-hdf',
+	'hh' => 'text/plain',
+	'hqx' => 'application/mac-binhex40',
+	'htm' => 'text/html',
+	'html' => 'text/html',
+	'ice' => 'x-conference/x-cooltalk',
+	'ief' => 'image/ief',
+	'iges' => 'model/iges',
+	'igs' => 'model/iges',
+	'ips' => 'application/x-ipscript',
+	'ipx' => 'application/x-ipix',
+	'jpe' => 'image/jpeg',
+	'jpeg' => 'image/jpeg',
+	'jpg' => 'image/jpeg',
+	'js' => 'application/x-javascript',
+	'kar' => 'audio/midi',
+	'latex' => 'application/x-latex',
+	'lha' => 'application/octet-stream',
+	'lsp' => 'application/x-lisp',
+	'lzh' => 'application/octet-stream',
+	'm' => 'text/plain',
+	'man' => 'application/x-troff-man',
+	'me' => 'application/x-troff-me',
+	'mesh' => 'model/mesh',
+	'mid' => 'audio/midi',
+	'midi' => 'audio/midi',
+	'mif' => 'application/vnd.mif',
+	'mime' => 'www/mime',
+	'mov' => 'video/quicktime',
+	'movie' => 'video/x-sgi-movie',
+	'mp2' => 'audio/mpeg',
+	'mp3' => 'audio/mpeg',
+	'mpe' => 'video/mpeg',
+	'mpeg' => 'video/mpeg',
+	'mpg' => 'video/mpeg',
+	'mpga' => 'audio/mpeg',
+	'ms' => 'application/x-troff-ms',
+	'msh' => 'model/mesh',
+	'nc' => 'application/x-netcdf',
+	'oga' => 'audio/ogg',
+	'ogg' => 'audio/ogg',
+	'ogv' => 'video/ogg',
+	'ogx' => 'application/ogg',
+	'oda' => 'application/oda',
+	'pbm' => 'image/x-portable-bitmap',
+	'pdb' => 'chemical/x-pdb',
+	'pdf' => 'application/pdf',
+	'pgm' => 'image/x-portable-graymap',
+	'pgn' => 'application/x-chess-pgn',
+	'png' => 'image/png',
+	'pnm' => 'image/x-portable-anymap',
+	'pot' => 'application/mspowerpoint',
+	'ppm' => 'image/x-portable-pixmap',
+	'pps' => 'application/mspowerpoint',
+	'ppt' => 'application/mspowerpoint',
+	'ppz' => 'application/mspowerpoint',
+	'pre' => 'application/x-freelance',
+	'prt' => 'application/pro_eng',
+	'ps' => 'application/postscript',
+	'qt' => 'video/quicktime',
+	'ra' => 'audio/x-realaudio',
+	'ram' => 'audio/x-pn-realaudio',
+	'ras' => 'image/cmu-raster',
+	'rgb' => 'image/x-rgb',
+	'rm' => 'audio/x-pn-realaudio',
+	'roff' => 'application/x-troff',
+	'rpm' => 'audio/x-pn-realaudio-plugin',
+	'rtf' => 'text/rtf',
+	'rtx' => 'text/richtext',
+	'scm' => 'application/x-lotusscreencam',
+	'set' => 'application/set',
+	'sgm' => 'text/sgml',
+	'sgml' => 'text/sgml',
+	'sh' => 'application/x-sh',
+	'shar' => 'application/x-shar',
+	'silo' => 'model/mesh',
+	'sit' => 'application/x-stuffit',
+	'skd' => 'application/x-koan',
+	'skm' => 'application/x-koan',
+	'skp' => 'application/x-koan',
+	'skt' => 'application/x-koan',
+	'smi' => 'application/smil',
+	'smil' => 'application/smil',
+	'snd' => 'audio/basic',
+	'sol' => 'application/solids',
+	'spl' => 'application/x-futuresplash',
+	'spx' => 'audio/ogg',
+	'src' => 'application/x-wais-source',
+	'step' => 'application/STEP',
+	'stl' => 'application/SLA',
+	'stp' => 'application/STEP',
+	'sv4cpio' => 'application/x-sv4cpio',
+	'sv4crc' => 'application/x-sv4crc',
+	'swf' => 'application/x-shockwave-flash',
+	't' => 'application/x-troff',
+	'tar' => 'application/x-tar',
+	'tcl' => 'application/x-tcl',
+	'tex' => 'application/x-tex',
+	'texi' => 'application/x-texinfo',
+	'texinfo' => 'application/x-texinfo',
+	'tif' => 'image/tiff',
+	'tiff' => 'image/tiff',
+	'tr' => 'application/x-troff',
+	'tsi' => 'audio/TSP-audio',
+	'tsp' => 'application/dsptype',
+	'tsv' => 'text/tab-separated-values',
+	'txt' => 'text/plain',
+	'unv' => 'application/i-deas',
+	'ustar' => 'application/x-ustar',
+	'vcd' => 'application/x-cdlink',
+	'vda' => 'application/vda',
+	'viv' => 'video/vnd.vivo',
+	'vivo' => 'video/vnd.vivo',
+	'vrml' => 'model/vrml',
+	'wav' => 'audio/x-wav',
+	'wrl' => 'model/vrml',
+	'xbm' => 'image/x-xbitmap',
+	'xlc' => 'application/vnd.ms-excel',
+	'xll' => 'application/vnd.ms-excel',
+	'xlm' => 'application/vnd.ms-excel',
+	'xls' => 'application/vnd.ms-excel',
+	'xlw' => 'application/vnd.ms-excel',
+	'xml' => 'application/xml',
+	'xpm' => 'image/x-xpixmap',
+	'xspf' => 'application/xspf+xml',
+	'xwd' => 'image/x-xwindowdump',
+	'xyz' => 'chemical/x-pdb',
+	'zip' => 'application/zip',
+);
diff --git a/yii/i18n/I18N.php b/yii/i18n/I18N.php
new file mode 100644
index 0000000..7fae5b0
--- /dev/null
+++ b/yii/i18n/I18N.php
@@ -0,0 +1,198 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\i18n;
+
+use Yii;
+use yii\base\Component;
+use yii\base\InvalidConfigException;
+use yii\base\InvalidParamException;
+
+/**
+ * I18N provides features related with internationalization (I18N) and localization (L10N).
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class I18N extends Component
+{
+	/**
+	 * @var array list of [[MessageSource]] configurations or objects. The array keys are message
+	 * categories, and the array values are the corresponding [[MessageSource]] objects or the configurations
+	 * for creating the [[MessageSource]] objects. The message categories can contain the wildcard '*' at the end
+	 * to match multiple categories with the same prefix. For example, 'app\*' matches both 'app\cat1' and 'app\cat2'.
+	 *
+	 * This property may be modified on the fly by extensions who want to have their own message sources
+	 * registered under their own namespaces.
+	 *
+	 * The category "yii" and "app" are always defined. The former refers to the messages used in the Yii core
+	 * framework code, while the latter refers to the default message category for custom application code.
+	 * By default, both of these categories use [[PhpMessageSource]] and the corresponding message files are
+	 * stored under "@yii/messages" and "@app/messages", respectively.
+	 *
+	 * You may override the configuration of both categories.
+	 */
+	public $translations;
+	/**
+	 * @var string the path or path alias of the file that contains the plural rules.
+	 * By default, this refers to a file shipped with the Yii distribution. The file is obtained
+	 * by converting from the data file in the CLDR project.
+	 *
+	 * If the default rule file does not contain the expected rules, you may copy and modify it
+	 * for your application, and then configure this property to point to your modified copy.
+	 *
+	 * @see http://www.unicode.org/cldr/charts/supplemental/language_plural_rules.html
+	 */
+	public $pluralRuleFile = '@yii/i18n/data/plurals.php';
+
+	/**
+	 * Initializes the component by configuring the default message categories.
+	 */
+	public function init()
+	{
+		parent::init();
+		if (!isset($this->translations['yii'])) {
+			$this->translations['yii'] = array(
+				'class' => 'yii\i18n\PhpMessageSource',
+				'sourceLanguage' => 'en_US',
+				'basePath' => '@yii/messages',
+			);
+		}
+		if (!isset($this->translations['app'])) {
+			$this->translations['app'] = array(
+				'class' => 'yii\i18n\PhpMessageSource',
+				'sourceLanguage' => 'en_US',
+				'basePath' => '@app/messages',
+			);
+		}
+	}
+
+	/**
+	 * Translates a message to the specified language.
+	 * If the first parameter in `$params` is a number and it is indexed by 0, appropriate plural rules
+	 * will be applied to the translated message.
+	 * @param string $message the message to be translated.
+	 * @param array $params the parameters that will be used to replace the corresponding placeholders in the message.
+	 * @param string $language the language code (e.g. `en_US`, `en`). If this is null, the current
+	 * [[\yii\base\Application::language|application language]] will be used.
+	 * @return string the translated message.
+	 */
+	public function translate($message, $params = array(), $language = null)
+	{
+		if ($language === null) {
+			$language = Yii::$app->language;
+		}
+
+		// allow chars for category: word chars, ".", "-", "/","\"
+		if (strpos($message, '|') !== false && preg_match('/^([\w\-\\/\.\\\\]+)\|(.*)/', $message, $matches)) {
+			$category = $matches[1];
+			$message = $matches[2];
+		} else {
+			$category = 'app';
+		}
+
+		$message = $this->getMessageSource($category)->translate($category, $message, $language);
+
+		if (!is_array($params)) {
+			$params = array($params);
+		}
+
+		if (isset($params[0])) {
+			$message = $this->applyPluralRules($message, $params[0], $language);
+			if (!isset($params['{n}'])) {
+				$params['{n}'] = $params[0];
+			}
+			unset($params[0]);
+		}
+
+		return empty($params) ? $message : strtr($message, $params);
+	}
+
+	/**
+	 * Returns the message source for the given category.
+	 * @param string $category the category name.
+	 * @return MessageSource the message source for the given category.
+	 * @throws InvalidConfigException if there is no message source available for the specified category.
+	 */
+	public function getMessageSource($category)
+	{
+		if (isset($this->translations[$category])) {
+			$source = $this->translations[$category];
+		} else {
+			// try wildcard matching
+			foreach ($this->translations as $pattern => $config) {
+				if (substr($pattern, -1) === '*' && strpos($category, rtrim($pattern, '*')) === 0) {
+					$source = $config;
+					break;
+				}
+			}
+		}
+		if (isset($source)) {
+			return $source instanceof MessageSource ? $source : Yii::createObject($source);
+		} else {
+			throw new InvalidConfigException("Unable to locate message source for category '$category'.");
+		}
+	}
+
+	/**
+	 * Applies appropriate plural rules to the given message.
+	 * @param string $message the message to be applied with plural rules
+	 * @param mixed $number the number by which plural rules will be applied
+	 * @param string $language the language code that determines which set of plural rules to be applied.
+	 * @return string the message that has applied plural rules
+	 */
+	protected function applyPluralRules($message, $number, $language)
+	{
+		if (strpos($message, '|') === false) {
+			return $message;
+		}
+		$chunks = explode('|', $message);
+
+		$rules = $this->getPluralRules($language);
+		foreach ($rules as $i => $rule) {
+			if (isset($chunks[$i]) && $this->evaluate($rule, $number)) {
+				return $chunks[$i];
+			}
+		}
+		$n = count($rules);
+		return isset($chunks[$n]) ? $chunks[$n] : $chunks[0];
+	}
+
+	private $_pluralRules = array(); // language => rule set
+
+	/**
+	 * Returns the plural rules for the given language code.
+	 * @param string $language the language code (e.g. `en_US`, `en`).
+	 * @return array the plural rules
+	 * @throws InvalidParamException if the language code is invalid.
+	 */
+	protected function getPluralRules($language)
+	{
+		if (isset($this->_pluralRules[$language])) {
+			return $this->_pluralRules;
+		}
+		$allRules = require(Yii::getAlias($this->pluralRuleFile));
+		if (isset($allRules[$language])) {
+			return $this->_pluralRules[$language] = $allRules[$language];
+		} elseif (preg_match('/^[a-z]+/', strtolower($language), $matches)) {
+			return $this->_pluralRules[$language] = isset($allRules[$matches[0]]) ? $allRules[$matches[0]] : array();
+		} else {
+			throw new InvalidParamException("Invalid language code: $language");
+		}
+	}
+
+	/**
+	 * Evaluates a PHP expression with the given number value.
+	 * @param string $expression the PHP expression
+	 * @param mixed $n the number value
+	 * @return boolean the expression result
+	 */
+	protected function evaluate($expression, $n)
+	{
+		return eval("return $expression;");
+	}
+}
diff --git a/yii/i18n/MessageSource.php b/yii/i18n/MessageSource.php
new file mode 100644
index 0000000..cf23338
--- /dev/null
+++ b/yii/i18n/MessageSource.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\i18n;
+
+use Yii;
+use yii\base\Component;
+
+/**
+ * MessageSource is the base class for message translation repository classes.
+ *
+ * A message source stores message translations in some persistent storage.
+ *
+ * Child classes should override [[loadMessages()]] to provide translated messages.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class MessageSource extends Component
+{
+	/**
+	 * @event MissingTranslationEvent an event that is triggered when a message translation is not found.
+	 */
+	const EVENT_MISSING_TRANSLATION = 'missingTranslation';
+
+	/**
+	 * @var boolean whether to force message translation when the source and target languages are the same.
+	 * Defaults to false, meaning translation is only performed when source and target languages are different.
+	 */
+	public $forceTranslation = false;
+	/**
+	 * @var string the language that the original messages are in. If not set, it will use the value of
+	 * [[\yii\base\Application::sourceLanguage]].
+	 */
+	public $sourceLanguage;
+
+	private $_messages = array();
+
+	/**
+	 * Initializes this component.
+	 */
+	public function init()
+	{
+		parent::init();
+		if ($this->sourceLanguage === null) {
+			$this->sourceLanguage = Yii::$app->sourceLanguage;
+		}
+	}
+
+	/**
+	 * Loads the message translation for the specified language and category.
+	 * Child classes should override this method to return the message translations of
+	 * the specified language and category.
+	 * @param string $category the message category
+	 * @param string $language the target language
+	 * @return array the loaded messages. The keys are original messages, and the values
+	 * are translated messages.
+	 */
+	protected function loadMessages($category, $language)
+	{
+		return array();
+	}
+
+	/**
+	 * Translates a message to the specified language.
+	 *
+	 * Note that unless [[forceTranslation]] is true, if the target language
+	 * is the same as the [[sourceLanguage|source language]], the message
+	 * will NOT be translated.
+	 *
+	 * If a translation is not found, a [[missingTranslation]] event will be triggered.
+	 *
+	 * @param string $category the message category
+	 * @param string $message the message to be translated
+	 * @param string $language the target language
+	 * @return string the translated message (or the original message if translation is not needed)
+	 */
+	public function translate($category, $message, $language)
+	{
+		if ($this->forceTranslation || $language !== $this->sourceLanguage) {
+			return $this->translateMessage($category, $message, $language);
+		} else {
+			return $message;
+		}
+	}
+
+	/**
+	 * Translates the specified message.
+	 * If the message is not found, a [[missingTranslation]] event will be triggered
+	 * and the original message will be returned.
+	 * @param string $category the category that the message belongs to
+	 * @param string $message the message to be translated
+	 * @param string $language the target language
+	 * @return string the translated message
+	 */
+	protected function translateMessage($category, $message, $language)
+	{
+		$key = $language . '/' . $category;
+		if (!isset($this->_messages[$key])) {
+			$this->_messages[$key] = $this->loadMessages($category, $language);
+		}
+		if (isset($this->_messages[$key][$message]) && $this->_messages[$key][$message] !== '') {
+			return $this->_messages[$key][$message];
+		} elseif ($this->hasEventHandlers('missingTranslation')) {
+			$event = new MissingTranslationEvent(array(
+				'category' => $category,
+				'message' => $message,
+				'language' => $language,
+			));
+			$this->trigger(self::EVENT_MISSING_TRANSLATION, $event);
+			return $this->_messages[$key] = $event->message;
+		} else {
+			return $message;
+		}
+	}
+}
+
diff --git a/yii/i18n/MissingTranslationEvent.php b/yii/i18n/MissingTranslationEvent.php
new file mode 100644
index 0000000..9ac337a
--- /dev/null
+++ b/yii/i18n/MissingTranslationEvent.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\i18n;
+
+use yii\base\Event;
+
+/**
+ * MissingTranslationEvent represents the parameter for the [[MessageSource::missingTranslation]] event.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class MissingTranslationEvent extends Event
+{
+	/**
+	 * @var string the message to be translated. An event handler may overwrite this property
+	 * with a translated version if possible.
+	 */
+	public $message;
+	/**
+	 * @var string the category that the message belongs to
+	 */
+	public $category;
+	/**
+	 * @var string the language ID (e.g. en_US) that the message is to be translated to
+	 */
+	public $language;
+}
diff --git a/yii/i18n/PhpMessageSource.php b/yii/i18n/PhpMessageSource.php
new file mode 100644
index 0000000..f62939f
--- /dev/null
+++ b/yii/i18n/PhpMessageSource.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\i18n;
+
+use Yii;
+
+/**
+ * PhpMessageSource represents a message source that stores translated messages in PHP scripts.
+ *
+ * PhpMessageSource uses PHP arrays to keep message translations.
+ *
+ * - Each PHP script contains one array which stores the message translations in one particular
+ *   language and for a single message category;
+ * - Each PHP script is saved as a file named as `[[basePath]]/LanguageID/CategoryName.php`;
+ * - Within each PHP script, the message translations are returned as an array like the following:
+ *
+ * ~~~
+ * return array(
+ *     'original message 1' => 'translated message 1',
+ *     'original message 2' => 'translated message 2',
+ * );
+ * ~~~
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class PhpMessageSource extends MessageSource
+{
+	/**
+	 * @var string the base path for all translated messages. Defaults to null, meaning
+	 * the "messages" subdirectory of the application directory (e.g. "protected/messages").
+	 */
+	public $basePath = '@app/messages';
+	/**
+	 * @var array mapping between message categories and the corresponding message file paths.
+	 * The file paths are relative to [[basePath]]. For example,
+	 *
+	 * ~~~
+	 * array(
+	 *     'core' => 'core.php',
+	 *     'ext' => 'extensions.php',
+	 * )
+	 * ~~~
+	 */
+	public $fileMap;
+
+	/**
+	 * Loads the message translation for the specified language and category.
+	 * @param string $category the message category
+	 * @param string $language the target language
+	 * @return array the loaded messages
+	 */
+	protected function loadMessages($category, $language)
+	{
+		$messageFile = Yii::getAlias($this->basePath) . "/$language/";
+		if (isset($this->fileMap[$category])) {
+			$messageFile .= $this->fileMap[$category];
+		} elseif (($pos = strrpos($category, '\\')) !== false) {
+			$messageFile .= (substr($category, $pos) . '.php');
+		} else {
+			$messageFile .= "$category.php";
+		}
+		if (is_file($messageFile)) {
+			$messages = include($messageFile);
+			if (!is_array($messages)) {
+				$messages = array();
+			}
+			return $messages;
+		} else {
+			Yii::error("The message file for category '$category' does not exist: $messageFile", __METHOD__);
+			return array();
+		}
+	}
+}
diff --git a/yii/i18n/data/plurals.php b/yii/i18n/data/plurals.php
new file mode 100644
index 0000000..468f7e2
--- /dev/null
+++ b/yii/i18n/data/plurals.php
@@ -0,0 +1,627 @@
+<?php
+/**
+ * Plural rules.
+ *
+ * This file is automatically generated by the "yiic locale/plural" command under the "build" folder.
+ * Do not modify it directly.
+ *
+ * The original plural rule data used for generating this file has the following copyright terms:
+ *
+ * Copyright © 1991-2007 Unicode, Inc. All rights reserved.
+ * Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
+ *
+ * @revision 6008 (of the original plural file)
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+return array (
+  'ar' => 
+  array (
+    0 => '$n==0',
+    1 => '$n==1',
+    2 => '$n==2',
+    3 => 'in_array(fmod($n,100),range(3,10))',
+    4 => 'in_array(fmod($n,100),range(11,99))',
+  ),
+  'asa' => 
+  array (
+    0 => '$n==1',
+  ),
+  'af' => 
+  array (
+    0 => '$n==1',
+  ),
+  'bem' => 
+  array (
+    0 => '$n==1',
+  ),
+  'bez' => 
+  array (
+    0 => '$n==1',
+  ),
+  'bg' => 
+  array (
+    0 => '$n==1',
+  ),
+  'bn' => 
+  array (
+    0 => '$n==1',
+  ),
+  'brx' => 
+  array (
+    0 => '$n==1',
+  ),
+  'ca' => 
+  array (
+    0 => '$n==1',
+  ),
+  'cgg' => 
+  array (
+    0 => '$n==1',
+  ),
+  'chr' => 
+  array (
+    0 => '$n==1',
+  ),
+  'da' => 
+  array (
+    0 => '$n==1',
+  ),
+  'de' => 
+  array (
+    0 => '$n==1',
+  ),
+  'dv' => 
+  array (
+    0 => '$n==1',
+  ),
+  'ee' => 
+  array (
+    0 => '$n==1',
+  ),
+  'el' => 
+  array (
+    0 => '$n==1',
+  ),
+  'en' => 
+  array (
+    0 => '$n==1',
+  ),
+  'eo' => 
+  array (
+    0 => '$n==1',
+  ),
+  'es' => 
+  array (
+    0 => '$n==1',
+  ),
+  'et' => 
+  array (
+    0 => '$n==1',
+  ),
+  'eu' => 
+  array (
+    0 => '$n==1',
+  ),
+  'fi' => 
+  array (
+    0 => '$n==1',
+  ),
+  'fo' => 
+  array (
+    0 => '$n==1',
+  ),
+  'fur' => 
+  array (
+    0 => '$n==1',
+  ),
+  'fy' => 
+  array (
+    0 => '$n==1',
+  ),
+  'gl' => 
+  array (
+    0 => '$n==1',
+  ),
+  'gsw' => 
+  array (
+    0 => '$n==1',
+  ),
+  'gu' => 
+  array (
+    0 => '$n==1',
+  ),
+  'ha' => 
+  array (
+    0 => '$n==1',
+  ),
+  'haw' => 
+  array (
+    0 => '$n==1',
+  ),
+  'he' => 
+  array (
+    0 => '$n==1',
+  ),
+  'is' => 
+  array (
+    0 => '$n==1',
+  ),
+  'it' => 
+  array (
+    0 => '$n==1',
+  ),
+  'jmc' => 
+  array (
+    0 => '$n==1',
+  ),
+  'kaj' => 
+  array (
+    0 => '$n==1',
+  ),
+  'kcg' => 
+  array (
+    0 => '$n==1',
+  ),
+  'kk' => 
+  array (
+    0 => '$n==1',
+  ),
+  'kl' => 
+  array (
+    0 => '$n==1',
+  ),
+  'ksb' => 
+  array (
+    0 => '$n==1',
+  ),
+  'ku' => 
+  array (
+    0 => '$n==1',
+  ),
+  'lb' => 
+  array (
+    0 => '$n==1',
+  ),
+  'lg' => 
+  array (
+    0 => '$n==1',
+  ),
+  'mas' => 
+  array (
+    0 => '$n==1',
+  ),
+  'ml' => 
+  array (
+    0 => '$n==1',
+  ),
+  'mn' => 
+  array (
+    0 => '$n==1',
+  ),
+  'mr' => 
+  array (
+    0 => '$n==1',
+  ),
+  'nah' => 
+  array (
+    0 => '$n==1',
+  ),
+  'nb' => 
+  array (
+    0 => '$n==1',
+  ),
+  'nd' => 
+  array (
+    0 => '$n==1',
+  ),
+  'ne' => 
+  array (
+    0 => '$n==1',
+  ),
+  'nl' => 
+  array (
+    0 => '$n==1',
+  ),
+  'nn' => 
+  array (
+    0 => '$n==1',
+  ),
+  'no' => 
+  array (
+    0 => '$n==1',
+  ),
+  'nr' => 
+  array (
+    0 => '$n==1',
+  ),
+  'ny' => 
+  array (
+    0 => '$n==1',
+  ),
+  'nyn' => 
+  array (
+    0 => '$n==1',
+  ),
+  'om' => 
+  array (
+    0 => '$n==1',
+  ),
+  'or' => 
+  array (
+    0 => '$n==1',
+  ),
+  'pa' => 
+  array (
+    0 => '$n==1',
+  ),
+  'pap' => 
+  array (
+    0 => '$n==1',
+  ),
+  'ps' => 
+  array (
+    0 => '$n==1',
+  ),
+  'pt' => 
+  array (
+    0 => '$n==1',
+  ),
+  'rof' => 
+  array (
+    0 => '$n==1',
+  ),
+  'rm' => 
+  array (
+    0 => '$n==1',
+  ),
+  'rwk' => 
+  array (
+    0 => '$n==1',
+  ),
+  'saq' => 
+  array (
+    0 => '$n==1',
+  ),
+  'seh' => 
+  array (
+    0 => '$n==1',
+  ),
+  'sn' => 
+  array (
+    0 => '$n==1',
+  ),
+  'so' => 
+  array (
+    0 => '$n==1',
+  ),
+  'sq' => 
+  array (
+    0 => '$n==1',
+  ),
+  'ss' => 
+  array (
+    0 => '$n==1',
+  ),
+  'ssy' => 
+  array (
+    0 => '$n==1',
+  ),
+  'st' => 
+  array (
+    0 => '$n==1',
+  ),
+  'sv' => 
+  array (
+    0 => '$n==1',
+  ),
+  'sw' => 
+  array (
+    0 => '$n==1',
+  ),
+  'syr' => 
+  array (
+    0 => '$n==1',
+  ),
+  'ta' => 
+  array (
+    0 => '$n==1',
+  ),
+  'te' => 
+  array (
+    0 => '$n==1',
+  ),
+  'teo' => 
+  array (
+    0 => '$n==1',
+  ),
+  'tig' => 
+  array (
+    0 => '$n==1',
+  ),
+  'tk' => 
+  array (
+    0 => '$n==1',
+  ),
+  'tn' => 
+  array (
+    0 => '$n==1',
+  ),
+  'ts' => 
+  array (
+    0 => '$n==1',
+  ),
+  'ur' => 
+  array (
+    0 => '$n==1',
+  ),
+  'wae' => 
+  array (
+    0 => '$n==1',
+  ),
+  've' => 
+  array (
+    0 => '$n==1',
+  ),
+  'vun' => 
+  array (
+    0 => '$n==1',
+  ),
+  'xh' => 
+  array (
+    0 => '$n==1',
+  ),
+  'xog' => 
+  array (
+    0 => '$n==1',
+  ),
+  'zu' => 
+  array (
+    0 => '$n==1',
+  ),
+  'ak' => 
+  array (
+    0 => '($n==0||$n==1)',
+  ),
+  'am' => 
+  array (
+    0 => '($n==0||$n==1)',
+  ),
+  'bh' => 
+  array (
+    0 => '($n==0||$n==1)',
+  ),
+  'fil' => 
+  array (
+    0 => '($n==0||$n==1)',
+  ),
+  'tl' => 
+  array (
+    0 => '($n==0||$n==1)',
+  ),
+  'guw' => 
+  array (
+    0 => '($n==0||$n==1)',
+  ),
+  'hi' => 
+  array (
+    0 => '($n==0||$n==1)',
+  ),
+  'ln' => 
+  array (
+    0 => '($n==0||$n==1)',
+  ),
+  'mg' => 
+  array (
+    0 => '($n==0||$n==1)',
+  ),
+  'nso' => 
+  array (
+    0 => '($n==0||$n==1)',
+  ),
+  'ti' => 
+  array (
+    0 => '($n==0||$n==1)',
+  ),
+  'wa' => 
+  array (
+    0 => '($n==0||$n==1)',
+  ),
+  'ff' => 
+  array (
+    0 => '($n>=0&&$n<=2)&&$n!=2',
+  ),
+  'fr' => 
+  array (
+    0 => '($n>=0&&$n<=2)&&$n!=2',
+  ),
+  'kab' => 
+  array (
+    0 => '($n>=0&&$n<=2)&&$n!=2',
+  ),
+  'lv' => 
+  array (
+    0 => '$n==0',
+    1 => 'fmod($n,10)==1&&fmod($n,100)!=11',
+  ),
+  'iu' => 
+  array (
+    0 => '$n==1',
+    1 => '$n==2',
+  ),
+  'kw' => 
+  array (
+    0 => '$n==1',
+    1 => '$n==2',
+  ),
+  'naq' => 
+  array (
+    0 => '$n==1',
+    1 => '$n==2',
+  ),
+  'se' => 
+  array (
+    0 => '$n==1',
+    1 => '$n==2',
+  ),
+  'sma' => 
+  array (
+    0 => '$n==1',
+    1 => '$n==2',
+  ),
+  'smi' => 
+  array (
+    0 => '$n==1',
+    1 => '$n==2',
+  ),
+  'smj' => 
+  array (
+    0 => '$n==1',
+    1 => '$n==2',
+  ),
+  'smn' => 
+  array (
+    0 => '$n==1',
+    1 => '$n==2',
+  ),
+  'sms' => 
+  array (
+    0 => '$n==1',
+    1 => '$n==2',
+  ),
+  'ga' => 
+  array (
+    0 => '$n==1',
+    1 => '$n==2',
+    2 => 'in_array($n,array(3,4,5,6))',
+    3 => 'in_array($n,array(7,8,9,10))',
+  ),
+  'ro' => 
+  array (
+    0 => '$n==1',
+    1 => '$n==0||$n!=1&&in_array(fmod($n,100),range(1,19))',
+  ),
+  'mo' => 
+  array (
+    0 => '$n==1',
+    1 => '$n==0||$n!=1&&in_array(fmod($n,100),range(1,19))',
+  ),
+  'lt' => 
+  array (
+    0 => 'fmod($n,10)==1&&!in_array(fmod($n,100),range(11,19))',
+    1 => 'in_array(fmod($n,10),range(2,9))&&!in_array(fmod($n,100),range(11,19))',
+  ),
+  'be' => 
+  array (
+    0 => 'fmod($n,10)==1&&fmod($n,100)!=11',
+    1 => 'in_array(fmod($n,10),array(2,3,4))&&!in_array(fmod($n,100),array(12,13,14))',
+    2 => 'fmod($n,10)==0||in_array(fmod($n,10),array(5,6,7,8,9))||in_array(fmod($n,100),array(11,12,13,14))',
+  ),
+  'bs' => 
+  array (
+    0 => 'fmod($n,10)==1&&fmod($n,100)!=11',
+    1 => 'in_array(fmod($n,10),array(2,3,4))&&!in_array(fmod($n,100),array(12,13,14))',
+    2 => 'fmod($n,10)==0||in_array(fmod($n,10),array(5,6,7,8,9))||in_array(fmod($n,100),array(11,12,13,14))',
+  ),
+  'hr' => 
+  array (
+    0 => 'fmod($n,10)==1&&fmod($n,100)!=11',
+    1 => 'in_array(fmod($n,10),array(2,3,4))&&!in_array(fmod($n,100),array(12,13,14))',
+    2 => 'fmod($n,10)==0||in_array(fmod($n,10),array(5,6,7,8,9))||in_array(fmod($n,100),array(11,12,13,14))',
+  ),
+  'ru' => 
+  array (
+    0 => 'fmod($n,10)==1&&fmod($n,100)!=11',
+    1 => 'in_array(fmod($n,10),array(2,3,4))&&!in_array(fmod($n,100),array(12,13,14))',
+    2 => 'fmod($n,10)==0||in_array(fmod($n,10),array(5,6,7,8,9))||in_array(fmod($n,100),array(11,12,13,14))',
+  ),
+  'sh' => 
+  array (
+    0 => 'fmod($n,10)==1&&fmod($n,100)!=11',
+    1 => 'in_array(fmod($n,10),array(2,3,4))&&!in_array(fmod($n,100),array(12,13,14))',
+    2 => 'fmod($n,10)==0||in_array(fmod($n,10),array(5,6,7,8,9))||in_array(fmod($n,100),array(11,12,13,14))',
+  ),
+  'sr' => 
+  array (
+    0 => 'fmod($n,10)==1&&fmod($n,100)!=11',
+    1 => 'in_array(fmod($n,10),array(2,3,4))&&!in_array(fmod($n,100),array(12,13,14))',
+    2 => 'fmod($n,10)==0||in_array(fmod($n,10),array(5,6,7,8,9))||in_array(fmod($n,100),array(11,12,13,14))',
+  ),
+  'uk' => 
+  array (
+    0 => 'fmod($n,10)==1&&fmod($n,100)!=11',
+    1 => 'in_array(fmod($n,10),array(2,3,4))&&!in_array(fmod($n,100),array(12,13,14))',
+    2 => 'fmod($n,10)==0||in_array(fmod($n,10),array(5,6,7,8,9))||in_array(fmod($n,100),array(11,12,13,14))',
+  ),
+  'cs' => 
+  array (
+    0 => '$n==1',
+    1 => 'in_array($n,array(2,3,4))',
+  ),
+  'sk' => 
+  array (
+    0 => '$n==1',
+    1 => 'in_array($n,array(2,3,4))',
+  ),
+  'pl' => 
+  array (
+    0 => '$n==1',
+    1 => 'in_array(fmod($n,10),array(2,3,4))&&!in_array(fmod($n,100),array(12,13,14))',
+    2 => '$n!=1&&in_array(fmod($n,10),array(0,1))||in_array(fmod($n,10),array(5,6,7,8,9))||in_array(fmod($n,100),array(12,13,14))',
+  ),
+  'sl' => 
+  array (
+    0 => 'fmod($n,100)==1',
+    1 => 'fmod($n,100)==2',
+    2 => 'in_array(fmod($n,100),array(3,4))',
+  ),
+  'mt' => 
+  array (
+    0 => '$n==1',
+    1 => '$n==0||in_array(fmod($n,100),range(2,10))',
+    2 => 'in_array(fmod($n,100),range(11,19))',
+  ),
+  'mk' => 
+  array (
+    0 => 'fmod($n,10)==1&&$n!=11',
+  ),
+  'cy' => 
+  array (
+    0 => '$n==0',
+    1 => '$n==1',
+    2 => '$n==2',
+    3 => '$n==3',
+    4 => '$n==6',
+  ),
+  'lag' => 
+  array (
+    0 => '$n==0',
+    1 => '($n>=0&&$n<=2)&&$n!=0&&$n!=2',
+  ),
+  'shi' => 
+  array (
+    0 => '($n>=0&&$n<=1)',
+    1 => 'in_array($n,range(2,10))',
+  ),
+  'br' => 
+  array (
+    0 => 'fmod($n,10)==1&&!in_array(fmod($n,100),array(11,71,91))',
+    1 => 'fmod($n,10)==2&&!in_array(fmod($n,100),array(12,72,92))',
+    2 => 'in_array(fmod($n,10),array(3,4,9))&&!in_array(fmod($n,100),array_merge(range(10,19),range(70,79),range(90,99)))',
+    3 => 'fmod($n,1000000)==0&&$n!=0',
+  ),
+  'ksh' => 
+  array (
+    0 => '$n==0',
+    1 => '$n==1',
+  ),
+  'tzm' => 
+  array (
+    0 => '($n==0||$n==1)||in_array($n,range(11,99))',
+  ),
+  'gv' => 
+  array (
+    0 => 'in_array(fmod($n,10),array(1,2))||fmod($n,20)==0',
+  ),
+);
diff --git a/yii/i18n/data/plurals.xml b/yii/i18n/data/plurals.xml
new file mode 100644
index 0000000..9227dc6
--- /dev/null
+++ b/yii/i18n/data/plurals.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE supplementalData SYSTEM "../../common/dtd/ldmlSupplemental.dtd">
+<supplementalData>
+    <version number="$Revision: 6008 $"/>
+    <generation date="$Date: 2011-07-12 13:18:01 -0500 (Tue, 12 Jul 2011) $"/>
+    <plurals>
+        <!-- if locale is known to have no plurals, there are no rules -->
+        <pluralRules locales="az bm bo dz fa id ig ii hu ja jv ka kde kea km kn ko lo ms my sah ses sg th to tr vi wo yo zh"/> 
+        <pluralRules locales="ar">
+            <pluralRule count="zero">n is 0</pluralRule>
+            <pluralRule count="one">n is 1</pluralRule>
+            <pluralRule count="two">n is 2</pluralRule>
+            <pluralRule count="few">n mod 100 in 3..10</pluralRule>
+            <pluralRule count="many">n mod 100 in 11..99</pluralRule>
+        </pluralRules>
+        <pluralRules locales="asa af bem bez bg bn brx ca cgg chr da de dv ee el en eo es et eu fi fo fur fy gl gsw gu ha haw he is it jmc kaj kcg kk kl ksb ku lb lg mas ml mn mr nah nb nd ne nl nn no nr ny nyn om or pa pap ps pt rof rm rwk saq seh sn so sq ss ssy st sv sw syr ta te teo tig tk tn ts ur wae ve vun xh xog zu">
+            <pluralRule count="one">n is 1</pluralRule>
+        </pluralRules>
+        <pluralRules locales="ak am bh fil tl guw hi ln mg nso ti wa">
+            <pluralRule count="one">n in 0..1</pluralRule>
+        </pluralRules>
+        <pluralRules locales="ff fr kab">
+            <pluralRule count="one">n within 0..2 and n is not 2</pluralRule>
+        </pluralRules>
+        <pluralRules locales="lv">
+            <pluralRule count="zero">n is 0</pluralRule>
+            <pluralRule count="one">n mod 10 is 1 and n mod 100 is not 11</pluralRule>
+        </pluralRules>
+        <pluralRules locales="iu kw naq se sma smi smj smn sms">
+            <pluralRule count="one">n is 1</pluralRule>
+            <pluralRule count="two">n is 2</pluralRule>
+        </pluralRules>
+        <pluralRules locales="ga"> <!-- http://unicode.org/cldr/trac/ticket/3915 -->
+            <pluralRule count="one">n is 1</pluralRule>
+            <pluralRule count="two">n is 2</pluralRule>
+            <pluralRule count="few">n in 3..6</pluralRule>
+            <pluralRule count="many">n in 7..10</pluralRule>
+        </pluralRules>
+        <pluralRules locales="ro mo">
+            <pluralRule count="one">n is 1</pluralRule>
+            <pluralRule count="few">n is 0 OR n is not 1 AND n mod 100 in 1..19</pluralRule>
+        </pluralRules>
+        <pluralRules locales="lt">
+            <pluralRule count="one">n mod 10 is 1 and n mod 100 not in 11..19</pluralRule>
+            <pluralRule count="few">n mod 10 in 2..9 and n mod 100 not in 11..19</pluralRule>
+        </pluralRules>
+        <pluralRules locales="be bs hr ru sh sr uk">
+            <pluralRule count="one">n mod 10 is 1 and n mod 100 is not 11</pluralRule>
+            <pluralRule count="few">n mod 10 in 2..4 and n mod 100 not in 12..14</pluralRule>
+            <pluralRule count="many">n mod 10 is 0 or n mod 10 in 5..9 or n mod 100 in 11..14</pluralRule>
+            <!-- others are fractions -->
+        </pluralRules>
+        <pluralRules locales="cs sk">
+            <pluralRule count="one">n is 1</pluralRule>
+            <pluralRule count="few">n in 2..4</pluralRule>
+        </pluralRules>
+        <pluralRules locales="pl">
+            <pluralRule count="one">n is 1</pluralRule>
+            <pluralRule count="few">n mod 10 in 2..4 and n mod 100 not in 12..14</pluralRule>
+            <pluralRule count="many">n is not 1 and n mod 10 in 0..1 or n mod 10 in 5..9 or n mod 100 in 12..14</pluralRule>
+            <!-- others are fractions -->
+            <!-- and n mod 100 not in 22..24 from Tamplin -->
+        </pluralRules>
+        <pluralRules locales="sl">
+            <pluralRule count="one">n mod 100 is 1</pluralRule>
+            <pluralRule count="two">n mod 100 is 2</pluralRule>
+            <pluralRule count="few">n mod 100 in 3..4</pluralRule>
+        </pluralRules>
+        <pluralRules locales="mt"> <!-- from Tamplin's data -->
+            <pluralRule count="one">n is 1</pluralRule>
+            <pluralRule count="few">n is 0 or n mod 100 in 2..10</pluralRule>
+            <pluralRule count="many">n mod 100 in 11..19</pluralRule>
+        </pluralRules>
+        <pluralRules locales="mk"> <!-- from Tamplin's data -->
+            <pluralRule count="one">n mod 10 is 1 and n is not 11</pluralRule>
+        </pluralRules>
+        <pluralRules locales="cy"> <!-- from http://www.saltcymru.org/wordpress/?p=99&lang=en -->
+            <pluralRule count="zero">n is 0</pluralRule>
+            <pluralRule count="one">n is 1</pluralRule>
+            <pluralRule count="two">n is 2</pluralRule>
+            <pluralRule count="few">n is 3</pluralRule>
+            <pluralRule count="many">n is 6</pluralRule>
+        </pluralRules>
+        <pluralRules locales="lag">
+            <pluralRule count="zero">n is 0</pluralRule>
+            <pluralRule count="one">n within 0..2 and n is not 0 and n is not 2</pluralRule>
+        </pluralRules>
+        <pluralRules locales="shi">
+            <pluralRule count="one">n within 0..1</pluralRule>
+            <pluralRule count="few">n in 2..10</pluralRule>
+        </pluralRules>
+        <pluralRules locales="br"> <!-- from http://unicode.org/cldr/trac/ticket/2886 -->
+            <pluralRule count="one">n mod 10 is 1 and n mod 100 not in 11,71,91</pluralRule>
+            <pluralRule count="two">n mod 10 is 2 and n mod 100 not in 12,72,92</pluralRule>
+            <pluralRule count="few">n mod 10 in 3..4,9 and n mod 100 not in 10..19,70..79,90..99</pluralRule>
+            <pluralRule count="many">n mod 1000000 is 0 and n is not 0</pluralRule>
+        </pluralRules>
+        <pluralRules locales="ksh">
+            <pluralRule count="zero">n is 0</pluralRule>
+            <pluralRule count="one">n is 1</pluralRule>
+        </pluralRules>
+        <pluralRules locales="tzm">
+            <pluralRule count="one">n in 0..1 or n in 11..99</pluralRule>
+        </pluralRules>
+        <pluralRules locales="gv">
+            <pluralRule count="one">n mod 10 in 1..2 or n mod 20 is 0</pluralRule>
+        </pluralRules>
+    </plurals>
+</supplementalData>
diff --git a/yii/logging/DbTarget.php b/yii/logging/DbTarget.php
new file mode 100644
index 0000000..ce9d843
--- /dev/null
+++ b/yii/logging/DbTarget.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\logging;
+
+use Yii;
+use yii\db\Connection;
+use yii\base\InvalidConfigException;
+
+/**
+ * DbTarget stores log messages in a database table.
+ *
+ * By default, DbTarget stores the log messages in a DB table named 'tbl_log'. This table
+ * must be pre-created. The table name can be changed by setting [[logTable]].
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class DbTarget extends Target
+{
+	/**
+	 * @var Connection|string the DB connection object or the application component ID of the DB connection.
+	 * After the DbTarget object is created, if you want to change this property, you should only assign it
+	 * with a DB connection object.
+	 */
+	public $db = 'db';
+	/**
+	 * @var string name of the DB table to store cache content.
+	 * The table should be pre-created as follows:
+	 *
+	 * ~~~
+	 * CREATE TABLE tbl_log (
+	 *	   id       BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+	 *	   level    INTEGER,
+	 *	   category VARCHAR(255),
+	 *	   log_time INTEGER,
+	 *	   message  TEXT,
+	 *     INDEX idx_log_level (level),
+	 *     INDEX idx_log_category (category)
+	 * )
+	 * ~~~
+	 *
+	 * Note that the 'id' column must be created as an auto-incremental column.
+	 * The above SQL uses the MySQL syntax. If you are using other DBMS, you need
+	 * to adjust it accordingly. For example, in PostgreSQL, it should be `id SERIAL PRIMARY KEY`.
+	 *
+	 * The indexes declared above are not required. They are mainly used to improve the performance
+	 * of some queries about message levels and categories. Depending on your actual needs, you may
+	 * want to create additional indexes (e.g. index on `log_time`).
+	 */
+	public $logTable = 'tbl_log';
+
+	/**
+	 * Initializes the DbTarget component.
+	 * This method will initialize the [[db]] property to make sure it refers to a valid DB connection.
+	 * @throws InvalidConfigException if [[db]] is invalid.
+	 */
+	public function init()
+	{
+		parent::init();
+		if (is_string($this->db)) {
+			$this->db = Yii::$app->getComponent($this->db);
+		}
+		if (!$this->db instanceof Connection) {
+			throw new InvalidConfigException("DbTarget::db must be either a DB connection instance or the application component ID of a DB connection.");
+		}
+	}
+
+	/**
+	 * Stores log messages to DB.
+	 * @param array $messages the messages to be exported. See [[Logger::messages]] for the structure
+	 * of each message.
+	 */
+	public function export($messages)
+	{
+		$tableName = $this->db->quoteTableName($this->logTable);
+		$sql = "INSERT INTO $tableName ([[level]], [[category]], [[log_time]], [[message]])
+				VALUES (:level, :category, :log_time, :message)";
+		$command = $this->db->createCommand($sql);
+		foreach ($messages as $message) {
+			$command->bindValues(array(
+				':level' => $message[1],
+				':category' => $message[2],
+				':log_time' => $message[3],
+				':message' => $message[0],
+			))->execute();
+		}
+	}
+}
diff --git a/yii/logging/EmailTarget.php b/yii/logging/EmailTarget.php
new file mode 100644
index 0000000..bb02e34
--- /dev/null
+++ b/yii/logging/EmailTarget.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\logging;
+
+/**
+ * EmailTarget sends selected log messages to the specified email addresses.
+ *
+ * The target email addresses may be specified via [[emails]] property.
+ * Optionally, you may set the email [[subject]], [[sentFrom]] address and
+ * additional [[headers]].
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class EmailTarget extends Target
+{
+	/**
+	 * @var array list of destination email addresses.
+	 */
+	public $emails = array();
+	/**
+	 * @var string email subject
+	 */
+	public $subject;
+	/**
+	 * @var string email sent-from address
+	 */
+	public $sentFrom;
+	/**
+	 * @var array list of additional headers to use when sending an email.
+	 */
+	public $headers = array();
+
+	/**
+	 * Sends log messages to specified email addresses.
+	 * @param array $messages the messages to be exported. See [[Logger::messages]] for the structure
+	 * of each message.
+	 */
+	public function export($messages)
+	{
+		$body = '';
+		foreach ($messages as $message) {
+			$body .= $this->formatMessage($message);
+		}
+		$body = wordwrap($body, 70);
+		$subject = $this->subject === null ? \Yii::t('yii|Application Log') : $this->subject;
+		foreach ($this->emails as $email) {
+			$this->sendEmail($subject, $body, $email, $this->sentFrom, $this->headers);
+		}
+	}
+
+	/**
+	 * Sends an email.
+	 * @param string $subject email subject
+	 * @param string $body email body
+	 * @param string $sentTo sent-to email address
+	 * @param string $sentFrom sent-from email address
+	 * @param array $headers additional headers to be used when sending the email
+	 */
+	protected function sendEmail($subject, $body, $sentTo, $sentFrom, $headers)
+	{
+		if ($sentFrom !== null) {
+			$headers[] = "From:  {$sentFrom}";
+		}
+		mail($sentTo, $subject, $body, implode("\r\n", $headers));
+	}
+}
diff --git a/yii/logging/FileTarget.php b/yii/logging/FileTarget.php
new file mode 100644
index 0000000..69799cd
--- /dev/null
+++ b/yii/logging/FileTarget.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\logging;
+
+use Yii;
+use yii\base\InvalidConfigException;
+
+/**
+ * FileTarget records log messages in a file.
+ *
+ * The log file is specified via [[logFile]]. If the size of the log file exceeds
+ * [[maxFileSize]] (in kilo-bytes), a rotation will be performed, which renames
+ * the current log file by suffixing the file name with '.1'. All existing log
+ * files are moved backwards by one place, i.e., '.2' to '.3', '.1' to '.2', and so on.
+ * The property [[maxLogFiles]] specifies how many files to keep.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class FileTarget extends Target
+{
+	/**
+	 * @var string log file path or path alias. If not set, it will use the "runtime/logs/app.log" file.
+	 * The directory containing the log files will be automatically created if not existing.
+	 */
+	public $logFile;
+	/**
+	 * @var integer maximum log file size, in kilo-bytes. Defaults to 10240, meaning 10MB.
+	 */
+	public $maxFileSize = 10240; // in KB
+	/**
+	 * @var integer number of log files used for rotation. Defaults to 5.
+	 */
+	public $maxLogFiles = 5;
+
+
+	/**
+	 * Initializes the route.
+	 * This method is invoked after the route is created by the route manager.
+	 */
+	public function init()
+	{
+		parent::init();
+		if ($this->logFile === null) {
+			$this->logFile = Yii::$app->getRuntimePath() . '/logs/app.log';
+		} else {
+			$this->logFile = Yii::getAlias($this->logFile);
+		}
+		$logPath = dirname($this->logFile);
+		if (!is_dir($logPath)) {
+			@mkdir($logPath, 0777, true);
+		}
+		if ($this->maxLogFiles < 1) {
+			$this->maxLogFiles = 1;
+		}
+		if ($this->maxFileSize < 1) {
+			$this->maxFileSize = 1;
+		}
+	}
+
+	/**
+	 * Sends log messages to specified email addresses.
+	 * @param array $messages the messages to be exported. See [[Logger::messages]] for the structure
+	 * of each message.
+	 * @throws InvalidConfigException if unable to open the log file for writing
+	 */
+	public function export($messages)
+	{
+		$text = '';
+		foreach ($messages as $message) {
+			$text .= $this->formatMessage($message);
+		}
+		if (($fp = @fopen($this->logFile, 'a')) === false) {
+			throw new InvalidConfigException("Unable to append to log file: {$this->logFile}");
+		}
+		@flock($fp, LOCK_EX);
+		if (@filesize($this->logFile) > $this->maxFileSize * 1024) {
+			$this->rotateFiles();
+			@flock($fp,LOCK_UN);
+			@fclose($fp);
+			@file_put_contents($this->logFile, $text, FILE_APPEND | LOCK_EX);
+		} else {
+			@fwrite($fp, $text);
+			@flock($fp,LOCK_UN);
+			@fclose($fp);
+		}
+	}
+
+	/**
+	 * Rotates log files.
+	 */
+	protected function rotateFiles()
+	{
+		$file = $this->logFile;
+		for ($i = $this->maxLogFiles; $i > 0; --$i) {
+			$rotateFile = $file . '.' . $i;
+			if (is_file($rotateFile)) {
+				// suppress errors because it's possible multiple processes enter into this section
+				if ($i === $this->maxLogFiles) {
+					@unlink($rotateFile);
+				} else {
+					@rename($rotateFile, $file . '.' . ($i + 1));
+				}
+			}
+		}
+		if (is_file($file)) {
+			@rename($file, $file . '.1'); // suppress errors because it's possible multiple processes enter into this section
+		}
+	}
+}
diff --git a/yii/logging/Logger.php b/yii/logging/Logger.php
new file mode 100644
index 0000000..b557c5e
--- /dev/null
+++ b/yii/logging/Logger.php
@@ -0,0 +1,234 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\logging;
+
+use \yii\base\Component;
+use \yii\base\InvalidConfigException;
+
+/**
+ * Logger records logged messages in memory.
+ *
+ * When the application ends or [[flushInterval]] is reached, Logger will call [[flush()]]
+ * to send logged messages to different log targets, such as file, email, Web.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Logger extends Component
+{
+	/**
+	 * Error message level. An error message is one that indicates the abnormal termination of the
+	 * application and may require developer's handling.
+	 */
+	const LEVEL_ERROR = 0x01;
+	/**
+	 * Warning message level. A warning message is one that indicates some abnormal happens but
+	 * the application is able to continue to run. Developers should pay attention to this message.
+	 */
+	const LEVEL_WARNING = 0x02;
+	/**
+	 * Informational message level. An informational message is one that includes certain information
+	 * for developers to review.
+	 */
+	const LEVEL_INFO = 0x04;
+	/**
+	 * Tracing message level. An tracing message is one that reveals the code execution flow.
+	 */
+	const LEVEL_TRACE = 0x08;
+	/**
+	 * Profiling message level. This indicates the message is for profiling purpose.
+	 */
+	const LEVEL_PROFILE = 0x40;
+	/**
+	 * Profiling message level. This indicates the message is for profiling purpose. It marks the
+	 * beginning of a profiling block.
+	 */
+	const LEVEL_PROFILE_BEGIN = 0x50;
+	/**
+	 * Profiling message level. This indicates the message is for profiling purpose. It marks the
+	 * end of a profiling block.
+	 */
+	const LEVEL_PROFILE_END = 0x60;
+
+
+	/**
+	 * @var integer how many messages should be logged before they are flushed from memory and sent to targets.
+	 * Defaults to 1000, meaning the [[flush]] method will be invoked once every 1000 messages logged.
+	 * Set this property to be 0 if you don't want to flush messages until the application terminates.
+	 * This property mainly affects how much memory will be taken by the logged messages.
+	 * A smaller value means less memory, but will increase the execution time due to the overhead of [[flush()]].
+	 */
+	public $flushInterval = 1000;
+	/**
+	 * @var array logged messages. This property is mainly managed by [[log()]] and [[flush()]].
+	 * Each log message is of the following structure:
+	 *
+	 * ~~~
+	 * array(
+	 *   [0] => message (mixed, can be a string or some complex data, such as an exception object)
+	 *   [1] => level (integer)
+	 *   [2] => category (string)
+	 *   [3] => timestamp (float, obtained by microtime(true))
+	 * )
+	 * ~~~
+	 */
+	public $messages = array();
+	/**
+	 * @var Router the log target router registered with this logger.
+	 */
+	public $router;
+	/**
+	 * @var string a tag that uniquely identifies the current request. This can be used
+	 * to differentiate the log messages for different requests.
+	 */
+	public $tag;
+
+	/**
+	 * Initializes the logger by registering [[flush()]] as a shutdown function.
+	 */
+	public function init()
+	{
+		parent::init();
+		$this->tag = date('Ymd-His', microtime(true));
+		register_shutdown_function(array($this, 'flush'), true);
+	}
+
+	/**
+	 * Logs a message with the given type and category.
+	 * If `YII_DEBUG` is true and `YII_TRACE_LEVEL` is greater than 0, then additional
+	 * call stack information about application code will be appended to the message.
+	 * @param string $message the message to be logged.
+	 * @param integer $level the level of the message. This must be one of the following:
+	 * `Logger::LEVEL_ERROR`, `Logger::LEVEL_WARNING`, `Logger::LEVEL_INFO`, `Logger::LEVEL_TRACE`,
+	 * `Logger::LEVEL_PROFILE_BEGIN`, `Logger::LEVEL_PROFILE_END`.
+	 * @param string $category the category of the message.
+	 */
+	public function log($message, $level, $category = 'application')
+	{
+		$time = microtime(true);
+		if (YII_DEBUG && YII_TRACE_LEVEL > 0) {
+			$traces = debug_backtrace();
+			$count = 0;
+			foreach ($traces as $trace) {
+				if (isset($trace['file'], $trace['line']) && strpos($trace['file'], YII_PATH) !== 0) {
+					$message .= "\nin {$trace['file']} ({$trace['line']})";
+					if (++$count >= YII_TRACE_LEVEL) {
+						break;
+					}
+				}
+			}
+		}
+		$this->messages[] = array($message, $level, $category, $time);
+		if ($this->flushInterval > 0 && count($this->messages) >= $this->flushInterval) {
+			$this->flush();
+		}
+	}
+
+	/**
+	 * Flushes log messages from memory to targets.
+	 * This method will trigger an [[EVENT_FLUSH]] or [[EVENT_FINAL_FLUSH]] event depending on the $final value.
+	 * @param boolean $final whether this is a final call during a request.
+	 */
+	public function flush($final = false)
+	{
+		if ($this->router) {
+			$this->router->dispatch($this->messages, $final);
+		}
+		$this->messages = array();
+	}
+
+	/**
+	 * Returns the total elapsed time since the start of the current request.
+	 * This method calculates the difference between now and the timestamp
+	 * defined by constant `YII_BEGIN_TIME` which is evaluated at the beginning
+	 * of [[YiiBase]] class file.
+	 * @return float the total elapsed time in seconds for current request.
+	 */
+	public function getElapsedTime()
+	{
+		return microtime(true) - YII_BEGIN_TIME;
+	}
+
+	/**
+	 * Returns the profiling results.
+	 *
+	 * By default, all profiling results will be returned. You may provide
+	 * `$categories` and `$excludeCategories` as parameters to retrieve the
+	 * results that you are interested in.
+	 *
+	 * @param array $categories list of categories that you are interested in.
+	 * You can use an asterisk at the end of a category to do a prefix match.
+	 * For example, 'yii\db\*' will match categories starting with 'yii\db\',
+	 * such as 'yii\db\Connection'.
+	 * @param array $excludeCategories list of categories that you want to exclude
+	 * @return array the profiling results. Each array element has the following structure:
+	 *  `array($token, $category, $time)`.
+	 */
+	public function getProfiling($categories = array(), $excludeCategories = array())
+	{
+		$timings = $this->calculateTimings();
+		if (empty($categories) && empty($excludeCategories)) {
+			return $timings;
+		}
+
+		foreach ($timings as $i => $timing) {
+			$matched = empty($categories);
+			foreach ($categories as $category) {
+				$prefix = rtrim($category, '*');
+				if (strpos($timing[1], $prefix) === 0 && ($timing[1] === $category || $prefix !== $category)) {
+					$matched = true;
+					break;
+				}
+			}
+
+			if ($matched) {
+				foreach ($excludeCategories as $category) {
+					$prefix = rtrim($category, '*');
+					foreach ($timings as $i => $timing) {
+						if (strpos($timing[1], $prefix) === 0 && ($timing[1] === $category || $prefix !== $category)) {
+							$matched = false;
+							break;
+						}
+					}
+				}
+			}
+
+			if (!$matched) {
+				unset($timings[$i]);
+			}
+		}
+		return array_values($timings);
+	}
+
+	private function calculateTimings()
+	{
+		$timings = array();
+
+		$stack = array();
+		foreach ($this->messages as $log) {
+			list($token, $level, $category, $timestamp) = $log;
+			if ($level == self::LEVEL_PROFILE_BEGIN) {
+				$stack[] = $log;
+			} elseif ($level == self::LEVEL_PROFILE_END) {
+				if (($last = array_pop($stack)) !== null && $last[0] === $token) {
+					$timings[] = array($token, $category, $timestamp - $last[3]);
+				} else {
+					throw new InvalidConfigException("Unmatched profiling block: $token");
+				}
+			}
+		}
+
+		$now = microtime(true);
+		while (($last = array_pop($stack)) !== null) {
+			$delta = $now - $last[3];
+			$timings[] = array($last[0], $last[2], $delta);
+		}
+
+		return $timings;
+	}
+}
diff --git a/yii/logging/ProfileTarget.php b/yii/logging/ProfileTarget.php
new file mode 100644
index 0000000..335e172
--- /dev/null
+++ b/yii/logging/ProfileTarget.php
@@ -0,0 +1,192 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+/**
+ * CProfileLogRoute displays the profiling results in Web page.
+ *
+ * The profiling is done by calling {@link YiiBase::beginProfile()} and {@link YiiBase::endProfile()},
+ * which marks the begin and end of a code block.
+ *
+ * CProfileLogRoute supports two types of report by setting the {@link setReport report} property:
+ * <ul>
+ * <li>summary: list the execution time of every marked code block</li>
+ * <li>callstack: list the mark code blocks in a hierarchical view reflecting their calling sequence.</li>
+ * </ul>
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class CProfileLogRoute extends CWebLogRoute
+{
+	/**
+	 * @var boolean whether to aggregate results according to profiling tokens.
+	 * If false, the results will be aggregated by categories.
+	 * Defaults to true. Note that this property only affects the summary report
+	 * that is enabled when {@link report} is 'summary'.
+	 */
+	public $groupByToken = true;
+	/**
+	 * @var string type of profiling report to display
+	 */
+	private $_report = 'summary';
+
+	/**
+	 * Initializes the route.
+	 * This method is invoked after the route is created by the route manager.
+	 */
+	public function init()
+	{
+		$this->levels = CLogger::LEVEL_PROFILE;
+	}
+
+	/**
+	 * @return string the type of the profiling report to display. Defaults to 'summary'.
+	 */
+	public function getReport()
+	{
+		return $this->_report;
+	}
+
+	/**
+	 * @param string $value the type of the profiling report to display. Valid values include 'summary' and 'callstack'.
+	 */
+	public function setReport($value)
+	{
+		if ($value === 'summary' || $value === 'callstack')
+			$this->_report = $value;
+		else
+			throw new CException(Yii::t('yii|CProfileLogRoute.report "{report}" is invalid. Valid values include "summary" and "callstack".',
+				array('{report}' => $value)));
+	}
+
+	/**
+	 * Displays the log messages.
+	 * @param array $logs list of log messages
+	 */
+	public function processLogs($logs)
+	{
+		$app = \Yii::$app;
+		if (!($app instanceof CWebApplication) || $app->getRequest()->getIsAjaxRequest())
+			return;
+
+		if ($this->getReport() === 'summary')
+			$this->displaySummary($logs);
+		else
+			$this->displayCallstack($logs);
+	}
+
+	/**
+	 * Displays the callstack of the profiling procedures for display.
+	 * @param array $logs list of logs
+	 */
+	protected function displayCallstack($logs)
+	{
+		$stack = array();
+		$results = array();
+		$n = 0;
+		foreach ($logs as $log)
+		{
+			if ($log[1] !== CLogger::LEVEL_PROFILE) {
+				continue;
+			}
+			$message = $log[0];
+			if (!strncasecmp($message, 'begin:', 6)) {
+				$log[0] = substr($message, 6);
+				$log[4] = $n;
+				$stack[] = $log;
+				$n++;
+			} elseif (!strncasecmp($message, 'end:', 4)) {
+				$token = substr($message, 4);
+				if (($last = array_pop($stack)) !== null && $last[0] === $token) {
+					$delta = $log[3] - $last[3];
+					$results[$last[4]] = array($token, $delta, count($stack));
+				} else
+				{
+					throw new CException(Yii::t('yii|CProfileLogRoute found a mismatching code block "{token}". Make sure the calls to Yii::beginProfile() and Yii::endProfile() be properly nested.',
+						array('{token}' => $token)));
+				}
+			}
+		}
+		// remaining entries should be closed here
+		$now = microtime(true);
+		while (($last = array_pop($stack)) !== null) {
+			$results[$last[4]] = array($last[0], $now - $last[3], count($stack));
+		}
+		ksort($results);
+		$this->render('profile-callstack', $results);
+	}
+
+	/**
+	 * Displays the summary report of the profiling result.
+	 * @param array $logs list of logs
+	 */
+	protected function displaySummary($logs)
+	{
+		$stack = array();
+		foreach ($logs as $log)
+		{
+			if ($log[1] !== CLogger::LEVEL_PROFILE)
+				continue;
+			$message = $log[0];
+			if (!strncasecmp($message, 'begin:', 6))
+			{
+				$log[0] = substr($message, 6);
+				$stack[] = $log;
+			} elseif (!strncasecmp($message, 'end:', 4))
+			{
+				$token = substr($message, 4);
+				if (($last = array_pop($stack)) !== null && $last[0] === $token)
+				{
+					$delta = $log[3] - $last[3];
+					if (!$this->groupByToken)
+						$token = $log[2];
+					if (isset($results[$token]))
+						$results[$token] = $this->aggregateResult($results[$token], $delta);
+					else
+						$results[$token] = array($token, 1, $delta, $delta, $delta);
+				} else
+					throw new CException(Yii::t('yii|CProfileLogRoute found a mismatching code block "{token}". Make sure the calls to Yii::beginProfile() and Yii::endProfile() be properly nested.',
+						array('{token}' => $token)));
+			}
+		}
+
+		$now = microtime(true);
+		while (($last = array_pop($stack)) !== null)
+		{
+			$delta = $now - $last[3];
+			$token = $this->groupByToken ? $last[0] : $last[2];
+			if (isset($results[$token]))
+				$results[$token] = $this->aggregateResult($results[$token], $delta);
+			else
+				$results[$token] = array($token, 1, $delta, $delta, $delta);
+		}
+
+		$entries = array_values($results);
+		$func = create_function('$a,$b', 'return $a[4]<$b[4]?1:0;');
+		usort($entries, $func);
+
+		$this->render('profile-summary', $entries);
+	}
+
+	/**
+	 * Aggregates the report result.
+	 * @param array $result log result for this code block
+	 * @param float $delta time spent for this code block
+	 * @return array
+	 */
+	protected function aggregateResult($result, $delta)
+	{
+		list($token, $calls, $min, $max, $total) = $result;
+		if ($delta < $min)
+			$min = $delta;
+		elseif ($delta > $max)
+			$max = $delta;
+		$calls++;
+		$total += $delta;
+		return array($token, $calls, $min, $max, $total);
+	}
+}
diff --git a/yii/logging/Router.php b/yii/logging/Router.php
new file mode 100644
index 0000000..f544b72
--- /dev/null
+++ b/yii/logging/Router.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\logging;
+
+use Yii;
+use yii\base\Component;
+use yii\base\Application;
+
+/**
+ * Router manages [[Target|log targets]] that record log messages in different media.
+ *
+ * For example, a [[FileTarget|file log target]] records log messages
+ * in files; an [[EmailTarget|email log target]] sends log messages
+ * to specific email addresses. Each log target may specify filters on
+ * message levels and categories to record specific messages only.
+ *
+ * Router and the targets it manages may be configured in application configuration,
+ * like the following:
+ *
+ * ~~~
+ * array(
+ *     // preload log component when application starts
+ *     'preload' => array('log'),
+ *     'components' => array(
+ *         'log' => array(
+ *             'class' => 'yii\logging\Router',
+ *             'targets' => array(
+ *                 'file' => array(
+ *                     'class' => 'yii\logging\FileTarget',
+ *                     'levels' => array('trace', 'info'),
+ *                     'categories' => array('yii\*'),
+ *                 ),
+ *                 'email' => array(
+ *                     'class' => 'yii\logging\EmailTarget',
+ *                     'levels' => array('error', 'warning'),
+ *                     'emails' => array('admin@example.com'),
+ *                 ),
+ *             ),
+ *         ),
+ *     ),
+ * )
+ * ~~~
+ *
+ * Each log target can have a name and can be referenced via the [[targets]] property
+ * as follows:
+ *
+ * ~~~
+ * Yii::$app->log->targets['file']->enabled = false;
+ * ~~~
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Router extends Component
+{
+	/**
+	 * @var Target[] list of log target objects or configurations. If the latter, target objects will
+	 * be created in [[init()]] by calling [[Yii::createObject()]] with the corresponding object configuration.
+	 */
+	public $targets = array();
+
+	/**
+	 * Initializes this application component.
+	 * This method is invoked when the Router component is created by the application.
+	 * The method attaches the [[processLogs]] method to both the [[Logger::EVENT_FLUSH]] event
+	 * and the [[Logger::EVENT_FINAL_FLUSH]] event.
+	 */
+	public function init()
+	{
+		parent::init();
+		foreach ($this->targets as $name => $target) {
+			if (!$target instanceof Target) {
+				$this->targets[$name] = Yii::createObject($target);
+			}
+		}
+		Yii::getLogger()->router = $this;
+	}
+
+	/**
+	 * Dispatches log messages to [[targets]].
+	 * This method is called by [[Logger]] when its [[Logger::flush()]] method is called.
+	 * It will forward the messages to each log target registered in [[targets]].
+	 * @param array $messages the messages to be processed
+	 * @param boolean $final whether this is the final call during a request cycle
+	 */
+	public function dispatch($messages, $final = false)
+	{
+		foreach ($this->targets as $target) {
+			if ($target->enabled) {
+				$target->collect($messages, $final);
+			}
+		}
+	}
+}
diff --git a/yii/logging/Target.php b/yii/logging/Target.php
new file mode 100644
index 0000000..311334d
--- /dev/null
+++ b/yii/logging/Target.php
@@ -0,0 +1,244 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\logging;
+
+use yii\base\InvalidConfigException;
+
+/**
+ * Target is the base class for all log target classes.
+ *
+ * A log target object will filter the messages logged by [[Logger]] according
+ * to its [[levels]] and [[categories]] properties. It may also export the filtered
+ * messages to specific destination defined by the target, such as emails, files.
+ *
+ * Level filter and category filter are combinatorial, i.e., only messages
+ * satisfying both filter conditions will be handled. Additionally, you
+ * may specify [[except]] to exclude messages of certain categories.
+ *
+ * @property integer $levels the message levels that this target is interested in.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+abstract class Target extends \yii\base\Component
+{
+	/**
+	 * @var boolean whether to enable this log target. Defaults to true.
+	 */
+	public $enabled = true;
+	/**
+	 * @var array list of message categories that this target is interested in. Defaults to empty, meaning all categories.
+	 * You can use an asterisk at the end of a category so that the category may be used to
+	 * match those categories sharing the same common prefix. For example, 'yii\db\*' will match
+	 * categories starting with 'yii\db\', such as 'yii\db\Connection'.
+	 */
+	public $categories = array();
+	/**
+	 * @var array list of message categories that this target is NOT interested in. Defaults to empty, meaning no uninteresting messages.
+	 * If this property is not empty, then any category listed here will be excluded from [[categories]].
+	 * You can use an asterisk at the end of a category so that the category can be used to
+	 * match those categories sharing the same common prefix. For example, 'yii\db\*' will match
+	 * categories starting with 'yii\db\', such as 'yii\db\Connection'.
+	 * @see categories
+	 */
+	public $except = array();
+	/**
+	 * @var boolean whether to log a message containing the current user name and ID. Defaults to false.
+	 * @see \yii\web\User
+	 */
+	public $logUser = false;
+	/**
+	 * @var array list of the PHP predefined variables that should be logged in a message.
+	 * Note that a variable must be accessible via `$GLOBALS`. Otherwise it won't be logged.
+	 * Defaults to `array('_GET', '_POST', '_FILES', '_COOKIE', '_SESSION', '_SERVER')`.
+	 */
+	public $logVars = array('_GET', '_POST', '_FILES', '_COOKIE', '_SESSION', '_SERVER');
+	/**
+	 * @var integer how many messages should be accumulated before they are exported.
+	 * Defaults to 1000. Note that messages will always be exported when the application terminates.
+	 * Set this property to be 0 if you don't want to export messages until the application terminates.
+	 */
+	public $exportInterval = 1000;
+	/**
+	 * @var array the messages that are retrieved from the logger so far by this log target.
+	 */
+	private $_messages = array();
+
+	private $_levels = 0;
+
+	/**
+	 * Exports log messages to a specific destination.
+	 * Child classes must implement this method.
+	 * @param array $messages the messages to be exported. See [[Logger::messages]] for the structure
+	 * of each message.
+	 */
+	abstract public function export($messages);
+
+	/**
+	 * Processes the given log messages.
+	 * This method will filter the given messages with [[levels]] and [[categories]].
+	 * And if requested, it will also export the filtering result to specific medium (e.g. email).
+	 * @param array $messages log messages to be processed. See [[Logger::messages]] for the structure
+	 * of each message.
+	 * @param boolean $final whether this method is called at the end of the current application
+	 */
+	public function collect($messages, $final)
+	{
+		$this->_messages = array_merge($this->_messages, $this->filterMessages($messages));
+		$count = count($this->_messages);
+		if ($count > 0 && ($final || $this->exportInterval > 0 && $count >= $this->exportInterval)) {
+			if (($context = $this->getContextMessage()) !== '') {
+				$this->_messages[] = array($context, Logger::LEVEL_INFO, 'application', YII_BEGIN_TIME);
+			}
+			$this->export($this->_messages);
+			$this->_messages = array();
+		}
+	}
+
+	/**
+	 * Generates the context information to be logged.
+	 * The default implementation will dump user information, system variables, etc.
+	 * @return string the context information. If an empty string, it means no context information.
+	 */
+	protected function getContextMessage()
+	{
+		$context = array();
+		if ($this->logUser && ($user = \Yii::$app->getComponent('user', false)) !== null) {
+			$context[] = 'User: ' . $user->getName() . ' (ID: ' . $user->getId() . ')';
+		}
+
+		foreach ($this->logVars as $name) {
+			if (!empty($GLOBALS[$name])) {
+				$context[] = "\${$name} = " . var_export($GLOBALS[$name], true);
+			}
+		}
+
+		return implode("\n\n", $context);
+	}
+
+	/**
+	 * @return integer the message levels that this target is interested in. This is a bitmap of
+	 * level values. Defaults to 0, meaning  all available levels.
+	 */
+	public function getLevels()
+	{
+		return $this->_levels;
+	}
+
+	/**
+	 * Sets the message levels that this target is interested in.
+	 *
+	 * The parameter can be either an array of interested level names or an integer representing
+	 * the bitmap of the interested level values. Valid level names include: 'error',
+	 * 'warning', 'info', 'trace' and 'profile'; valid level values include:
+	 * [[Logger::LEVEL_ERROR]], [[Logger::LEVEL_WARNING]], [[Logger::LEVEL_INFO]],
+	 * [[Logger::LEVEL_TRACE]] and [[Logger::LEVEL_PROFILE]].
+	 *
+	 * For example,
+	 *
+	 * ~~~
+	 * array('error', 'warning')
+	 * // which is equivalent to:
+	 * Logger::LEVEL_ERROR | Logger::LEVEL_WARNING
+	 * ~~~
+	 *
+	 * @param array|integer $levels message levels that this target is interested in.
+	 * @throws InvalidConfigException if an unknown level name is given
+	 */
+	public function setLevels($levels)
+	{
+		static $levelMap = array(
+			'error' => Logger::LEVEL_ERROR,
+			'warning' => Logger::LEVEL_WARNING,
+			'info' => Logger::LEVEL_INFO,
+			'trace' => Logger::LEVEL_TRACE,
+			'profile' => Logger::LEVEL_PROFILE,
+		);
+		if (is_array($levels)) {
+			$this->_levels = 0;
+			foreach ($levels as $level) {
+				if (isset($levelMap[$level])) {
+					$this->_levels |= $levelMap[$level];
+				} else {
+					throw new InvalidConfigException("Unrecognized level: $level");
+				}
+			}
+		} else {
+			$this->_levels = $levels;
+		}
+	}
+
+	/**
+	 * Filters the given messages according to their categories and levels.
+	 * @param array $messages messages to be filtered
+	 * @return array the filtered messages.
+	 * @see filterByCategory
+	 * @see filterByLevel
+	 */
+	protected function filterMessages($messages)
+	{
+		$levels = $this->getLevels();
+
+		foreach ($messages as $i => $message) {
+			if ($levels && !($levels & $message[1])) {
+				unset($messages[$i]);
+				continue;
+			}
+
+			$matched = empty($this->categories);
+			foreach ($this->categories as $category) {
+				if ($message[2] === $category || substr($category, -1) === '*' && strpos($message[2], rtrim($category, '*')) === 0) {
+					$matched = true;
+					break;
+				}
+			}
+
+			if ($matched) {
+				foreach ($this->except as $category) {
+					$prefix = rtrim($category, '*');
+					foreach ($messages as $i => $message) {
+						if (strpos($message[2], $prefix) === 0 && ($message[2] === $category || $prefix !== $category)) {
+							$matched = false;
+							break;
+						}
+					}
+				}
+			}
+
+			if (!$matched) {
+				unset($messages[$i]);
+			}
+		}
+		return $messages;
+	}
+
+	/**
+	 * Formats a log message.
+	 * The message structure follows that in [[Logger::messages]].
+	 * @param array $message the log message to be formatted.
+	 * @return string the formatted message
+	 */
+	public function formatMessage($message)
+	{
+		static $levels = array(
+			Logger::LEVEL_ERROR => 'error',
+			Logger::LEVEL_WARNING => 'warning',
+			Logger::LEVEL_INFO => 'info',
+			Logger::LEVEL_TRACE => 'trace',
+			Logger::LEVEL_PROFILE_BEGIN => 'profile begin',
+			Logger::LEVEL_PROFILE_END => 'profile end',
+		);
+		list($text, $level, $category, $timestamp) = $message;
+		$level = isset($levels[$level]) ? $levels[$level] : 'unknown';
+		if (!is_string($text)) {
+			$text = var_export($text, true);
+		}
+		$ip = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '127.0.0.1';
+		return date('Y/m/d H:i:s', $timestamp) . " [$ip] [$level] [$category] $text\n";
+	}
+}
diff --git a/yii/logging/WebTarget.php b/yii/logging/WebTarget.php
new file mode 100644
index 0000000..c98fd9f
--- /dev/null
+++ b/yii/logging/WebTarget.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+/**
+ * CWebLogRoute shows the log content in Web page.
+ *
+ * The log content can appear either at the end of the current Web page
+ * or in FireBug console window (if {@link showInFireBug} is set true).
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class CWebLogRoute extends CLogRoute
+{
+	/**
+	 * @var boolean whether the log should be displayed in FireBug instead of browser window. Defaults to false.
+	 */
+	public $showInFireBug = false;
+
+	/**
+	 * @var boolean whether the log should be ignored in FireBug for ajax calls. Defaults to true.
+	 * This option should be used carefully, because an ajax call returns all output as a result data.
+	 * For example if the ajax call expects a json type result any output from the logger will cause ajax call to fail.
+	 */
+	public $ignoreAjaxInFireBug = true;
+
+	/**
+	 * Displays the log messages.
+	 * @param array $logs list of log messages
+	 */
+	public function processLogs($logs)
+	{
+		$this->render('log', $logs);
+	}
+
+	/**
+	 * Renders the view.
+	 * @param string $view the view name (file name without extension). The file is assumed to be located under framework/data/views.
+	 * @param array $data data to be passed to the view
+	 */
+	protected function render($view, $data)
+	{
+		$app = \Yii::$app;
+		$isAjax = $app->getRequest()->getIsAjaxRequest();
+
+		if ($this->showInFireBug)
+		{
+			if ($isAjax && $this->ignoreAjaxInFireBug)
+				return;
+			$view .= '-firebug';
+		} elseif (!($app instanceof CWebApplication) || $isAjax)
+			return;
+
+		$viewFile = YII_PATH . DIRECTORY_SEPARATOR . 'views' . DIRECTORY_SEPARATOR . $view . '.php';
+		include($app->findLocalizedFile($viewFile, 'en'));
+	}
+}
diff --git a/yii/renderers/SmartyViewRenderer.php b/yii/renderers/SmartyViewRenderer.php
new file mode 100644
index 0000000..c6147c0
--- /dev/null
+++ b/yii/renderers/SmartyViewRenderer.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Smarty view renderer class file.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright &copy; 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\renderers;
+
+use Yii;
+use Smarty;
+use yii\base\View;
+use yii\base\ViewRenderer;
+use yii\helpers\Html;
+
+/**
+ * SmartyViewRenderer allows you to use Smarty templates in views.
+ *
+ * @author Alexander Makarov <sam@rmcreative.ru>
+ * @since 2.0
+ */
+class SmartyViewRenderer extends ViewRenderer
+{
+	/**
+	 * @var string the directory or path alias pointing to where Smarty cache will be stored.
+	 */
+	public $cachePath = '@app/runtime/Smarty/cache';
+
+	/**
+	 * @var string the directory or path alias pointing to where Smarty compiled templates will be stored.
+	 */
+	public $compilePath = '@app/runtime/Smarty/compile';
+
+	/**
+	 * @var Smarty
+	 */
+	public $smarty;
+
+	public function init()
+	{
+		$this->smarty = new Smarty();
+		$this->smarty->setCompileDir(Yii::getAlias($this->compilePath));
+		$this->smarty->setCacheDir(Yii::getAlias($this->cachePath));
+
+		$this->smarty->registerPlugin('function', 'path', array($this, 'smarty_function_path'));
+	}
+
+	/**
+	 * Smarty template function to get a path for using in links
+	 *
+	 * Usage is the following:
+	 *
+	 * {path route='blog/view' alias=$post.alias user=$user.id}
+	 *
+	 * where route is Yii route and the rest of parameters are passed as is.
+	 *
+	 * @param $params
+	 * @param \Smarty_Internal_Template $template
+	 *
+	 * @return string
+	 */
+	public function smarty_function_path($params, \Smarty_Internal_Template $template)
+	{
+		if(!isset($params['route'])) {
+			trigger_error("path: missing 'route' parameter");
+		}
+
+		array_unshift($params, $params['route']) ;
+		unset($params['route']);
+
+		return Html::url($params);
+	}
+
+	/**
+	 * Renders a view file.
+	 *
+	 * This method is invoked by [[View]] whenever it tries to render a view.
+	 * Child classes must implement this method to render the given view file.
+	 *
+	 * @param View $view the view object used for rendering the file.
+	 * @param string $file the view file.
+	 * @param array $params the parameters to be passed to the view file.
+	 *
+	 * @return string the rendering result
+	 */
+	public function render($view, $file, $params)
+	{
+		$ext = pathinfo($file, PATHINFO_EXTENSION);
+		/** @var \Smarty_Internal_Template $template */
+		$template = $this->smarty->createTemplate($file, null, null, $params, true);
+
+		$template->assign('app', \Yii::$app);
+		$template->assign('this', $view);
+
+		return $template->fetch();
+	}
+}
diff --git a/yii/renderers/TwigViewRenderer.php b/yii/renderers/TwigViewRenderer.php
new file mode 100644
index 0000000..de561d3
--- /dev/null
+++ b/yii/renderers/TwigViewRenderer.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Twig view renderer class file.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright &copy; 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\renderers;
+
+use Yii;
+use yii\base\View;
+use yii\base\ViewRenderer;
+use yii\helpers\Html;
+
+/**
+ * TwigViewRenderer allows you to use Twig templates in views.
+ *
+ * @author Alexander Makarov <sam@rmcreative.ru>
+ * @since 2.0
+ */
+class TwigViewRenderer extends ViewRenderer
+{
+	/**
+	 * @var string the directory or path alias pointing to where Twig cache will be stored.
+	 */
+	public $cachePath = '@app/runtime/Twig/cache';
+
+	/**
+	 * @var array Twig options
+	 * @see http://twig.sensiolabs.org/doc/api.html#environment-options
+	 */
+	public $options = array();
+
+	/**
+	 * @var \Twig_Environment
+	 */
+	public $twig;
+
+	public function init()
+	{
+		$loader = new \Twig_Loader_String();
+
+		$this->twig = new \Twig_Environment($loader, array_merge(array(
+			'cache' => Yii::getAlias($this->cachePath),
+		), $this->options));
+
+		$this->twig->addFunction('path', new \Twig_Function_Function(function($path, $args = array()){
+			return Html::url(array_merge(array($path), $args));
+		}));
+
+		$this->twig->addGlobal('app', \Yii::$app);
+	}
+
+	/**
+	 * Renders a view file.
+	 *
+	 * This method is invoked by [[View]] whenever it tries to render a view.
+	 * Child classes must implement this method to render the given view file.
+	 *
+	 * @param View $view the view object used for rendering the file.
+	 * @param string $file the view file.
+	 * @param array $params the parameters to be passed to the view file.
+	 *
+	 * @return string the rendering result
+	 */
+	public function render($view, $file, $params)
+	{
+		$this->twig->addGlobal('this', $view);
+		return $this->twig->render(file_get_contents($file), $params);
+	}
+}
diff --git a/yii/test/TestCase.php b/yii/test/TestCase.php
new file mode 100644
index 0000000..f190e5a
--- /dev/null
+++ b/yii/test/TestCase.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * TestCase class.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\test;
+
+require_once('PHPUnit/Runner/Version.php');
+spl_autoload_unregister(array('Yii','autoload'));
+require_once('PHPUnit/Autoload.php');
+spl_autoload_register(array('Yii','autoload')); // put yii's autoloader at the end
+
+/**
+ * TestCase is the base class for all test case classes.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+abstract class TestCase extends \PHPUnit_Framework_TestCase
+{
+}
diff --git a/yii/test/WebTestCase.php b/yii/test/WebTestCase.php
new file mode 100644
index 0000000..39162c9
--- /dev/null
+++ b/yii/test/WebTestCase.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * WebTestCase class.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\test;
+
+require_once('PHPUnit/Runner/Version.php');
+spl_autoload_unregister(array('Yii','autoload'));
+require_once('PHPUnit/Autoload.php');
+spl_autoload_register(array('Yii','autoload')); // put yii's autoloader at the end
+
+/**
+ * WebTestCase is the base class for all test case classes.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+abstract class WebTestCase extends \PHPUnit_Extensions_SeleniumTestCase
+{
+}
diff --git a/yii/validators/BooleanValidator.php b/yii/validators/BooleanValidator.php
new file mode 100644
index 0000000..1420739
--- /dev/null
+++ b/yii/validators/BooleanValidator.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\validators;
+
+use Yii;
+use yii\helpers\Html;
+
+/**
+ * BooleanValidator checks if the attribute value is a boolean value.
+ *
+ * Possible boolean values can be configured via the [[trueValue]] and [[falseValue]] properties.
+ * And the comparison can be either [[strict]] or not.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class BooleanValidator extends Validator
+{
+	/**
+	 * @var mixed the value representing true status. Defaults to '1'.
+	 */
+	public $trueValue = '1';
+	/**
+	 * @var mixed the value representing false status. Defaults to '0'.
+	 */
+	public $falseValue = '0';
+	/**
+	 * @var boolean whether the comparison to [[trueValue]] and [[falseValue]] is strict.
+	 * When this is true, the attribute value and type must both match those of [[trueValue]] or [[falseValue]].
+	 * Defaults to false, meaning only the value needs to be matched.
+	 */
+	public $strict = false;
+
+	/**
+	 * Initializes the validator.
+	 */
+	public function init()
+	{
+		parent::init();
+		if ($this->message === null) {
+			$this->message = Yii::t('yii|{attribute} must be either "{true}" or "{false}".');
+		}
+	}
+
+	/**
+	 * Validates the attribute of the object.
+	 * If there is any error, the error message is added to the object.
+	 * @param \yii\base\Model $object the object being validated
+	 * @param string $attribute the attribute being validated
+	 */
+	public function validateAttribute($object, $attribute)
+	{
+		$value = $object->$attribute;
+		if (!$this->validateValue($value)) {
+			$this->addError($object, $attribute, $this->message, array(
+				'{true}' => $this->trueValue,
+				'{false}' => $this->falseValue,
+			));
+		}
+	}
+
+	/**
+	 * Validates the given value.
+	 * @param mixed $value the value to be validated.
+	 * @return boolean whether the value is valid.
+	 */
+	public function validateValue($value)
+	{
+		return !$this->strict && ($value == $this->trueValue || $value == $this->falseValue)
+			|| $this->strict && ($value === $this->trueValue || $value === $this->falseValue);
+	}
+
+	/**
+	 * Returns the JavaScript needed for performing client-side validation.
+	 * @param \yii\base\Model $object the data object being validated
+	 * @param string $attribute the name of the attribute to be validated.
+	 * @return string the client-side validation script.
+	 */
+	public function clientValidateAttribute($object, $attribute)
+	{
+		$options = array(
+			'trueValue' => $this->trueValue,
+			'falseValue' => $this->falseValue,
+			'message' => Html::encode(strtr($this->message, array(
+				'{attribute}' => $object->getAttributeLabel($attribute),
+				'{value}' => $object->$attribute,
+				'{true}' => $this->trueValue,
+				'{false}' => $this->falseValue,
+			))),
+		);
+		if ($this->skipOnEmpty) {
+			$options['skipOnEmpty'] = 1;
+		}
+		if ($this->strict) {
+			$options['strict'] = 1;
+		}
+
+		return 'yii.validation.boolean(value, messages, ' . json_encode($options) . ');';
+	}
+}
diff --git a/yii/validators/CaptchaValidator.php b/yii/validators/CaptchaValidator.php
new file mode 100644
index 0000000..2e58cf2
--- /dev/null
+++ b/yii/validators/CaptchaValidator.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\validators;
+
+use Yii;
+use yii\base\InvalidConfigException;
+use yii\helpers\Html;
+
+/**
+ * CaptchaValidator validates that the attribute value is the same as the verification code displayed in the CAPTCHA.
+ *
+ * CaptchaValidator should be used together with [[CaptchaAction]].
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class CaptchaValidator extends Validator
+{
+	public $skipOnEmpty = false;
+	/**
+	 * @var boolean whether the comparison is case sensitive. Defaults to false.
+	 */
+	public $caseSensitive = false;
+	/**
+	 * @var string the route of the controller action that renders the CAPTCHA image.
+	 */
+	public $captchaAction = 'site/captcha';
+
+
+	/**
+	 * Initializes the validator.
+	 */
+	public function init()
+	{
+		parent::init();
+		if ($this->message === null) {
+			$this->message = Yii::t('yii|The verification code is incorrect.');
+		}
+	}
+
+	/**
+	 * Validates the attribute of the object.
+	 * If there is any error, the error message is added to the object.
+	 * @param \yii\base\Model $object the object being validated
+	 * @param string $attribute the attribute being validated
+	 */
+	public function validateAttribute($object, $attribute)
+	{
+		$value = $object->$attribute;
+		if (!$this->validateValue($value)) {
+			$this->addError($object, $attribute, $this->message);
+		}
+	}
+
+	/**
+	 * Validates the given value.
+	 * @param mixed $value the value to be validated.
+	 * @return boolean whether the value is valid.
+	 */
+	public function validateValue($value)
+	{
+		$captcha = $this->getCaptchaAction();
+		return !is_array($value) && $captcha->validate($value, $this->caseSensitive);
+	}
+
+	/**
+	 * Returns the CAPTCHA action object.
+	 * @throws InvalidConfigException
+	 * @return \yii\web\CaptchaAction the action object
+	 */
+	public function getCaptchaAction()
+	{
+		$ca = Yii::$app->createController($this->captchaAction);
+		if ($ca !== false) {
+			/** @var \yii\base\Controller $controller */
+			list($controller, $actionID) = $ca;
+			$action = $controller->createAction($actionID);
+			if ($action !== null) {
+				return $action;
+			}
+		}
+		throw new InvalidConfigException('Invalid CAPTCHA action ID: ' . $this->captchaAction);
+	}
+
+	/**
+	 * Returns the JavaScript needed for performing client-side validation.
+	 * @param \yii\base\Model $object the data object being validated
+	 * @param string $attribute the name of the attribute to be validated.
+	 * @return string the client-side validation script.
+	 */
+	public function clientValidateAttribute($object, $attribute)
+	{
+		$captcha = $this->getCaptchaAction();
+		$code = $captcha->getVerifyCode(false);
+		$hash = $captcha->generateValidationHash($this->caseSensitive ? $code : strtolower($code));
+		$options = array(
+			'hash' => $hash,
+			'hashKey' => 'yiiCaptcha/' . $this->captchaAction,
+			'caseSensitive' => $this->caseSensitive,
+			'message' => Html::encode(strtr($this->message, array(
+				'{attribute}' => $object->getAttributeLabel($attribute),
+				'{value}' => $object->$attribute,
+			))),
+		);
+		if ($this->skipOnEmpty) {
+			$options['skipOnEmpty'] = 1;
+		}
+
+		return 'yii.validation.captcha(value, messages, ' . json_encode($options) . ');';
+	}
+}
+
diff --git a/yii/validators/CompareValidator.php b/yii/validators/CompareValidator.php
new file mode 100644
index 0000000..68504e5
--- /dev/null
+++ b/yii/validators/CompareValidator.php
@@ -0,0 +1,208 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\validators;
+
+use Yii;
+use yii\base\InvalidConfigException;
+use yii\helpers\Html;
+
+/**
+ * CompareValidator compares the specified attribute value with another value and validates if they are equal.
+ *
+ * The value being compared with can be another attribute value
+ * (specified via [[compareAttribute]]) or a constant (specified via
+ * [[compareValue]]. When both are specified, the latter takes
+ * precedence. If neither is specified, the attribute will be compared
+ * with another attribute whose name is by appending "_repeat" to the source
+ * attribute name.
+ *
+ * The comparison can be either [[strict]] or not.
+ *
+ * CompareValidator supports different comparison operators, specified
+ * via the [[operator]] property.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class CompareValidator extends Validator
+{
+	/**
+	 * @var string the name of the attribute to be compared with. When both this property
+	 * and [[compareValue]] are set, the latter takes precedence. If neither is set,
+	 * it assumes the comparison is against another attribute whose name is formed by
+	 * appending '_repeat' to the attribute being validated. For example, if 'password' is
+	 * being validated, then the attribute to be compared would be 'password_repeat'.
+	 * @see compareValue
+	 */
+	public $compareAttribute;
+	/**
+	 * @var string the constant value to be compared with. When both this property
+	 * and [[compareAttribute]] are set, this property takes precedence.
+	 * @see compareAttribute
+	 */
+	public $compareValue;
+	/**
+	 * @var string the operator for comparison. The following operators are supported:
+	 *
+	 * - '==': validates to see if the two values are equal. The comparison is done is non-strict mode.
+	 * - '===': validates to see if the two values are equal. The comparison is done is strict mode.
+	 * - '!=': validates to see if the two values are NOT equal. The comparison is done is non-strict mode.
+	 * - '!==': validates to see if the two values are NOT equal. The comparison is done is strict mode.
+	 * - `>`: validates to see if the value being validated is greater than the value being compared with.
+	 * - `>=`: validates to see if the value being validated is greater than or equal to the value being compared with.
+	 * - `<`: validates to see if the value being validated is less than the value being compared with.
+	 * - `<=`: validates to see if the value being validated is less than or equal to the value being compared with.
+	 */
+	public $operator = '=';
+	/**
+	 * @var string the user-defined error message. It may contain the following placeholders which
+	 * will be replaced accordingly by the validator:
+	 *
+	 * - `{attribute}`: the label of the attribute being validated
+	 * - `{value}`: the value of the attribute being validated
+	 * - `{compareValue}`: the value or the attribute label to be compared with
+	 */
+	public $message;
+
+
+	/**
+	 * Initializes the validator.
+	 */
+	public function init()
+	{
+		parent::init();
+		if ($this->message === null) {
+			switch ($this->operator) {
+				case '==':
+					$this->message = Yii::t('yii|{attribute} must be repeated exactly.');
+					break;
+				case '===':
+					$this->message = Yii::t('yii|{attribute} must be repeated exactly.');
+					break;
+				case '!=':
+					$this->message = Yii::t('yii|{attribute} must not be equal to "{compareValue}".');
+					break;
+				case '!==':
+					$this->message = Yii::t('yii|{attribute} must not be equal to "{compareValue}".');
+					break;
+				case '>':
+					$this->message = Yii::t('yii|{attribute} must be greater than "{compareValue}".');
+					break;
+				case '>=':
+					$this->message = Yii::t('yii|{attribute} must be greater than or equal to "{compareValue}".');
+					break;
+				case '<':
+					$this->message = Yii::t('yii|{attribute} must be less than "{compareValue}".');
+					break;
+				case '<=':
+					$this->message = Yii::t('yii|{attribute} must be less than or equal to "{compareValue}".');
+					break;
+				default:
+					throw new InvalidConfigException("Unknown operator: {$this->operator}");
+			}
+		}
+	}
+
+	/**
+	 * Validates the attribute of the object.
+	 * If there is any error, the error message is added to the object.
+	 * @param \yii\base\Model $object the object being validated
+	 * @param string $attribute the attribute being validated
+	 * @throws InvalidConfigException if CompareValidator::operator is invalid
+	 */
+	public function validateAttribute($object, $attribute)
+	{
+		$value = $object->$attribute;
+		if (is_array($value)) {
+			$this->addError($object, $attribute, Yii::t('yii|{attribute} is invalid.'));
+			return;
+		}
+		if ($this->compareValue !== null) {
+			$compareLabel = $compareValue = $this->compareValue;
+		} else {
+			$compareAttribute = $this->compareAttribute === null ? $attribute . '_repeat' : $this->compareAttribute;
+			$compareValue = $object->$compareAttribute;
+			$compareLabel = $object->getAttributeLabel($compareAttribute);
+		}
+
+		switch ($this->operator) {
+			case '==': $valid = $value == $compareValue; break;
+			case '===': $valid = $value === $compareValue; break;
+			case '!=': $valid = $value != $compareValue; break;
+			case '!==': $valid = $value !== $compareValue; break;
+			case '>': $valid = $value > $compareValue; break;
+			case '>=': $valid = $value >= $compareValue; break;
+			case '<': $valid = $value < $compareValue; break;
+			case '<=': $valid = $value <= $compareValue; break;
+			default: $valid = false; break;
+		}
+		if (!$valid) {
+			$this->addError($object, $attribute, $this->message, array(
+				'{compareAttribute}' => $compareLabel,
+				'{compareValue}' => $compareValue,
+			));
+		}
+	}
+
+	/**
+	 * Validates the given value.
+	 * @param mixed $value the value to be validated.
+	 * @return boolean whether the value is valid.
+	 * @throws InvalidConfigException if [[compareValue]] is not set.
+	 */
+	public function validateValue($value)
+	{
+		if ($this->compareValue === null) {
+			throw new InvalidConfigException('CompareValidator::compareValue must be set.');
+		}
+
+		switch ($this->operator) {
+			case '==': return $value == $this->compareValue;
+			case '===': return $value === $this->compareValue;
+			case '!=': return $value != $this->compareValue;
+			case '!==': return $value !== $this->compareValue;
+			case '>': return $value > $this->compareValue;
+			case '>=': return $value >= $this->compareValue;
+			case '<': return $value < $this->compareValue;
+			case '<=': return $value <= $this->compareValue;
+		}
+	}
+
+	/**
+	 * Returns the JavaScript needed for performing client-side validation.
+	 * @param \yii\base\Model $object the data object being validated
+	 * @param string $attribute the name of the attribute to be validated
+	 * @return string the client-side validation script
+	 * @throws InvalidConfigException if CompareValidator::operator is invalid
+	 */
+	public function clientValidateAttribute($object, $attribute)
+	{
+		$options = array('operator' => $this->operator);
+
+		if ($this->compareValue !== null) {
+			$options['compareValue'] = $this->compareValue;
+			$compareValue = $this->compareValue;
+		} else {
+			$compareAttribute = $this->compareAttribute === null ? $attribute . '_repeat' : $this->compareAttribute;
+			$compareValue = $object->getAttributeLabel($compareAttribute);
+			$options['compareAttribute'] = Html::getInputId($object, $compareAttribute);
+		}
+
+		if ($this->skipOnEmpty) {
+			$options['skipOnEmpty'] = 1;
+		}
+
+		$options['message'] = Html::encode(strtr($this->message, array(
+			'{attribute}' => $object->getAttributeLabel($attribute),
+			'{value}' => $object->$attribute,
+			'{compareValue}' => $compareValue,
+		)));
+
+		return 'yii.validation.compare(value, messages, ' . json_encode($options) . ');';
+	}
+}
diff --git a/yii/validators/DateValidator.php b/yii/validators/DateValidator.php
new file mode 100644
index 0000000..7c3b181
--- /dev/null
+++ b/yii/validators/DateValidator.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\validators;
+
+use Yii;
+use DateTime;
+
+/**
+ * DateValidator verifies if the attribute represents a date, time or datetime in a proper format.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class DateValidator extends Validator
+{
+	/**
+	 * @var string the date format that the value being validated should follow.
+	 * Please refer to [[http://www.php.net/manual/en/datetime.createfromformat.php]] on
+	 * supported formats.
+	 */
+	public $format = 'Y-m-d';
+	/**
+	 * @var string the name of the attribute to receive the parsing result.
+	 * When this property is not null and the validation is successful, the named attribute will
+	 * receive the parsing result.
+	 */
+	public $timestampAttribute;
+
+	/**
+	 * Initializes the validator.
+	 */
+	public function init()
+	{
+		parent::init();
+		if ($this->message === null) {
+			$this->message = Yii::t('yii|The format of {attribute} is invalid.');
+		}
+	}
+
+	/**
+	 * Validates the attribute of the object.
+	 * If there is any error, the error message is added to the object.
+	 * @param \yii\base\Model $object the object being validated
+	 * @param string $attribute the attribute being validated
+	 */
+	public function validateAttribute($object, $attribute)
+	{
+		$value = $object->$attribute;
+		if (is_array($value)) {
+			$this->addError($object, $attribute, $this->message);
+			return;
+		}
+		$date = DateTime::createFromFormat($this->format, $value);
+		if ($date === false) {
+			$this->addError($object, $attribute, $this->message);
+		} elseif ($this->timestampAttribute !== false) {
+			$object->{$this->timestampAttribute} = $date->getTimestamp();
+		}
+	}
+
+	/**
+	 * Validates the given value.
+	 * @param mixed $value the value to be validated.
+	 * @return boolean whether the value is valid.
+	 */
+	public function validateValue($value)
+	{
+		return DateTime::createFromFormat($this->format, $value) !== false;
+	}
+}
+
diff --git a/yii/validators/DefaultValueValidator.php b/yii/validators/DefaultValueValidator.php
new file mode 100644
index 0000000..185dbd4
--- /dev/null
+++ b/yii/validators/DefaultValueValidator.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\validators;
+
+/**
+ * DefaultValueValidator sets the attribute to be the specified default value.
+ *
+ * DefaultValueValidator is not really a validator. It is provided mainly to allow
+ * specifying attribute default values when they are empty.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class DefaultValueValidator extends Validator
+{
+	/**
+	 * @var mixed the default value to be set to the specified attributes.
+	 */
+	public $value;
+	/**
+	 * @var boolean this property is overwritten to be false so that this validator will
+	 * be applied when the value being validated is empty.
+	 */
+	public $skipOnEmpty = false;
+
+	/**
+	 * Validates the attribute of the object.
+	 * @param \yii\base\Model $object the object being validated
+	 * @param string $attribute the attribute being validated
+	 */
+	public function validateAttribute($object, $attribute)
+	{
+		if ($this->isEmpty($object->$attribute)) {
+			$object->$attribute = $this->value;
+		}
+	}
+}
+
diff --git a/yii/validators/EmailValidator.php b/yii/validators/EmailValidator.php
new file mode 100644
index 0000000..949b3f9
--- /dev/null
+++ b/yii/validators/EmailValidator.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\validators;
+
+use Yii;
+use yii\helpers\Html;
+use yii\web\JsExpression;
+use yii\helpers\Json;
+
+/**
+ * EmailValidator validates that the attribute value is a valid email address.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class EmailValidator extends Validator
+{
+	/**
+	 * @var string the regular expression used to validate the attribute value.
+	 * @see http://www.regular-expressions.info/email.html
+	 */
+	public $pattern = '/^[a-zA-Z0-9!#$%&\'*+\\/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&\'*+\\/=?^_`{|}~-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$/';
+	/**
+	 * @var string the regular expression used to validate email addresses with the name part.
+	 * This property is used only when [[allowName]] is true.
+	 * @see allowName
+	 */
+	public $fullPattern = '/^[^@]*<[a-zA-Z0-9!#$%&\'*+\\/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&\'*+\\/=?^_`{|}~-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?>$/';
+	/**
+	 * @var boolean whether to allow name in the email address (e.g. "John Smith <john.smith@example.com>"). Defaults to false.
+	 * @see fullPattern
+	 */
+	public $allowName = false;
+	/**
+	 * @var boolean whether to check the MX record for the email address.
+	 * Defaults to false. To enable it, you need to make sure the PHP function 'checkdnsrr'
+	 * exists in your PHP installation.
+	 */
+	public $checkMX = false;
+	/**
+	 * @var boolean whether to check port 25 for the email address.
+	 * Defaults to false.
+	 */
+	public $checkPort = false;
+
+	/**
+	 * Initializes the validator.
+	 */
+	public function init()
+	{
+		parent::init();
+		if ($this->message === null) {
+			$this->message = Yii::t('yii|{attribute} is not a valid email address.');
+		}
+	}
+
+	/**
+	 * Validates the attribute of the object.
+	 * If there is any error, the error message is added to the object.
+	 * @param \yii\base\Model $object the object being validated
+	 * @param string $attribute the attribute being validated
+	 */
+	public function validateAttribute($object, $attribute)
+	{
+		$value = $object->$attribute;
+		if (!$this->validateValue($value)) {
+			$this->addError($object, $attribute, $this->message);
+		}
+	}
+
+	/**
+	 * Validates the given value.
+	 * @param mixed $value the value to be validated.
+	 * @return boolean whether the value is valid.
+	 */
+	public function validateValue($value)
+	{
+		// make sure string length is limited to avoid DOS attacks
+		$valid = is_string($value) && strlen($value) <= 254
+			&& (preg_match($this->pattern, $value) || $this->allowName && preg_match($this->fullPattern, $value));
+		if ($valid) {
+			$domain = rtrim(substr($value, strpos($value, '@') + 1), '>');
+			if ($this->checkMX && function_exists('checkdnsrr')) {
+				$valid = checkdnsrr($domain, 'MX');
+			}
+			if ($valid && $this->checkPort && function_exists('fsockopen')) {
+				$valid = fsockopen($domain, 25) !== false;
+			}
+		}
+		return $valid;
+	}
+
+	/**
+	 * Returns the JavaScript needed for performing client-side validation.
+	 * @param \yii\base\Model $object the data object being validated
+	 * @param string $attribute the name of the attribute to be validated.
+	 * @return string the client-side validation script.
+	 */
+	public function clientValidateAttribute($object, $attribute)
+	{
+		$options = array(
+			'pattern' => new JsExpression($this->pattern),
+			'fullPattern' => new JsExpression($this->fullPattern),
+			'allowName' => $this->allowName,
+			'message' => Html::encode(strtr($this->message, array(
+				'{attribute}' => $object->getAttributeLabel($attribute),
+				'{value}' => $object->$attribute,
+			))),
+		);
+		if ($this->skipOnEmpty) {
+			$options['skipOnEmpty'] = 1;
+		}
+
+		return 'yii.validation.email(value, messages, ' . Json::encode($options) . ');';
+	}
+}
diff --git a/yii/validators/ExistValidator.php b/yii/validators/ExistValidator.php
new file mode 100644
index 0000000..7aa434c
--- /dev/null
+++ b/yii/validators/ExistValidator.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\validators;
+
+use Yii;
+use yii\base\InvalidConfigException;
+
+/**
+ * ExistValidator validates that the attribute value exists in a table.
+ *
+ * This validator is often used to verify that a foreign key contains a value
+ * that can be found in the foreign table.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class ExistValidator extends Validator
+{
+	/**
+	 * @var string the ActiveRecord class name or alias of the class
+	 * that should be used to look for the attribute value being validated.
+	 * Defaults to null, meaning using the ActiveRecord class of
+	 * the attribute being validated.
+	 * @see attributeName
+	 */
+	public $className;
+	/**
+	 * @var string the yii\db\ActiveRecord class attribute name that should be
+	 * used to look for the attribute value being validated. Defaults to null,
+	 * meaning using the name of the attribute being validated.
+	 * @see className
+	 */
+	public $attributeName;
+
+
+	/**
+	 * Initializes the validator.
+	 */
+	public function init()
+	{
+		parent::init();
+		if ($this->message === null) {
+			$this->message = Yii::t('yii|{attribute} is invalid.');
+		}
+	}
+
+	/**
+	 * Validates the attribute of the object.
+	 * If there is any error, the error message is added to the object.
+	 *
+	 * @param \yii\db\ActiveRecord $object the object being validated
+	 * @param string $attribute the attribute being validated
+	 */
+	public function validateAttribute($object, $attribute)
+	{
+		$value = $object->$attribute;
+
+		if (is_array($value)) {
+			$this->addError($object, $attribute, $this->message);
+			return;
+		}
+
+		/** @var $className \yii\db\ActiveRecord */
+		$className = $this->className === null ? get_class($object) : Yii::import($this->className);
+		$attributeName = $this->attributeName === null ? $attribute : $this->attributeName;
+		$query = $className::find();
+		$query->where(array($attributeName => $value));
+		if (!$query->exists()) {
+			$this->addError($object, $attribute, $this->message);
+		}
+	}
+
+	/**
+	 * Validates the given value.
+	 * @param mixed $value the value to be validated.
+	 * @return boolean whether the value is valid.
+	 * @throws InvalidConfigException if either [[className]] or [[attributeName]] is not set.
+	 */
+	public function validateValue($value)
+	{
+		if (is_array($value)) {
+			return false;
+		}
+		if ($this->className === null) {
+			throw new InvalidConfigException('The "className" property must be set.');
+		}
+		if ($this->attributeName === null) {
+			throw new InvalidConfigException('The "attributeName" property must be set.');
+		}
+		/** @var $className \yii\db\ActiveRecord */
+		$className = $this->className;
+		$query = $className::find();
+		$query->where(array($this->attributeName => $value));
+		return $query->exists();
+	}
+}
+
diff --git a/yii/validators/FileValidator.php b/yii/validators/FileValidator.php
new file mode 100644
index 0000000..cc36d07
--- /dev/null
+++ b/yii/validators/FileValidator.php
@@ -0,0 +1,251 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\validators;
+
+use Yii;
+use yii\web\UploadedFile;
+
+/**
+ * FileValidator verifies if an attribute is receiving a valid uploaded file.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class FileValidator extends Validator
+{
+	/**
+	 * @var mixed a list of file name extensions that are allowed to be uploaded.
+	 * This can be either an array or a string consisting of file extension names
+	 * separated by space or comma (e.g. "gif, jpg").
+	 * Extension names are case-insensitive. Defaults to null, meaning all file name
+	 * extensions are allowed.
+	 */
+	public $types;
+	/**
+	 * @var integer the minimum number of bytes required for the uploaded file.
+	 * Defaults to null, meaning no limit.
+	 * @see tooSmall
+	 */
+	public $minSize;
+	/**
+	 * @var integer the maximum number of bytes required for the uploaded file.
+	 * Defaults to null, meaning no limit.
+	 * Note, the size limit is also affected by 'upload_max_filesize' INI setting
+	 * and the 'MAX_FILE_SIZE' hidden field value.
+	 * @see tooBig
+	 */
+	public $maxSize;
+	/**
+	 * @var integer the maximum file count the given attribute can hold.
+	 * It defaults to 1, meaning single file upload. By defining a higher number,
+	 * multiple uploads become possible.
+	 */
+	public $maxFiles = 1;
+	/**
+	 * @var string the error message used when a file is not uploaded correctly.
+	 */
+	public $message;
+	/**
+	 * @var string the error message used when no file is uploaded.
+	 */
+	public $uploadRequired;
+	/**
+	 * @var string the error message used when the uploaded file is too large.
+	 * You may use the following tokens in the message:
+	 *
+	 * - {attribute}: the attribute name
+	 * - {file}: the uploaded file name
+	 * - {limit}: the maximum size allowed (see [[getSizeLimit()]])
+	 */
+	public $tooBig;
+	/**
+	 * @var string the error message used when the uploaded file is too small.
+	 * You may use the following tokens in the message:
+	 *
+	 * - {attribute}: the attribute name
+	 * - {file}: the uploaded file name
+	 * - {limit}: the value of [[minSize]]
+	 */
+	public $tooSmall;
+	/**
+	 * @var string the error message used when the uploaded file has an extension name
+	 * that is not listed in [[extensions]]. You may use the following tokens in the message:
+	 *
+	 * - {attribute}: the attribute name
+	 * - {extensions}: the list of the allowed extensions.
+	 */
+	public $wrongType;
+	/**
+	 * @var string the error message used if the count of multiple uploads exceeds limit.
+	 * You may use the following tokens in the message:
+	 *
+	 * - {attribute}: the attribute name
+	 * - {file}: the uploaded file name
+	 * - {limit}: the value of [[maxFiles]]
+	 */
+	public $tooMany;
+
+	/**
+	 * Initializes the validator.
+	 */
+	public function init()
+	{
+		parent::init();
+		if ($this->message === null) {
+			$this->message = Yii::t('yii|File upload failed.');
+		}
+		if ($this->uploadRequired === null) {
+			$this->uploadRequired = Yii::t('yii|Please upload a file.');
+		}
+		if ($this->tooMany === null) {
+			$this->tooMany = Yii::t('yii|You can upload at most {limit} files.');
+		}
+		if ($this->wrongType === null) {
+			$this->wrongType = Yii::t('yii|Only files with these extensions are allowed: {extensions}.');
+		}
+		if ($this->tooBig === null) {
+			$this->tooBig = Yii::t('yii|The file "{file}" is too big. Its size cannot exceed {limit} bytes.');
+		}
+		if ($this->tooSmall === null) {
+			$this->tooSmall = Yii::t('yii|The file "{file}" is too small. Its size cannot be smaller than {limit} bytes.');
+		}
+		if (!is_array($this->types)) {
+			$this->types = preg_split('/[\s,]+/', strtolower($this->types), -1, PREG_SPLIT_NO_EMPTY);
+		}
+	}
+
+	/**
+	 * Validates the attribute.
+	 * @param \yii\base\Model $object the object being validated
+	 * @param string $attribute the attribute being validated
+	 */
+	public function validateAttribute($object, $attribute)
+	{
+		if ($this->maxFiles > 1) {
+			$files = $object->$attribute;
+			if (!is_array($files)) {
+				$this->addError($object, $attribute, $this->uploadRequired);
+				return;
+			}
+			foreach ($files as $i => $file) {
+				if (!$file instanceof UploadedFile || $file->getError() == UPLOAD_ERR_NO_FILE) {
+					unset($files[$i]);
+				}
+			}
+			$object->$attribute = array_values($files);
+			if (empty($files)) {
+				$this->addError($object, $attribute, $this->uploadRequired);
+			}
+			if (count($files) > $this->maxFiles) {
+				$this->addError($object, $attribute, $this->tooMany, array('{attribute}' => $attribute, '{limit}' => $this->maxFiles));
+			} else {
+				foreach ($files as $file) {
+					$this->validateFile($object, $attribute, $file);
+				}
+			}
+		} else {
+			$file = $object->$attribute;
+			if ($file instanceof UploadedFile && $file->getError() != UPLOAD_ERR_NO_FILE) {
+				$this->validateFile($object, $attribute, $file);
+			} else {
+				$this->addError($object, $attribute, $this->uploadRequired);
+			}
+		}
+	}
+
+	/**
+	 * Internally validates a file object.
+	 * @param \yii\base\Model $object the object being validated
+	 * @param string $attribute the attribute being validated
+	 * @param UploadedFile $file uploaded file passed to check against a set of rules
+	 */
+	protected function validateFile($object, $attribute, $file)
+	{
+		switch ($file->getError()) {
+			case UPLOAD_ERR_OK:
+				if ($this->maxSize !== null && $file->getSize() > $this->maxSize) {
+					$this->addError($object, $attribute, $this->tooBig, array('{file}' => $file->getName(), '{limit}' => $this->getSizeLimit()));
+				}
+				if ($this->minSize !== null && $file->getSize() < $this->minSize) {
+					$this->addError($object, $attribute, $this->tooSmall, array('{file}' => $file->getName(), '{limit}' => $this->minSize));
+				}
+				if (!empty($this->types) && !in_array(strtolower(pathinfo($file->getName(), PATHINFO_EXTENSION)), $this->types, true)) {
+					$this->addError($object, $attribute, $this->wrongType, array('{file}' => $file->getName(), '{extensions}' => implode(', ', $this->types)));
+				}
+				break;
+			case UPLOAD_ERR_INI_SIZE:
+			case UPLOAD_ERR_FORM_SIZE:
+				$this->addError($object, $attribute, $this->tooBig, array('{file}' => $file->getName(), '{limit}' => $this->getSizeLimit()));
+				break;
+			case UPLOAD_ERR_PARTIAL:
+				$this->addError($object, $attribute, $this->message);
+				Yii::warning('File was only partially uploaded: ' . $file->getName(), __METHOD__);
+				break;
+			case UPLOAD_ERR_NO_TMP_DIR:
+				$this->addError($object, $attribute, $this->message);
+				Yii::warning('Missing the temporary folder to store the uploaded file: ' . $file->getName(), __METHOD__);
+				break;
+			case UPLOAD_ERR_CANT_WRITE:
+				$this->addError($object, $attribute, $this->message);
+				Yii::warning('Failed to write the uploaded file to disk: ' . $file->getName(), __METHOD__);
+				break;
+			case UPLOAD_ERR_EXTENSION:
+				$this->addError($object, $attribute, $this->message);
+				Yii::warning('File upload was stopped by some PHP extension: ' . $file->getName(), __METHOD__);
+				break;
+			default:
+				break;
+		}
+	}
+
+	/**
+	 * Returns the maximum size allowed for uploaded files.
+	 * This is determined based on three factors:
+	 *
+	 * - 'upload_max_filesize' in php.ini
+	 * - 'MAX_FILE_SIZE' hidden field
+	 * - [[maxSize]]
+	 *
+	 * @return integer the size limit for uploaded files.
+	 */
+	public function getSizeLimit()
+	{
+		$limit = ini_get('upload_max_filesize');
+		$limit = $this->sizeToBytes($limit);
+		if ($this->maxSize !== null && $limit > 0 && $this->maxSize < $limit) {
+			$limit = $this->maxSize;
+		}
+		if (isset($_POST['MAX_FILE_SIZE']) && $_POST['MAX_FILE_SIZE'] > 0 && $_POST['MAX_FILE_SIZE'] < $limit) {
+			$limit = (int)$_POST['MAX_FILE_SIZE'];
+		}
+		return $limit;
+	}
+
+	/**
+	 * Converts php.ini style size to bytes
+	 *
+	 * @param string $sizeStr $sizeStr
+	 * @return int
+	 */
+	private function sizeToBytes($sizeStr)
+	{
+		switch (substr($sizeStr, -1)) {
+			case 'M':
+			case 'm':
+				return (int)$sizeStr * 1048576;
+			case 'K':
+			case 'k':
+				return (int)$sizeStr * 1024;
+			case 'G':
+			case 'g':
+				return (int)$sizeStr * 1073741824;
+			default:
+				return (int)$sizeStr;
+		}
+	}
+}
diff --git a/yii/validators/FilterValidator.php b/yii/validators/FilterValidator.php
new file mode 100644
index 0000000..72a9a9d
--- /dev/null
+++ b/yii/validators/FilterValidator.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\validators;
+use yii\base\InvalidConfigException;
+
+/**
+ * FilterValidator converts the attribute value according to a filter.
+ *
+ * FilterValidator is actually not a validator but a data processor.
+ * It invokes the specified filter callback to process the attribute value
+ * and save the processed value back to the attribute. The filter must be
+ * a valid PHP callback with the following signature:
+ *
+ * ~~~
+ * function foo($value) {...return $newValue; }
+ * ~~~
+ *
+ * Many PHP functions qualify this signature (e.g. `trim()`).
+ *
+ * To specify the filter, set [[filter]] property to be the callback.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class FilterValidator extends Validator
+{
+	/**
+	 * @var callback the filter. This can be a global function name, anonymous function, etc.
+	 * The function signature must be as follows,
+	 *
+	 * ~~~
+	 * function foo($value) {...return $newValue; }
+	 * ~~~
+	 */
+	public $filter;
+	/**
+	 * @var boolean this property is overwritten to be false so that this validator will
+	 * be applied when the value being validated is empty.
+	 */
+	public $skipOnEmpty = false;
+
+	/**
+	 * Initializes the validator.
+	 * @throws InvalidConfigException if [[filter]] is not set.
+	 */
+	public function init()
+	{
+		parent::init();
+		if ($this->filter === null) {
+			throw new InvalidConfigException('The "filter" property must be set.');
+		}
+	}
+
+	/**
+	 * Validates the attribute of the object.
+	 * If there is any error, the error message is added to the object.
+	 * @param \yii\base\Model $object the object being validated
+	 * @param string $attribute the attribute being validated
+	 * @throws InvalidConfigException if filter property is not a valid callback
+	 */
+	public function validateAttribute($object, $attribute)
+	{
+		$object->$attribute = call_user_func($this->filter, $object->$attribute);
+	}
+}
diff --git a/yii/validators/InlineValidator.php b/yii/validators/InlineValidator.php
new file mode 100644
index 0000000..8af5bbc
--- /dev/null
+++ b/yii/validators/InlineValidator.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\validators;
+
+/**
+ * InlineValidator represents a validator which is defined as a method in the object being validated.
+ *
+ * The validation method must have the following signature:
+ *
+ * ~~~
+ * function foo($attribute, $params)
+ * ~~~
+ *
+ * where `$attribute` refers to the name of the attribute being validated, while `$params`
+ * is an array representing the additional parameters supplied in the validation rule.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class InlineValidator extends Validator
+{
+	/**
+	 * @var string|\Closure an anonymous function or the name of a model class method that will be
+	 * called to perform the actual validation. Note that if you use anonymous function, you cannot
+	 * use `$this` in it unless you are using PHP 5.4 or above.
+	 */
+	public $method;
+	/**
+	 * @var array additional parameters that are passed to the validation method
+	 */
+	public $params;
+	/**
+	 * @var string|\Closure an anonymous function or the name of a model class method that returns the client validation code.
+	 * The signature of the method should be like the following:
+	 *
+	 * ~~~
+	 * function foo($attribute)
+	 * {
+	 *     return "javascript";
+	 * }
+	 * ~~~
+	 *
+	 * where `$attribute` refers to the attribute name to be validated.
+	 *
+	 * Please refer to [[clientValidateAttribute()]] for details on how to return client validation code.
+	 */
+	public $clientValidate;
+
+	/**
+	 * Validates the attribute of the object.
+	 * @param \yii\base\Model $object the object being validated
+	 * @param string $attribute the attribute being validated
+	 */
+	public function validateAttribute($object, $attribute)
+	{
+		$method = $this->method;
+		if (is_string($method)) {
+			$method = array($object, $method);
+		}
+		call_user_func($method, $attribute, $this->params);
+	}
+
+	/**
+	 * Returns the JavaScript needed for performing client-side validation.
+	 *
+	 * You may override this method to return the JavaScript validation code if
+	 * the validator can support client-side validation.
+	 *
+	 * The following JavaScript variables are predefined and can be used in the validation code:
+	 *
+	 * - `attribute`: the name of the attribute being validated.
+	 * - `value`: the value being validated.
+	 * - `messages`: an array used to hold the validation error messages for the attribute.
+	 *
+	 * @param \yii\base\Model $object the data object being validated
+	 * @param string $attribute the name of the attribute to be validated.
+	 * @return string the client-side validation script. Null if the validator does not support
+	 * client-side validation.
+	 * @see enableClientValidation
+	 * @see \yii\web\ActiveForm::enableClientValidation
+	 */
+	public function clientValidateAttribute($object, $attribute)
+	{
+		if ($this->clientValidate !== null) {
+			$method = $this->clientValidate;
+			if (is_string($method)) {
+				$method = array($object, $method);
+			}
+			return call_user_func($method, $attribute);
+		} else {
+			return null;
+		}
+	}
+}
diff --git a/yii/validators/NumberValidator.php b/yii/validators/NumberValidator.php
new file mode 100644
index 0000000..10f0e52
--- /dev/null
+++ b/yii/validators/NumberValidator.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\validators;
+
+use Yii;
+use yii\helpers\Html;
+use yii\web\JsExpression;
+use yii\helpers\Json;
+
+/**
+ * NumberValidator validates that the attribute value is a number.
+ *
+ * The format of the number must match the regular expression specified in [[pattern]].
+ * Optionally, you may configure the [[max]] and [[min]] properties to ensure the number
+ * is within certain range.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class NumberValidator extends Validator
+{
+	/**
+	 * @var boolean whether the attribute value can only be an integer. Defaults to false.
+	 */
+	public $integerOnly = false;
+	/**
+	 * @var integer|float upper limit of the number. Defaults to null, meaning no upper limit.
+	 */
+	public $max;
+	/**
+	 * @var integer|float lower limit of the number. Defaults to null, meaning no lower limit.
+	 */
+	public $min;
+	/**
+	 * @var string user-defined error message used when the value is bigger than [[max]].
+	 */
+	public $tooBig;
+	/**
+	 * @var string user-defined error message used when the value is smaller than [[min]].
+	 */
+	public $tooSmall;
+	/**
+	 * @var string the regular expression for matching integers.
+	 */
+	public $integerPattern = '/^\s*[+-]?\d+\s*$/';
+	/**
+	 * @var string the regular expression for matching numbers. It defaults to a pattern
+	 * that matches floating numbers with optional exponential part (e.g. -1.23e-10).
+	 */
+	public $numberPattern = '/^\s*[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?\s*$/';
+
+
+	/**
+	 * Initializes the validator.
+	 */
+	public function init()
+	{
+		parent::init();
+		if ($this->message === null) {
+			$this->message = $this->integerOnly ? Yii::t('yii|{attribute} must be an integer.')
+				: Yii::t('yii|{attribute} must be a number.');
+		}
+		if ($this->min !== null && $this->tooSmall === null) {
+			$this->tooSmall = Yii::t('yii|{attribute} must be no less than {min}.');
+		}
+		if ($this->max !== null && $this->tooBig === null) {
+			$this->tooBig = Yii::t('yii|{attribute} must be no greater than {max}.');
+		}
+	}
+
+	/**
+	 * Validates the attribute of the object.
+	 * If there is any error, the error message is added to the object.
+	 * @param \yii\base\Model $object the object being validated
+	 * @param string $attribute the attribute being validated
+	 */
+	public function validateAttribute($object, $attribute)
+	{
+		$value = $object->$attribute;
+		if (is_array($value)) {
+			$this->addError($object, $attribute, Yii::t('yii|{attribute} is invalid.'));
+			return;
+		}
+		$pattern = $this->integerOnly ? $this->integerPattern : $this->numberPattern;
+		if (!preg_match($pattern, "$value")) {
+			$this->addError($object, $attribute, $this->message);
+		}
+		if ($this->min !== null && $value < $this->min) {
+			$this->addError($object, $attribute, $this->tooSmall, array('{min}' => $this->min));
+		}
+		if ($this->max !== null && $value > $this->max) {
+			$this->addError($object, $attribute, $this->tooBig, array('{max}' => $this->max));
+		}
+	}
+
+	/**
+	 * Validates the given value.
+	 * @param mixed $value the value to be validated.
+	 * @return boolean whether the value is valid.
+	 */
+	public function validateValue($value)
+	{
+		return preg_match($this->integerOnly ? $this->integerPattern : $this->numberPattern, "$value")
+			&& ($this->min === null || $value >= $this->min)
+			&& ($this->max === null || $value <= $this->max);
+	}
+
+	/**
+	 * Returns the JavaScript needed for performing client-side validation.
+	 * @param \yii\base\Model $object the data object being validated
+	 * @param string $attribute the name of the attribute to be validated.
+	 * @return string the client-side validation script.
+	 */
+	public function clientValidateAttribute($object, $attribute)
+	{
+		$label = $object->getAttributeLabel($attribute);
+		$value = $object->$attribute;
+
+		$options = array(
+			'pattern' => new JsExpression($this->integerOnly ? $this->integerPattern : $this->numberPattern),
+			'message' => Html::encode(strtr($this->message, array(
+				'{attribute}' => $label,
+				'{value}' => $value,
+			))),
+		);
+
+		if ($this->min !== null) {
+			$options['min'] = $this->min;
+			$options['tooSmall'] = Html::encode(strtr($this->tooSmall, array(
+				'{attribute}' => $label,
+				'{value}' => $value,
+				'{min}' => $this->min,
+			)));
+		}
+		if ($this->max !== null) {
+			$options['max'] = $this->max;
+			$options['tooBig'] = Html::encode(strtr($this->tooBig, array(
+				'{attribute}' => $label,
+				'{value}' => $value,
+				'{max}' => $this->max,
+			)));
+		}
+		if ($this->skipOnEmpty) {
+			$options['skipOnEmpty'] = 1;
+		}
+
+		return 'yii.validation.number(value, messages, ' . Json::encode($options) . ');';
+	}
+}
diff --git a/yii/validators/RangeValidator.php b/yii/validators/RangeValidator.php
new file mode 100644
index 0000000..2a9e15f
--- /dev/null
+++ b/yii/validators/RangeValidator.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\validators;
+
+use Yii;
+use yii\base\InvalidConfigException;
+use yii\helpers\Html;
+
+/**
+ * RangeValidator validates that the attribute value is among a list of values.
+ *
+ * The range can be specified via the [[range]] property.
+ * If the [[not]] property is set true, the validator will ensure the attribute value
+ * is NOT among the specified range.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class RangeValidator extends Validator
+{
+	/**
+	 * @var array list of valid values that the attribute value should be among
+	 */
+	public $range;
+	/**
+	 * @var boolean whether the comparison is strict (both type and value must be the same)
+	 */
+	public $strict = false;
+	/**
+	 * @var boolean whether to invert the validation logic. Defaults to false. If set to true,
+	 * the attribute value should NOT be among the list of values defined via [[range]].
+	 **/
+ 	public $not = false;
+
+	/**
+	 * Initializes the validator.
+	 * @throws InvalidConfigException if [[range]] is not set.
+	 */
+	public function init()
+	{
+		parent::init();
+		if (!is_array($this->range)) {
+			throw new InvalidConfigException('The "range" property must be set.');
+		}
+		if ($this->message === null) {
+			$this->message = Yii::t('yii|{attribute} is invalid.');
+		}
+	}
+
+	/**
+	 * Validates the attribute of the object.
+	 * If there is any error, the error message is added to the object.
+	 * @param \yii\base\Model $object the object being validated
+	 * @param string $attribute the attribute being validated
+	 */
+	public function validateAttribute($object, $attribute)
+	{
+		$value = $object->$attribute;
+		if (!$this->validateValue($value)) {
+			$this->addError($object, $attribute, $this->message);
+		}
+	}
+
+	/**
+	 * Validates the given value.
+	 * @param mixed $value the value to be validated.
+	 * @return boolean whether the value is valid.
+	 */
+	public function validateValue($value)
+	{
+		return !$this->not && in_array($value, $this->range, $this->strict)
+			|| $this->not && !in_array($value, $this->range, $this->strict);
+	}
+
+	/**
+	 * Returns the JavaScript needed for performing client-side validation.
+	 * @param \yii\base\Model $object the data object being validated
+	 * @param string $attribute the name of the attribute to be validated.
+	 * @return string the client-side validation script.
+	 */
+	public function clientValidateAttribute($object, $attribute)
+	{
+		$range = array();
+		foreach ($this->range as $value) {
+			$range[] = (string)$value;
+		}
+		$options = array(
+			'range' => $range,
+			'not' => $this->not,
+			'message' => Html::encode(strtr($this->message, array(
+				'{attribute}' => $object->getAttributeLabel($attribute),
+				'{value}' => $object->$attribute,
+			))),
+		);
+		if ($this->skipOnEmpty) {
+			$options['skipOnEmpty'] = 1;
+		}
+
+		return 'yii.validation.range(value, messages, ' . json_encode($options) . ');';
+	}
+}
diff --git a/yii/validators/RegularExpressionValidator.php b/yii/validators/RegularExpressionValidator.php
new file mode 100644
index 0000000..23419b9
--- /dev/null
+++ b/yii/validators/RegularExpressionValidator.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\validators;
+
+use Yii;
+use yii\base\InvalidConfigException;
+use yii\helpers\Html;
+use yii\web\JsExpression;
+use yii\helpers\Json;
+
+/**
+ * RegularExpressionValidator validates that the attribute value matches the specified [[pattern]].
+ *
+ * If the [[not]] property is set true, the validator will ensure the attribute value do NOT match the [[pattern]].
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class RegularExpressionValidator extends Validator
+{
+	/**
+	 * @var string the regular expression to be matched with
+	 */
+	public $pattern;
+	/**
+	 * @var boolean whether to invert the validation logic. Defaults to false. If set to true,
+	 * the regular expression defined via [[pattern]] should NOT match the attribute value.
+	 * @throws InvalidConfigException if the "pattern" is not a valid regular expression
+	 **/
+ 	public $not = false;
+
+	/**
+	 * Initializes the validator.
+	 * @throws InvalidConfigException if [[pattern]] is not set.
+	 */
+	public function init()
+	{
+		parent::init();
+		if ($this->pattern === null) {
+			throw new InvalidConfigException('The "pattern" property must be set.');
+		}
+		if ($this->message === null) {
+			$this->message = Yii::t('yii|{attribute} is invalid.');
+		}
+	}
+
+	/**
+	 * Validates the attribute of the object.
+	 * If there is any error, the error message is added to the object.
+	 * @param \yii\base\Model $object the object being validated
+	 * @param string $attribute the attribute being validated
+	 */
+	public function validateAttribute($object, $attribute)
+	{
+		$value = $object->$attribute;
+		if (!$this->validateValue($value)) {
+			$this->addError($object, $attribute, $this->message);
+		}
+	}
+
+	/**
+	 * Validates the given value.
+	 * @param mixed $value the value to be validated.
+	 * @return boolean whether the value is valid.
+	 */
+	public function validateValue($value)
+	{
+		return !is_array($value) &&
+			(!$this->not && preg_match($this->pattern, $value)
+			|| $this->not && !preg_match($this->pattern, $value));
+	}
+
+	/**
+	 * Returns the JavaScript needed for performing client-side validation.
+	 * @param \yii\base\Model $object the data object being validated
+	 * @param string $attribute the name of the attribute to be validated.
+	 * @return string the client-side validation script.
+	 * @throws InvalidConfigException if the "pattern" is not a valid regular expression
+	 */
+	public function clientValidateAttribute($object, $attribute)
+	{
+		$pattern = $this->pattern;
+		$pattern = preg_replace('/\\\\x\{?([0-9a-fA-F]+)\}?/', '\u$1', $pattern);
+		$deliminator = substr($pattern, 0, 1);
+		$pos = strrpos($pattern, $deliminator, 1);
+		$flag = substr($pattern, $pos + 1);
+		if ($deliminator !== '/') {
+			$pattern = '/' . str_replace('/', '\\/', substr($pattern, 1, $pos - 1)) . '/';
+		} else {
+			$pattern = substr($pattern, 0, $pos + 1);
+		}
+		if (!empty($flag)) {
+			$pattern .= preg_replace('/[^igm]/', '', $flag);
+		}
+
+		$options = array(
+			'pattern' => new JsExpression($pattern),
+			'not' => $this->not,
+			'message' => Html::encode(strtr($this->message, array(
+				'{attribute}' => $object->getAttributeLabel($attribute),
+				'{value}' => $object->$attribute,
+			))),
+		);
+		if ($this->skipOnEmpty) {
+			$options['skipOnEmpty'] = 1;
+		}
+
+		return 'yii.validation.regularExpression(value, messages, ' . Json::encode($options) . ');';
+	}
+}
diff --git a/yii/validators/RequiredValidator.php b/yii/validators/RequiredValidator.php
new file mode 100644
index 0000000..4c14a8d
--- /dev/null
+++ b/yii/validators/RequiredValidator.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\validators;
+
+use Yii;
+use yii\helpers\Html;
+
+/**
+ * RequiredValidator validates that the specified attribute does not have null or empty value.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class RequiredValidator extends Validator
+{
+	/**
+	 * @var boolean whether to skip this validator if the value being validated is empty.
+	 */
+	public $skipOnEmpty = false;
+	/**
+	 * @var mixed the desired value that the attribute must have.
+	 * If this is null, the validator will validate that the specified attribute is not empty.
+	 * If this is set as a value that is not null, the validator will validate that
+	 * the attribute has a value that is the same as this property value.
+	 * Defaults to null.
+	 * @see strict
+	 */
+	public $requiredValue;
+	/**
+	 * @var boolean whether the comparison between the attribute value and [[requiredValue]] is strict.
+	 * When this is true, both the values and types must match.
+	 * Defaults to false, meaning only the values need to match.
+	 * Note that when [[requiredValue]] is null, if this property is true, the validator will check
+	 * if the attribute value is null; If this property is false, the validator will call [[isEmpty]]
+	 * to check if the attribute value is empty.
+	 */
+	public $strict = false;
+	/**
+	 * @var string the user-defined error message. It may contain the following placeholders which
+	 * will be replaced accordingly by the validator:
+	 *
+	 * - `{attribute}`: the label of the attribute being validated
+	 * - `{value}`: the value of the attribute being validated
+	 * - `{requiredValue}`: the value of [[requiredValue]]
+	 */
+	public $message;
+
+	/**
+	 * Initializes the validator.
+	 */
+	public function init()
+	{
+		parent::init();
+		if ($this->message === null) {
+			$this->message = $this->requiredValue === null ? Yii::t('yii|{attribute} cannot be blank.')
+				: Yii::t('yii|{attribute} must be "{requiredValue}".');
+		}
+	}
+
+	/**
+	 * Validates the attribute of the object.
+	 * If there is any error, the error message is added to the object.
+	 * @param \yii\base\Model $object the object being validated
+	 * @param string $attribute the attribute being validated
+	 */
+	public function validateAttribute($object, $attribute)
+	{
+		if (!$this->validateValue($object->$attribute)) {
+			if ($this->requiredValue === null) {
+				$this->addError($object, $attribute, $this->message);
+			} else {
+				$this->addError($object, $attribute, $this->message, array(
+					'{requiredValue}' => $this->requiredValue,
+				));
+			}
+		}
+	}
+
+	/**
+	 * Validates the given value.
+	 * @param mixed $value the value to be validated.
+	 * @return boolean whether the value is valid.
+	 */
+	public function validateValue($value)
+	{
+		if ($this->requiredValue === null) {
+			if ($this->strict && $value !== null || !$this->strict && !$this->isEmpty($value, true)) {
+				return true;
+			}
+		} elseif (!$this->strict && $value == $this->requiredValue || $this->strict && $value === $this->requiredValue) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Returns the JavaScript needed for performing client-side validation.
+	 * @param \yii\base\Model $object the data object being validated
+	 * @param string $attribute the name of the attribute to be validated.
+	 * @return string the client-side validation script.
+	 */
+	public function clientValidateAttribute($object, $attribute)
+	{
+		$options = array();
+		if ($this->requiredValue !== null) {
+			$options['message'] = strtr($this->message, array(
+				'{requiredValue}' => $this->requiredValue,
+			));
+			$options['requiredValue'] = $this->requiredValue;
+		} else {
+			$options['message'] = $this->message;
+		}
+		if ($this->strict) {
+			$options['strict'] = 1;
+		}
+
+		$options['message'] = Html::encode(strtr($options['message'], array(
+			'{attribute}' => $object->getAttributeLabel($attribute),
+			'{value}' => $object->$attribute,
+		)));
+
+		return 'yii.validation.required(value, messages, ' . json_encode($options) . ');';
+	}
+}
diff --git a/yii/validators/StringValidator.php b/yii/validators/StringValidator.php
new file mode 100644
index 0000000..5d0fa1a
--- /dev/null
+++ b/yii/validators/StringValidator.php
@@ -0,0 +1,174 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\validators;
+
+use Yii;
+use yii\helpers\Html;
+
+/**
+ * StringValidator validates that the attribute value is of certain length.
+ *
+ * Note, this validator should only be used with string-typed attributes.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class StringValidator extends Validator
+{
+	/**
+	 * @var integer maximum length. Defaults to null, meaning no maximum limit.
+	 */
+	public $max;
+	/**
+	 * @var integer minimum length. Defaults to null, meaning no minimum limit.
+	 */
+	public $min;
+	/**
+	 * @var integer exact length. Defaults to null, meaning no exact length limit.
+	 */
+	public $is;
+	/**
+	 * @var string user-defined error message used when the value is not a string
+	 */
+	public $message;
+	/**
+	 * @var string user-defined error message used when the length of the value is smaller than [[min]].
+	 */
+	public $tooShort;
+	/**
+	 * @var string user-defined error message used when the length of the value is greater than [[max]].
+	 */
+	public $tooLong;
+	/**
+	 * @var string user-defined error message used when the length of the value is not equal to [[is]].
+	 */
+	public $notEqual;
+	/**
+	 * @var string the encoding of the string value to be validated (e.g. 'UTF-8').
+	 * If this property is not set, [[\yii\base\Application::charset]] will be used.
+	 */
+	public $encoding;
+
+
+	/**
+	 * Initializes the validator.
+	 */
+	public function init()
+	{
+		parent::init();
+		if ($this->encoding === null) {
+			$this->encoding = Yii::$app->charset;
+		}
+		if ($this->message === null) {
+			$this->message = Yii::t('yii|{attribute} must be a string.');
+		}
+		if ($this->min !== null && $this->tooShort === null) {
+			$this->tooShort = Yii::t('yii|{attribute} should contain at least {min} characters.');
+		}
+		if ($this->max !== null && $this->tooLong === null) {
+			$this->tooLong = Yii::t('yii|{attribute} should contain at most {max} characters.');
+		}
+		if ($this->is !== null && $this->notEqual === null) {
+			$this->notEqual = Yii::t('yii|{attribute} should contain {length} characters.');
+		}
+	}
+
+	/**
+	 * Validates the attribute of the object.
+	 * If there is any error, the error message is added to the object.
+	 * @param \yii\base\Model $object the object being validated
+	 * @param string $attribute the attribute being validated
+	 */
+	public function validateAttribute($object, $attribute)
+	{
+		$value = $object->$attribute;
+
+		if (!is_string($value)) {
+			$this->addError($object, $attribute, $this->message);
+			return;
+		}
+
+		$length = mb_strlen($value, $this->encoding);
+
+		if ($this->min !== null && $length < $this->min) {
+			$this->addError($object, $attribute, $this->tooShort, array('{min}' => $this->min));
+		}
+		if ($this->max !== null && $length > $this->max) {
+			$this->addError($object, $attribute, $this->tooLong, array('{max}' => $this->max));
+		}
+		if ($this->is !== null && $length !== $this->is) {
+			$this->addError($object, $attribute, $this->notEqual, array('{length}' => $this->is));
+		}
+	}
+
+	/**
+	 * Validates the given value.
+	 * @param mixed $value the value to be validated.
+	 * @return boolean whether the value is valid.
+	 */
+	public function validateValue($value)
+	{
+		if (!is_string($value)) {
+			return false;
+		}
+		$length = mb_strlen($value, $this->encoding);
+		return ($this->min === null || $length >= $this->min)
+			&& ($this->max === null || $length <= $this->max)
+			&& ($this->is === null || $length === $this->is);
+	}
+
+	/**
+	 * Returns the JavaScript needed for performing client-side validation.
+	 * @param \yii\base\Model $object the data object being validated
+	 * @param string $attribute the name of the attribute to be validated.
+	 * @return string the client-side validation script.
+	 */
+	public function clientValidateAttribute($object, $attribute)
+	{
+		$label = $object->getAttributeLabel($attribute);
+		$value = $object->$attribute;
+
+		$options = array(
+			'message' => Html::encode(strtr($this->message, array(
+				'{attribute}' => $label,
+				'{value}' => $value,
+			))),
+		);
+
+		if ($this->min !== null) {
+			$options['min'] = $this->min;
+			$options['tooShort'] = Html::encode(strtr($this->tooShort, array(
+				'{attribute}' => $label,
+				'{value}' => $value,
+				'{min}' => $this->min,
+			)));
+		}
+		if ($this->max !== null) {
+			$options['max'] = $this->max;
+			$options['tooLong'] = Html::encode(strtr($this->tooLong, array(
+				'{attribute}' => $label,
+				'{value}' => $value,
+				'{max}' => $this->max,
+			)));
+		}
+		if ($this->is !== null) {
+			$options['is'] = $this->is;
+			$options['notEqual'] = Html::encode(strtr($this->notEqual, array(
+				'{attribute}' => $label,
+				'{value}' => $value,
+				'{length}' => $this->is,
+			)));
+		}
+		if ($this->skipOnEmpty) {
+			$options['skipOnEmpty'] = 1;
+		}
+
+		return 'yii.validation.string(value, messages, ' . json_encode($options) . ');';
+	}
+}
+
diff --git a/yii/validators/UniqueValidator.php b/yii/validators/UniqueValidator.php
new file mode 100644
index 0000000..7072ff4
--- /dev/null
+++ b/yii/validators/UniqueValidator.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\validators;
+
+use Yii;
+use yii\base\InvalidConfigException;
+
+/**
+ * CUniqueValidator validates that the attribute value is unique in the corresponding database table.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class UniqueValidator extends Validator
+{
+	/**
+	 * @var string the ActiveRecord class name or alias of the class
+	 * that should be used to look for the attribute value being validated.
+	 * Defaults to null, meaning using the ActiveRecord class of the attribute being validated.
+	 * @see attributeName
+	 */
+	public $className;
+	/**
+	 * @var string the ActiveRecord class attribute name that should be
+	 * used to look for the attribute value being validated. Defaults to null,
+	 * meaning using the name of the attribute being validated.
+	 */
+	public $attributeName;
+
+	/**
+	 * Initializes the validator.
+	 */
+	public function init()
+	{
+		parent::init();
+		if ($this->message === null) {
+			$this->message = Yii::t('yii|{attribute} "{value}" has already been taken.');
+		}
+	}
+
+	/**
+	 * Validates the attribute of the object.
+	 * If there is any error, the error message is added to the object.
+	 * @param \yii\db\ActiveRecord $object the object being validated
+	 * @param string $attribute the attribute being validated
+	 * @throws InvalidConfigException if table doesn't have column specified
+	 */
+	public function validateAttribute($object, $attribute)
+	{
+		$value = $object->$attribute;
+
+		if (is_array($value)) {
+			$this->addError($object, $attribute, Yii::t('yii|{attribute} is invalid.'));
+			return;
+		}
+
+		/** @var $className \yii\db\ActiveRecord */
+		$className = $this->className === null ? get_class($object) : Yii::import($this->className);
+		$attributeName = $this->attributeName === null ? $attribute : $this->attributeName;
+
+		$table = $className::getTableSchema();
+		if (($column = $table->getColumn($attributeName)) === null) {
+			throw new InvalidConfigException("Table '{$table->name}' does not have a column named '$attributeName'.");
+		}
+
+		$query = $className::find();
+		$query->where(array($column->name => $value));
+
+		if ($object->getIsNewRecord()) {
+			// if current $object isn't in the database yet then it's OK just to call exists()
+			$exists = $query->exists();
+		} else {
+			// if current $object is in the database already we can't use exists()
+			$query->limit(2);
+			$objects = $query->all();
+
+			$n = count($objects);
+			if ($n === 1) {
+				if ($column->isPrimaryKey) {
+					// primary key is modified and not unique
+					$exists = $object->getOldPrimaryKey() != $object->getPrimaryKey();
+				} else {
+					// non-primary key, need to exclude the current record based on PK
+					$exists = array_shift($objects)->getPrimaryKey() != $object->getOldPrimaryKey();
+				}
+			} else {
+				$exists = $n > 1;
+			}
+		}
+
+		if ($exists) {
+			$this->addError($object, $attribute, $this->message);
+		}
+	}
+}
diff --git a/yii/validators/UrlValidator.php b/yii/validators/UrlValidator.php
new file mode 100644
index 0000000..c418353
--- /dev/null
+++ b/yii/validators/UrlValidator.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\validators;
+
+use Yii;
+use yii\helpers\Html;
+use yii\web\JsExpression;
+use yii\helpers\Json;
+
+/**
+ * UrlValidator validates that the attribute value is a valid http or https URL.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class UrlValidator extends Validator
+{
+	/**
+	 * @var string the regular expression used to validate the attribute value.
+	 * The pattern may contain a `{schemes}` token that will be replaced
+	 * by a regular expression which represents the [[validSchemes]].
+	 */
+	public $pattern = '/^{schemes}:\/\/(([A-Z0-9][A-Z0-9_-]*)(\.[A-Z0-9][A-Z0-9_-]*)+)/i';
+	/**
+	 * @var array list of URI schemes which should be considered valid. By default, http and https
+	 * are considered to be valid schemes.
+	 **/
+	public $validSchemes = array('http', 'https');
+	/**
+	 * @var string the default URI scheme. If the input doesn't contain the scheme part, the default
+	 * scheme will be prepended to it (thus changing the input). Defaults to null, meaning a URL must
+	 * contain the scheme part.
+	 **/
+	public $defaultScheme;
+
+
+	/**
+	 * Initializes the validator.
+	 */
+	public function init()
+	{
+		parent::init();
+		if ($this->message === null) {
+			$this->message = Yii::t('yii|{attribute} is not a valid URL.');
+		}
+	}
+
+	/**
+	 * Validates the attribute of the object.
+	 * If there is any error, the error message is added to the object.
+	 * @param \yii\base\Model $object the object being validated
+	 * @param string $attribute the attribute being validated
+	 */
+	public function validateAttribute($object, $attribute)
+	{
+		$value = $object->$attribute;
+		if ($this->validateValue($value)) {
+			if ($this->defaultScheme !== null && strpos($value, '://') === false) {
+				$object->$attribute = $this->defaultScheme . '://' . $value;
+			}
+		} else {
+			$this->addError($object, $attribute, $this->message);
+		}
+	}
+
+	/**
+	 * Validates the given value.
+	 * @param mixed $value the value to be validated.
+	 * @return boolean whether the value is valid.
+	 */
+	public function validateValue($value)
+	{
+		// make sure the length is limited to avoid DOS attacks
+		if (is_string($value) && strlen($value) < 2000) {
+			if ($this->defaultScheme !== null && strpos($value, '://') === false) {
+				$value = $this->defaultScheme . '://' . $value;
+			}
+
+			if (strpos($this->pattern, '{schemes}') !== false) {
+				$pattern = str_replace('{schemes}', '(' . implode('|', $this->validSchemes) . ')', $this->pattern);
+			} else {
+				$pattern = $this->pattern;
+			}
+
+			if (preg_match($pattern, $value)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Returns the JavaScript needed for performing client-side validation.
+	 * @param \yii\base\Model $object the data object being validated
+	 * @param string $attribute the name of the attribute to be validated.
+	 * @return string the client-side validation script.
+	 * @see \yii\Web\ActiveForm::enableClientValidation
+	 */
+	public function clientValidateAttribute($object, $attribute)
+	{
+		if (strpos($this->pattern, '{schemes}') !== false) {
+			$pattern = str_replace('{schemes}', '(' . implode('|', $this->validSchemes) . ')', $this->pattern);
+		} else {
+			$pattern = $this->pattern;
+		}
+
+		$options = array(
+			'pattern' => new JsExpression($pattern),
+			'message' => Html::encode(strtr($this->message, array(
+				'{attribute}' => $object->getAttributeLabel($attribute),
+				'{value}' => $object->$attribute,
+			))),
+		);
+		if ($this->skipOnEmpty) {
+			$options['skipOnEmpty'] = 1;
+		}
+		if ($this->defaultScheme !== null) {
+			$options['defaultScheme'] = $this->defaultScheme;
+		}
+
+		return 'yii.validation.url(value, messages, ' . Json::encode($options) . ');';
+	}
+}
+
diff --git a/yii/validators/Validator.php b/yii/validators/Validator.php
new file mode 100644
index 0000000..677191b
--- /dev/null
+++ b/yii/validators/Validator.php
@@ -0,0 +1,268 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\validators;
+
+use Yii;
+use yii\base\Component;
+use yii\base\NotSupportedException;
+
+/**
+ * Validator is the base class for all validators.
+ *
+ * Child classes should override the [[validateAttribute()]] method to provide the actual
+ * logic of performing data validation. Child classes may also override [[clientValidateAttribute()]]
+ * to provide client-side validation support.
+ *
+ * Validator declares a set of [[builtInValidators|built-in validators] which can
+ * be referenced using short names. They are listed as follows:
+ *
+ * - `boolean`: [[BooleanValidator]]
+ * - `captcha`: [[CaptchaValidator]]
+ * - `compare`: [[CompareValidator]]
+ * - `date`: [[DateValidator]]
+ * - `default`: [[DefaultValueValidator]]
+ * - `double`: [[NumberValidator]]
+ * - `email`: [[EmailValidator]]
+ * - `exist`: [[ExistValidator]]
+ * - `file`: [[FileValidator]]
+ * - `filter`: [[FilterValidator]]
+ * - `in`: [[RangeValidator]]
+ * - `integer`: [[NumberValidator]]
+ * - `match`: [[RegularExpressionValidator]]
+ * - `required`: [[RequiredValidator]]
+ * - `string`: [[StringValidator]]
+ * - `unique`: [[UniqueValidator]]
+ * - `url`: [[UrlValidator]]
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+abstract class Validator extends Component
+{
+	/**
+	 * @var array list of built-in validators (name => class or configuration)
+	 */
+	public static $builtInValidators = array(
+		'boolean' => 'yii\validators\BooleanValidator',
+		'captcha' => 'yii\validators\CaptchaValidator',
+		'compare' => 'yii\validators\CompareValidator',
+		'date' => 'yii\validators\DateValidator',
+		'default' => 'yii\validators\DefaultValueValidator',
+		'double' => 'yii\validators\NumberValidator',
+		'email' => 'yii\validators\EmailValidator',
+		'exist' => 'yii\validators\ExistValidator',
+		'file' => 'yii\validators\FileValidator',
+		'filter' => 'yii\validators\FilterValidator',
+		'in' => 'yii\validators\RangeValidator',
+		'integer' => array(
+			'class' => 'yii\validators\NumberValidator',
+			'integerOnly' => true,
+		),
+		'match' => 'yii\validators\RegularExpressionValidator',
+		'number' => 'yii\validators\NumberValidator',
+		'required' => 'yii\validators\RequiredValidator',
+		'string' => 'yii\validators\StringValidator',
+		'unique' => 'yii\validators\UniqueValidator',
+		'url' => 'yii\validators\UrlValidator',
+	);
+
+	/**
+	 * @var array list of attributes to be validated.
+	 */
+	public $attributes;
+	/**
+	 * @var string the user-defined error message. It may contain the following placeholders which
+	 * will be replaced accordingly by the validator:
+	 *
+	 * - `{attribute}`: the label of the attribute being validated
+	 * - `{value}`: the value of the attribute being validated
+	 */
+	public $message;
+	/**
+	 * @var array list of scenarios that the validator can be applied to.
+	 */
+	public $on = array();
+	/**
+	 * @var array list of scenarios that the validator should not be applied to.
+	 */
+	public $except = array();
+	/**
+	 * @var boolean whether this validation rule should be skipped if the attribute being validated
+	 * already has some validation error according to some previous rules. Defaults to true.
+	 */
+	public $skipOnError = true;
+	/**
+	 * @var boolean whether this validation rule should be skipped if the attribute value
+	 * is null or an empty string.
+	 */
+	public $skipOnEmpty = true;
+	/**
+	 * @var boolean whether to enable client-side validation for this validator.
+	 * The actual client-side validation is done via the JavaScript code returned
+	 * by [[clientValidateAttribute()]]. If that method returns null, even if this property
+	 * is true, no client-side validation will be done by this validator.
+	 */
+	public $enableClientValidation = true;
+
+	/**
+	 * Validates a single attribute.
+	 * Child classes must implement this method to provide the actual validation logic.
+	 * @param \yii\base\Model $object the data object to be validated
+	 * @param string $attribute the name of the attribute to be validated.
+	 */
+	abstract public function validateAttribute($object, $attribute);
+
+	/**
+	 * Creates a validator object.
+	 * @param string $type the validator type. This can be a method name,
+	 * a built-in validator name, a class name, or a path alias of the validator class.
+	 * @param \yii\base\Model $object the data object to be validated.
+	 * @param array|string $attributes list of attributes to be validated. This can be either an array of
+	 * the attribute names or a string of comma-separated attribute names.
+	 * @param array $params initial values to be applied to the validator properties
+	 * @return Validator the validator
+	 */
+	public static function createValidator($type, $object, $attributes, $params = array())
+	{
+		if (!is_array($attributes)) {
+			$attributes = preg_split('/[\s,]+/', $attributes, -1, PREG_SPLIT_NO_EMPTY);
+		}
+		$params['attributes'] = $attributes;
+
+		if (isset($params['on']) && !is_array($params['on'])) {
+			$params['on'] = preg_split('/[\s,]+/', $params['on'], -1, PREG_SPLIT_NO_EMPTY);
+		}
+
+		if (isset($params['except']) && !is_array($params['except'])) {
+			$params['except'] = preg_split('/[\s,]+/', $params['except'], -1, PREG_SPLIT_NO_EMPTY);
+		}
+
+		if (method_exists($object, $type)) {
+			// method-based validator
+			$params['class'] = __NAMESPACE__ . '\InlineValidator';
+			$params['method'] = $type;
+		} else {
+			if (isset(self::$builtInValidators[$type])) {
+				$type = self::$builtInValidators[$type];
+			}
+			if (is_array($type)) {
+				foreach ($type as $name => $value) {
+					$params[$name] = $value;
+				}
+			} else {
+				$params['class'] = $type;
+			}
+		}
+
+		return Yii::createObject($params);
+	}
+
+	/**
+	 * Validates the specified object.
+	 * @param \yii\base\Model $object the data object being validated
+	 * @param array|null $attributes the list of attributes to be validated.
+	 * Note that if an attribute is not associated with the validator,
+	 * it will be ignored.
+	 * If this parameter is null, every attribute listed in [[attributes]] will be validated.
+	 */
+	public function validate($object, $attributes = null)
+	{
+		if (is_array($attributes)) {
+			$attributes = array_intersect($this->attributes, $attributes);
+		} else {
+			$attributes = $this->attributes;
+		}
+		foreach ($attributes as $attribute) {
+			$skip = $this->skipOnError && $object->hasErrors($attribute)
+				 || $this->skipOnEmpty && $this->isEmpty($object->$attribute);
+			if (!$skip) {
+				$this->validateAttribute($object, $attribute);
+			}
+		}
+	}
+
+	/**
+	 * Validates a value.
+	 * A validator class can implement this method to support data validation out of the context of a data model.
+	 * @param mixed $value the data value to be validated.
+	 * @throws NotSupportedException if data validation without a model is not supported
+	 */
+	public function validateValue($value)
+	{
+		throw new NotSupportedException(get_class($this) . ' does not support validateValue().');
+	}
+
+	/**
+	 * Returns the JavaScript needed for performing client-side validation.
+	 *
+	 * You may override this method to return the JavaScript validation code if
+	 * the validator can support client-side validation.
+	 *
+	 * The following JavaScript variables are predefined and can be used in the validation code:
+	 *
+	 * - `attribute`: the name of the attribute being validated.
+	 * - `value`: the value being validated.
+	 * - `messages`: an array used to hold the validation error messages for the attribute.
+	 *
+	 * @param \yii\base\Model $object the data object being validated
+	 * @param string $attribute the name of the attribute to be validated.
+	 * @return string the client-side validation script. Null if the validator does not support
+	 * client-side validation.
+	 * @see \yii\web\ActiveForm::enableClientValidation
+	 */
+	public function clientValidateAttribute($object, $attribute)
+	{
+		return null;
+	}
+
+	/**
+	 * Returns a value indicating whether the validator is active for the given scenario and attribute.
+	 *
+	 * A validator is active if
+	 *
+	 * - the validator's `on` property is empty, or
+	 * - the validator's `on` property contains the specified scenario
+	 *
+	 * @param string $scenario scenario name
+	 * @return boolean whether the validator applies to the specified scenario.
+	 */
+	public function isActive($scenario)
+	{
+		return !in_array($scenario, $this->except, true) && (empty($this->on) || in_array($scenario, $this->on, true));
+	}
+
+	/**
+	 * Adds an error about the specified attribute to the model object.
+	 * This is a helper method that performs message selection and internationalization.
+	 * @param \yii\base\Model $object the data object being validated
+	 * @param string $attribute the attribute being validated
+	 * @param string $message the error message
+	 * @param array $params values for the placeholders in the error message
+	 */
+	public function addError($object, $attribute, $message, $params = array())
+	{
+		$value = $object->$attribute;
+		$params['{attribute}'] = $object->getAttributeLabel($attribute);
+		$params['{value}'] = is_array($value) ? 'array()' : $value;
+		$object->addError($attribute, strtr($message, $params));
+	}
+
+	/**
+	 * Checks if the given value is empty.
+	 * A value is considered empty if it is null, an empty array, or the trimmed result is an empty string.
+	 * Note that this method is different from PHP empty(). It will return false when the value is 0.
+	 * @param mixed $value the value to be checked
+	 * @param boolean $trim whether to perform trimming before checking if the string is empty. Defaults to false.
+	 * @return boolean whether the value is empty
+	 */
+	public function isEmpty($value, $trim = false)
+	{
+		return $value === null || $value === array() || $value === ''
+			|| $trim && is_scalar($value) && trim($value) === '';
+	}
+}
diff --git a/yii/views/error.php b/yii/views/error.php
new file mode 100644
index 0000000..009050a
--- /dev/null
+++ b/yii/views/error.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * @var \Exception $exception
+ * @var \yii\base\ErrorHandler $context
+ */
+$context = $this->context;
+$title = $context->htmlEncode($exception instanceof \yii\base\Exception ? $exception->getName() : get_class($exception));
+?>
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="utf-8" />
+	<title><?php echo $title?></title>
+
+	<style>
+	body {
+		font: normal 9pt "Verdana";
+		color: #000;
+		background: #fff;
+	}
+
+	h1 {
+		font: normal 18pt "Verdana";
+		color: #f00;
+		margin-bottom: .5em;
+	}
+
+	h2 {
+		font: normal 14pt "Verdana";
+		color: #800000;
+		margin-bottom: .5em;
+	}
+
+	h3 {
+		font: bold 11pt "Verdana";
+	}
+
+	p {
+		font: normal 9pt "Verdana";
+		color: #000;
+	}
+
+	.version {
+		color: gray;
+		font-size: 8pt;
+		border-top: 1px solid #aaa;
+		padding-top: 1em;
+		margin-bottom: 1em;
+	}
+	</style>
+</head>
+
+<body>
+	<h1><?php echo $title?></h1>
+	<h2><?php echo nl2br($context->htmlEncode($exception->getMessage()))?></h2>
+	<p>
+		The above error occurred while the Web server was processing your request.
+	</p>
+	<p>
+		Please contact us if you think this is a server error. Thank you.
+	</p>
+	<div class="version">
+		<?php echo date('Y-m-d H:i:s', time())?>
+		<?php echo YII_DEBUG ? $context->versionInfo : ''?>
+	</div>
+</body>
+</html>
diff --git a/yii/views/exception.php b/yii/views/exception.php
new file mode 100644
index 0000000..f2aced0
--- /dev/null
+++ b/yii/views/exception.php
@@ -0,0 +1,211 @@
+<?php
+/**
+ * @var \Exception $exception
+ * @var \yii\base\ErrorHandler $context
+ */
+$context = $this->context;
+$title = $context->htmlEncode($exception instanceof \yii\base\Exception ? $exception->getName().' ('.get_class($exception).')' : get_class($exception));
+?>
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="utf-8" />
+	<title><?php echo $title?></title>
+	<style>
+	html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{border:0;outline:0;font-size:100%;vertical-align:baseline;background:transparent;margin:0;padding:0;}
+	body{line-height:1;}
+	ol,ul{list-style:none;}
+	blockquote,q{quotes:none;}
+	blockquote:before,blockquote:after,q:before,q:after{content:none;}
+	:focus{outline:0;}
+	ins{text-decoration:none;}
+	del{text-decoration:line-through;}
+	table{border-collapse:collapse;border-spacing:0;}
+
+	body {
+		font: normal 9pt "Verdana";
+		color: #000;
+		background: #fff;
+	}
+
+	h1 {
+		font: normal 18pt "Verdana";
+		color: #f00;
+		margin-bottom: .5em;
+	}
+
+	h2 {
+		font: normal 14pt "Verdana";
+		color: #800000;
+		margin-bottom: .5em;
+	}
+
+	h3 {
+		font: bold 11pt "Verdana";
+	}
+
+	pre {
+		font: normal 11pt Menlo, Consolas, "Lucida Console", Monospace;
+	}
+
+	pre span.error {
+		display: block;
+		background: #fce3e3;
+	}
+
+	pre span.ln {
+		color: #999;
+		padding-right: 0.5em;
+		border-right: 1px solid #ccc;
+	}
+
+	pre span.error-ln {
+		font-weight: bold;
+	}
+
+	.container {
+		margin: 1em 4em;
+	}
+
+	.version {
+		color: gray;
+		font-size: 8pt;
+		border-top: 1px solid #aaa;
+		padding-top: 1em;
+		margin-bottom: 1em;
+	}
+
+	.message {
+		color: #000;
+		padding: 1em;
+		font-size: 11pt;
+		background: #f3f3f3;
+		-webkit-border-radius: 10px;
+		-moz-border-radius: 10px;
+		border-radius: 10px;
+		margin-bottom: 1em;
+		line-height: 160%;
+	}
+
+	.source {
+		margin-bottom: 1em;
+	}
+
+	.code pre {
+		background-color: #ffe;
+		margin: 0.5em 0;
+		padding: 0.5em;
+		line-height: 125%;
+		border: 1px solid #eee;
+	}
+
+	.source .file {
+		margin-bottom: 1em;
+		font-weight: bold;
+	}
+
+	.traces {
+		margin: 2em 0;
+	}
+
+	.trace {
+		margin: 0.5em 0;
+		padding: 0.5em;
+	}
+
+	.trace.app {
+		border: 1px dashed #c00;
+	}
+
+	.trace .number {
+		text-align: right;
+		width: 2em;
+		padding: 0.5em;
+	}
+
+	.trace .content {
+		padding: 0.5em;
+	}
+
+	.trace .plus,
+	.trace .minus {
+		display: inline;
+		vertical-align: middle;
+		text-align: center;
+		border: 1px solid #000;
+		color: #000;
+		font-size: 10px;
+		line-height: 10px;
+		margin: 0;
+		padding: 0 1px;
+		width: 10px;
+		height: 10px;
+	}
+
+	.trace.collapsed .minus,
+	.trace.expanded .plus,
+	.trace.collapsed pre {
+		display: none;
+	}
+
+	.trace-file {
+		cursor: pointer;
+		padding: 0.2em;
+	}
+
+	.trace-file:hover {
+		background: #f0ffff;
+	}
+	</style>
+</head>
+
+<body>
+<div class="container">
+	<h1><?php echo $title?></h1>
+
+	<p class="message">
+		<?php echo nl2br($context->htmlEncode($exception->getMessage()))?>
+	</p>
+
+	<div class="source">
+		<p class="file">
+			<?php echo $context->htmlEncode($exception->getFile()) . '(' . $exception->getLine() . ')'?>
+		</p>
+		<?php if (YII_DEBUG) $context->renderSourceCode($exception->getFile(), $exception->getLine(), $context->maxSourceLines)?>
+	</div>
+
+	<?php if (YII_DEBUG):?>
+	<div class="traces">
+		<h2>Stack Trace</h2>
+		<?php $context->renderTrace($exception->getTrace())?>
+	</div>
+	<?php endif?>
+
+	<div class="version">
+		<?php echo date('Y-m-d H:i:s', time())?>
+		<?php echo YII_DEBUG ? $context->getVersionInfo() : ''?>
+	</div>
+</div>
+
+<script>
+var traceReg = new RegExp("(^|\\s)trace-file(\\s|$)");
+var collapsedReg = new RegExp("(^|\\s)collapsed(\\s|$)");
+
+var e = document.getElementsByTagName("div");
+for(var j=0,len=e.length;j<len;j++){
+	if(traceReg.test(e[j].className)){
+		e[j].onclick = function(){
+			var trace = this.parentNode.parentNode;
+			if(collapsedReg.test(trace.className)){
+				trace.className = trace.className.replace("collapsed", "expanded");
+			}
+			else{
+				trace.className = trace.className.replace("expanded", "collapsed");
+			}
+		}
+	}
+}
+</script>
+
+</body>
+</html>
diff --git a/yii/views/migration.php b/yii/views/migration.php
new file mode 100644
index 0000000..a75e22f
--- /dev/null
+++ b/yii/views/migration.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * This view is used by console/controllers/MigrateController.php
+ * The following variables are available in this view:
+ *
+ * @var string $className the new migration class name
+ */
+echo "<?php\n";
+?>
+
+class <?php echo $className; ?> extends \yii\db\Migration
+{
+	public function up()
+	{
+
+	}
+
+	public function down()
+	{
+		echo "<?php echo $className; ?> cannot be reverted.\n";
+		return false;
+	}
+}
diff --git a/yii/web/AccessControl.php b/yii/web/AccessControl.php
new file mode 100644
index 0000000..e890510
--- /dev/null
+++ b/yii/web/AccessControl.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use Yii;
+use yii\base\Action;
+use yii\base\ActionFilter;
+use yii\base\HttpException;
+
+/**
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class AccessControl extends ActionFilter
+{
+	/**
+	 * @var callback a callback that will be called if the access should be denied
+	 * to the current user. If not set, [[denyAccess()]] will be called.
+	 *
+	 * The signature of the callback should be as follows:
+	 *
+	 * ~~~
+	 * function ($rule, $action)
+	 * ~~~
+	 *
+	 * where `$rule` is this rule, and `$action` is the current [[Action|action]] object.
+	 */
+	public $denyCallback;
+	/**
+	 * @var array the default configuration of access rules. Individual rule configurations
+	 * specified via [[rules]] will take precedence when the same property of the rule is configured.
+	 */
+	public $ruleConfig = array(
+		'class' => 'yii\web\AccessRule',
+	);
+	/**
+	 * @var array a list of access rule objects or configuration arrays for creating the rule objects.
+	 * If a rule is specified via a configuration array, it will be merged with [[ruleConfig]] first
+	 * before it is used for creating the rule object.
+	 * @see ruleConfig
+	 */
+	public $rules = array();
+
+	/**
+	 * Initializes the [[rules]] array by instantiating rule objects from configurations.
+	 */
+	public function init()
+	{
+		parent::init();
+		foreach ($this->rules as $i => $rule) {
+			if (is_array($rule)) {
+				$this->rules[$i] = Yii::createObject(array_merge($this->ruleConfig, $rule));
+			}
+		}
+	}
+
+	/**
+	 * This method is invoked right before an action is to be executed (after all possible filters.)
+	 * You may override this method to do last-minute preparation for the action.
+	 * @param Action $action the action to be executed.
+	 * @return boolean whether the action should continue to be executed.
+	 */
+	public function beforeAction($action)
+	{
+		$user = Yii::$app->getUser();
+		$request = Yii::$app->getRequest();
+		/** @var $rule AccessRule */
+		foreach ($this->rules as $rule) {
+			if ($allow = $rule->allows($action, $user, $request)) {
+				break;
+			} elseif ($allow === false) {
+				if (isset($rule->denyCallback)) {
+					call_user_func($rule->denyCallback, $rule);
+				} elseif (isset($this->denyCallback)) {
+					call_user_func($this->denyCallback, $rule);
+				} else {
+					$this->denyAccess($user);
+				}
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * Denies the access of the user.
+	 * The default implementation will redirect the user to the login page if he is a guest;
+	 * if the user is already logged, a 403 HTTP exception will be thrown.
+	 * @param User $user the current user
+	 * @throws HttpException if the user is already logged in.
+	 */
+	protected function denyAccess($user)
+	{
+		if ($user->getIsGuest()) {
+			$user->loginRequired();
+		} else {
+			throw new HttpException(403, Yii::t('yii|You are not allowed to perform this action.'));
+		}
+	}
+}
diff --git a/yii/web/AccessRule.php b/yii/web/AccessRule.php
new file mode 100644
index 0000000..e565e18
--- /dev/null
+++ b/yii/web/AccessRule.php
@@ -0,0 +1,185 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use yii\base\Component;
+use yii\base\Action;
+
+/**
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class AccessRule extends Component
+{
+	/**
+	 * @var boolean whether this is an 'allow' rule or 'deny' rule.
+	 */
+	public $allow;
+	/**
+	 * @var array list of action IDs that this rule applies to. The comparison is case-sensitive.
+	 * If not set or empty, it means this rule applies to all actions.
+	 */
+	public $actions;
+	/**
+	 * @var array list of controller IDs that this rule applies to. The comparison is case-sensitive.
+	 * If not set or empty, it means this rule applies to all controllers.
+	 */
+	public $controllers;
+	/**
+	 * @var array list of roles that this rule applies to. Two special roles are recognized, and
+	 * they are checked via [[User::isGuest]]:
+	 *
+	 * - `?`: matches a guest user (not authenticated yet)
+	 * - `@`: matches an authenticated user
+	 *
+	 * Using additional role names requires RBAC (Role-Based Access Control), and
+	 * [[User::hasAccess()]] will be called.
+	 *
+	 * If this property is not set or empty, it means this rule applies to all roles.
+	 */
+	public $roles;
+	/**
+	 * @var array list of user IP addresses that this rule applies to. An IP address
+	 * can contain the wildcard `*` at the end so that it matches IP addresses with the same prefix.
+	 * For example, '192.168.*' matches all IP addresses in the segment '192.168.'.
+	 * If not set or empty, it means this rule applies to all IP addresses.
+	 * @see Request::userIP
+	 */
+	public $ips;
+	/**
+	 * @var array list of request methods (e.g. `GET`, `POST`) that this rule applies to.
+	 * The request methods must be specified in uppercase.
+	 * If not set or empty, it means this rule applies to all request methods.
+	 * @see Request::requestMethod
+	 */
+	public $verbs;
+	/**
+	 * @var callback a callback that will be called to determine if the rule should be applied.
+	 * The signature of the callback should be as follows:
+	 *
+	 * ~~~
+	 * function ($rule, $action)
+	 * ~~~
+	 *
+	 * where `$rule` is this rule, and `$action` is the current [[Action|action]] object.
+	 * The callback should return a boolean value indicating whether this rule should be applied.
+	 */
+	public $matchCallback;
+	/**
+	 * @var callback a callback that will be called if this rule determines the access to
+	 * the current action should be denied. If not set, the behavior will be determined by
+	 * [[AccessControl]].
+	 *
+	 * The signature of the callback should be as follows:
+	 *
+	 * ~~~
+	 * function ($rule, $action)
+	 * ~~~
+	 *
+	 * where `$rule` is this rule, and `$action` is the current [[Action|action]] object.
+	 */
+	public $denyCallback;
+
+
+	/**
+	 * Checks whether the Web user is allowed to perform the specified action.
+	 * @param Action $action the action to be performed
+	 * @param User $user the user object
+	 * @param Request $request
+	 * @return boolean|null true if the user is allowed, false if the user is denied, null if the rule does not apply to the user
+	 */
+	public function allows($action, $user, $request)
+	{
+		if ($this->matchAction($action)
+			&& $this->matchRole($user)
+			&& $this->matchIP($request->getUserIP())
+			&& $this->matchVerb($request->getRequestMethod())
+			&& $this->matchController($action->controller)
+			&& $this->matchCustom($action)
+		) {
+			return $this->allow ? true : false;
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * @param Action $action the action
+	 * @return boolean whether the rule applies to the action
+	 */
+	protected function matchAction($action)
+	{
+		return empty($this->actions) || in_array($action->id, $this->actions, true);
+	}
+
+	/**
+	 * @param Controller $controller the controller
+	 * @return boolean whether the rule applies to the controller
+	 */
+	protected function matchController($controller)
+	{
+		return empty($this->controllers) || in_array($controller->id, $this->controllers, true);
+	}
+
+	/**
+	 * @param User $user the user object
+	 * @return boolean whether the rule applies to the role
+	 */
+	protected function matchRole($user)
+	{
+		if (empty($this->roles)) {
+			return true;
+		}
+		foreach ($this->roles as $role) {
+			if ($role === '?' && $user->getIsGuest()) {
+				return true;
+			} elseif ($role === '@' && !$user->getIsGuest()) {
+				return true;
+			} elseif ($user->checkAccess($role)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * @param string $ip the IP address
+	 * @return boolean whether the rule applies to the IP address
+	 */
+	protected function matchIP($ip)
+	{
+		if (empty($this->ips)) {
+			return true;
+		}
+		foreach ($this->ips as $rule) {
+			if ($rule === '*' || $rule === $ip || (($pos = strpos($rule, '*')) !== false && !strncmp($ip, $rule, $pos))) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * @param string $verb the request method
+	 * @return boolean whether the rule applies to the request
+	 */
+	protected function matchVerb($verb)
+	{
+		return empty($this->verbs) || in_array($verb, $this->verbs, true);
+	}
+
+	/**
+	 * @param Action $action the action to be performed
+	 * @return boolean whether the rule should be applied
+	 */
+	protected function matchCustom($action)
+	{
+		return empty($this->matchCallback) || call_user_func($this->matchCallback, $this, $action);
+	}
+}
diff --git a/yii/web/Application.php b/yii/web/Application.php
new file mode 100644
index 0000000..3387044
--- /dev/null
+++ b/yii/web/Application.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use Yii;
+
+/**
+ * Application is the base class for all application classes.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Application extends \yii\base\Application
+{
+	/**
+	 * @var string the default route of this application. Defaults to 'site'.
+	 */
+	public $defaultRoute = 'site';
+
+	/**
+	 * Processes the request.
+	 * @return integer the exit status of the controller action (0 means normal, non-zero values mean abnormal)
+	 */
+	public function processRequest()
+	{
+		$request = $this->getRequest();
+		Yii::setAlias('@wwwroot', dirname($request->getScriptFile()));
+		Yii::setAlias('@www', $request->getBaseUrl());
+		list ($route, $params) = $request->resolve();
+		return $this->runAction($route, $params);
+	}
+
+	private $_homeUrl;
+
+	/**
+	 * @return string the homepage URL
+	 */
+	public function getHomeUrl()
+	{
+		if ($this->_homeUrl === null) {
+			if ($this->getUrlManager()->showScriptName) {
+				return $this->getRequest()->getScriptUrl();
+			} else {
+				return $this->getRequest()->getBaseUrl() . '/';
+			}
+		} else {
+			return $this->_homeUrl;
+		}
+	}
+
+	/**
+	 * @param string $value the homepage URL
+	 */
+	public function setHomeUrl($value)
+	{
+		$this->_homeUrl = $value;
+	}
+
+	/**
+	 * Returns the request component.
+	 * @return Request the request component
+	 */
+	public function getRequest()
+	{
+		return $this->getComponent('request');
+	}
+
+	/**
+	 * Returns the response component.
+	 * @return Response the response component
+	 */
+	public function getResponse()
+	{
+		return $this->getComponent('response');
+	}
+
+	/**
+	 * Returns the session component.
+	 * @return Session the session component
+	 */
+	public function getSession()
+	{
+		return $this->getComponent('session');
+	}
+
+	/**
+	 * Returns the user component.
+	 * @return User the user component
+	 */
+	public function getUser()
+	{
+		return $this->getComponent('user');
+	}
+
+	/**
+	 * Returns the asset manager.
+	 * @return AssetManager the asset manager component
+	 */
+	public function getAssetManager()
+	{
+		return $this->getComponent('assetManager');
+	}
+
+	/**
+	 * Registers the core application components.
+	 * @see setComponents
+	 */
+	public function registerCoreComponents()
+	{
+		parent::registerCoreComponents();
+		$this->setComponents(array(
+			'request' => array(
+				'class' => 'yii\web\Request',
+			),
+			'response' => array(
+				'class' => 'yii\web\Response',
+			),
+			'session' => array(
+				'class' => 'yii\web\Session',
+			),
+			'user' => array(
+				'class' => 'yii\web\User',
+			),
+			'assetManager' => array(
+				'class' => 'yii\web\AssetManager',
+			),
+		));
+	}
+}
diff --git a/yii/web/AssetBundle.php b/yii/web/AssetBundle.php
new file mode 100644
index 0000000..37577dd
--- /dev/null
+++ b/yii/web/AssetBundle.php
@@ -0,0 +1,176 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use Yii;
+use yii\base\InvalidConfigException;
+use yii\base\Object;
+
+/**
+ * AssetBundle represents a collection of asset files, such as CSS, JS, images.
+ *
+ * Each asset bundle has a unique name that globally identifies it among all asset bundles
+ * used in an application.
+ *
+ * An asset bundle can depend on other asset bundles. When registering an asset bundle
+ * with a view, all its dependent asset bundles will be automatically registered.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class AssetBundle extends Object
+{
+	/**
+	 * @var string the root directory of the source asset files. A source asset file
+	 * is a file that is part of your source code repository of your Web application.
+	 *
+	 * You must set this property if the directory containing the source asset files
+	 * is not Web accessible (this is usually the case for extensions).
+	 *
+	 * By setting this property, the asset manager will publish the source asset files
+	 * to a Web-accessible directory [[basePath]].
+	 *
+	 * You can use either a directory or an alias of the directory.
+	 */
+	public $sourcePath;
+	/**
+	 * @var string the Web-accessible directory that contains the asset files in this bundle.
+	 *
+	 * If [[sourcePath]] is set, this property will be *overwritten* by [[AssetManager]]
+	 * when it publishes the asset files from [[sourcePath]].
+	 *
+	 * If the bundle contains any assets that are specified in terms of relative file path,
+	 * then this property must be set either manually or automatically (by asset manager via
+	 * asset publishing).
+	 *
+	 * You can use either a directory or an alias of the directory.
+	 */
+	public $basePath;
+	/**
+	 * @var string the base URL that will be prefixed to the asset files for them to
+	 * be accessed via Web server.
+	 *
+	 * If [[sourcePath]] is set, this property will be *overwritten* by [[AssetManager]]
+	 * when it publishes the asset files from [[sourcePath]].
+	 *
+	 * If the bundle contains any assets that are specified in terms of relative file path,
+	 * then this property must be set either manually or automatically (by asset manager via
+	 * asset publishing).
+	 *
+	 * You can use either a URL or an alias of the URL.
+	 */
+	public $baseUrl;
+	/**
+	 * @var array list of the bundle names that this bundle depends on
+	 */
+	public $depends = array();
+	/**
+	 * @var array list of JavaScript files that this bundle contains. Each JavaScript file can
+	 * be either a file path (without leading slash) relative to [[basePath]] or a URL representing
+	 * an external JavaScript file.
+	 *
+	 * Note that only forward slash "/" can be used as directory separator.
+	 */
+	public $js = array();
+	/**
+	 * @var array list of CSS files that this bundle contains. Each CSS file can
+	 * be either a file path (without leading slash) relative to [[basePath]] or a URL representing
+	 * an external CSS file.
+	 *
+	 * Note that only forward slash "/" can be used as directory separator.
+	 */
+	public $css = array();
+	/**
+	 * @var array the options that will be passed to [[\yii\base\View::registerJsFile()]]
+	 * when registering the JS files in this bundle.
+	 */
+	public $jsOptions = array();
+	/**
+	 * @var array the options that will be passed to [[\yii\base\View::registerCssFile()]]
+	 * when registering the CSS files in this bundle.
+	 */
+	public $cssOptions = array();
+	/**
+	 * @var array the options to be passed to [[AssetManager::publish()]] when the asset bundle
+	 * is being published.
+	 */
+	public $publishOptions = array();
+
+	/**
+	 * Initializes the bundle.
+	 */
+	public function init()
+	{
+		if ($this->sourcePath !== null) {
+			$this->sourcePath = rtrim(Yii::getAlias($this->sourcePath), '/\\');
+		}
+		if ($this->basePath !== null) {
+			$this->basePath = rtrim(Yii::getAlias($this->basePath), '/\\');
+		}
+		if ($this->baseUrl !== null) {
+			$this->baseUrl = rtrim(Yii::getAlias($this->baseUrl), '/');
+		}
+	}
+
+	/**
+	 * Registers the CSS and JS files with the given view.
+	 * This method will first register all dependent asset bundles.
+	 * It will then try to convert non-CSS or JS files (e.g. LESS, Sass) into the corresponding
+	 * CSS or JS files using [[AssetManager::converter|asset converter]].
+	 * @param \yii\base\View $view the view that the asset files to be registered with.
+	 * @throws InvalidConfigException if [[baseUrl]] or [[basePath]] is not set when the bundle
+	 * contains internal CSS or JS files.
+	 */
+	public function registerAssets($view)
+	{
+		foreach ($this->depends as $name) {
+			$view->registerAssetBundle($name);
+		}
+
+		$this->publish($view->getAssetManager());
+
+		foreach ($this->js as $js) {
+			$view->registerJsFile($js, $this->jsOptions);
+		}
+		foreach ($this->css as $css) {
+			$view->registerCssFile($css, $this->cssOptions);
+		}
+	}
+
+	/**
+	 * Publishes the asset bundle if its source code is not under Web-accessible directory.
+	 * @param AssetManager $am the asset manager to perform the asset publishing
+	 * @throws InvalidConfigException if [[baseUrl]] or [[basePath]] is not set when the bundle
+	 * contains internal CSS or JS files.
+	 */
+	public function publish($am)
+	{
+		if ($this->sourcePath !== null) {
+			list ($this->basePath, $this->baseUrl) = $am->publish($this->sourcePath, $this->publishOptions);
+		}
+		$converter = $am->getConverter();
+		foreach ($this->js as $i => $js) {
+			if (strpos($js, '/') !== 0 && strpos($js, '://') === false) {
+				if (isset($this->basePath, $this->baseUrl)) {
+					$this->js[$i] = $converter->convert($js, $this->basePath, $this->baseUrl);
+				} else {
+					throw new InvalidConfigException('Both of the "baseUrl" and "basePath" properties must be set.');
+				}
+			}
+		}
+		foreach ($this->css as $i => $css) {
+			if (strpos($css, '/') !== 0 && strpos($css, '://') === false) {
+				if (isset($this->basePath, $this->baseUrl)) {
+					$this->css[$i] = $converter->convert($css, $this->basePath, $this->baseUrl);
+				} else {
+					throw new InvalidConfigException('Both of the "baseUrl" and "basePath" properties must be set.');
+				}
+			}
+		}
+	}
+}
diff --git a/yii/web/AssetConverter.php b/yii/web/AssetConverter.php
new file mode 100644
index 0000000..4fde1fc
--- /dev/null
+++ b/yii/web/AssetConverter.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use Yii;
+use yii\base\Component;
+
+/**
+ * AssetConverter supports conversion of several popular script formats into JS or CSS scripts.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class AssetConverter extends Component implements IAssetConverter
+{
+	/**
+	 * @var array the commands that are used to perform the asset conversion.
+	 * The keys are the asset file extension names, and the values are the corresponding
+	 * target script types (either "css" or "js") and the commands used for the conversion.
+	 */
+	public $commands = array(
+		'less' => array('css', 'lessc {from} {to}'),
+		'scss' => array('css', 'sass {from} {to}'),
+		'sass' => array('css', 'sass {from} {to}'),
+		'styl' => array('js', 'stylus < {from} > {to}'),
+	);
+
+	/**
+	 * Converts a given asset file into a CSS or JS file.
+	 * @param string $asset the asset file path, relative to $basePath
+	 * @param string $basePath the directory the $asset is relative to.
+	 * @param string $baseUrl the URL corresponding to $basePath
+	 * @return string the URL to the converted asset file.
+	 */
+	public function convert($asset, $basePath, $baseUrl)
+	{
+		$pos = strrpos($asset, '.');
+		if ($pos !== false) {
+			$ext = substr($asset, $pos + 1);
+			if (isset($this->commands[$ext])) {
+				list ($ext, $command) = $this->commands[$ext];
+				$result = substr($asset, 0, $pos + 1) . $ext;
+				if (@filemtime("$basePath/$result") < filemtime("$basePath/$asset")) {
+					$output = array();
+					$command = strtr($command, array(
+						'{from}' => "$basePath/$asset",
+						'{to}' => "$basePath/$result",
+					));
+					exec($command, $output);
+					Yii::info("Converted $asset into $result: " . implode("\n", $output), __METHOD__);
+				}
+				return "$baseUrl/$result";
+			}
+		}
+		return "$baseUrl/$asset";
+	}
+}
diff --git a/yii/web/AssetManager.php b/yii/web/AssetManager.php
new file mode 100644
index 0000000..95dcbd2
--- /dev/null
+++ b/yii/web/AssetManager.php
@@ -0,0 +1,330 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use Yii;
+use yii\base\Component;
+use yii\base\InvalidConfigException;
+use yii\base\InvalidParamException;
+use yii\helpers\FileHelper;
+
+/**
+ * AssetManager manages asset bundles and asset publishing.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class AssetManager extends Component
+{
+	/**
+	 * @var array list of available asset bundles. The keys are the bundle names, and the values are the configuration
+	 * arrays for creating the [[AssetBundle]] objects.
+	 */
+	public $bundles;
+	/**
+	 * @return string the root directory storing the published asset files.
+	 */
+	public $basePath = '@wwwroot/assets';
+	/**
+	 * @return string the base URL through which the published asset files can be accessed.
+	 */
+	public $baseUrl = '@www/assets';
+	/**
+	 * @var boolean whether to use symbolic link to publish asset files. Defaults to false, meaning
+	 * asset files are copied to [[basePath]]. Using symbolic links has the benefit that the published
+	 * assets will always be consistent with the source assets and there is no copy operation required.
+	 * This is especially useful during development.
+	 *
+	 * However, there are special requirements for hosting environments in order to use symbolic links.
+	 * In particular, symbolic links are supported only on Linux/Unix, and Windows Vista/2008 or greater.
+	 *
+	 * Moreover, some Web servers need to be properly configured so that the linked assets are accessible
+	 * to Web users. For example, for Apache Web server, the following configuration directive should be added
+	 * for the Web folder:
+	 *
+	 * ~~~
+	 * Options FollowSymLinks
+	 * ~~~
+	 */
+	public $linkAssets = false;
+	/**
+	 * @var integer the permission to be set for newly published asset files.
+	 * This value will be used by PHP chmod() function.
+	 * If not set, the permission will be determined by the current environment.
+	 */
+	public $fileMode;
+	/**
+	 * @var integer the permission to be set for newly generated asset directories.
+	 * This value will be used by PHP chmod() function.
+	 * Defaults to 0777, meaning the directory can be read, written and executed by all users.
+	 */
+	public $dirMode = 0777;
+
+	/**
+	 * Initializes the component.
+	 * @throws InvalidConfigException if [[basePath]] is invalid
+	 */
+	public function init()
+	{
+		parent::init();
+		$this->basePath = Yii::getAlias($this->basePath);
+		if (!is_dir($this->basePath)) {
+			throw new InvalidConfigException("The directory does not exist: {$this->basePath}");
+		} elseif (!is_writable($this->basePath)) {
+			throw new InvalidConfigException("The directory is not writable by the Web process: {$this->basePath}");
+		} else {
+			$this->basePath = realpath($this->basePath);
+		}
+		$this->baseUrl = rtrim(Yii::getAlias($this->baseUrl), '/');
+
+		foreach (require(YII_PATH . '/assets.php') as $name => $bundle) {
+			if (!isset($this->bundles[$name])) {
+				$this->bundles[$name] = $bundle;
+			}
+		}
+	}
+
+	/**
+	 * Returns the named bundle.
+	 * This method will first look for the bundle in [[bundles]]. If not found,
+	 * it will attempt to find the bundle from an installed extension using the following procedure:
+	 *
+	 * 1. Convert the bundle into a path alias;
+	 * 2. Determine the root alias and use it to locate the bundle manifest file "assets.php";
+	 * 3. Look for the bundle in the manifest file.
+	 *
+	 * For example, given the bundle name "foo/button", the method will first convert it
+	 * into the path alias "@foo/button"; since "@foo" is the root alias, it will look
+	 * for the bundle manifest file "@foo/assets.php". The manifest file should return an array
+	 * that lists the bundles used by the "foo/button" extension. The array format is the same as [[bundles]].
+	 *
+	 * @param string $name the bundle name
+	 * @return AssetBundle the loaded bundle object. Null is returned if the bundle does not exist.
+	 */
+	public function getBundle($name)
+	{
+		if (!isset($this->bundles[$name])) {
+			$rootAlias = Yii::getRootAlias("@$name");
+			if ($rootAlias !== false) {
+				$manifest = Yii::getAlias("$rootAlias/assets.php", false);
+				if ($manifest !== false && is_file($manifest)) {
+					foreach (require($manifest) as $bn => $config) {
+						$this->bundles[$bn] = $config;
+					}
+				}
+			}
+			if (!isset($this->bundles[$name])) {
+				return null;
+			}
+		}
+		if (is_array($this->bundles[$name])) {
+			$config = $this->bundles[$name];
+			if (!isset($config['class'])) {
+				$config['class'] = 'yii\\web\\AssetBundle';
+				$this->bundles[$name] = Yii::createObject($config);
+			}
+		}
+
+		return $this->bundles[$name];
+	}
+
+	private $_converter;
+
+	/**
+	 * Returns the asset converter.
+	 * @return IAssetConverter the asset converter.
+	 */
+	public function getConverter()
+	{
+		if ($this->_converter === null) {
+			$this->_converter = Yii::createObject(array(
+				'class' => 'yii\\web\\AssetConverter',
+			));
+		} elseif (is_array($this->_converter) || is_string($this->_converter)) {
+			$this->_converter = Yii::createObject($this->_converter);
+		}
+		return $this->_converter;
+	}
+
+	/**
+	 * Sets the asset converter.
+	 * @param array|IAssetConverter $value the asset converter. This can be either
+	 * an object implementing the [[IAssetConverter]] interface, or a configuration
+	 * array that can be used to create the asset converter object.
+	 */
+	public function setConverter($value)
+	{
+		$this->_converter = $value;
+	}
+
+	/**
+	 * @var array published assets
+	 */
+	private $_published = array();
+
+	/**
+	 * Publishes a file or a directory.
+	 *
+	 * This method will copy the specified file or directory to [[basePath]] so that
+	 * it can be accessed via the Web server.
+	 *
+	 * If the asset is a file, its file modification time will be checked to avoid
+	 * unnecessary file copying.
+	 *
+	 * If the asset is a directory, all files and subdirectories under it will be published recursively.
+	 * Note, in case $forceCopy is false the method only checks the existence of the target
+	 * directory to avoid repetitive copying (which is very expensive).
+	 *
+	 * By default, when publishing a directory, subdirectories and files whose name starts with a dot "."
+	 * will NOT be published. If you want to change this behavior, you may specify the "beforeCopy" option
+	 * as explained in the `$options` parameter.
+	 *
+	 * Note: On rare scenario, a race condition can develop that will lead to a
+	 * one-time-manifestation of a non-critical problem in the creation of the directory
+	 * that holds the published assets. This problem can be avoided altogether by 'requesting'
+	 * in advance all the resources that are supposed to trigger a 'publish()' call, and doing
+	 * that in the application deployment phase, before system goes live. See more in the following
+	 * discussion: http://code.google.com/p/yii/issues/detail?id=2579
+	 *
+	 * @param string $path the asset (file or directory) to be published
+	 * @param array $options the options to	be applied when publishing a directory.
+	 * The following options are supported:
+	 *
+	 * - beforeCopy: callback, a PHP callback that is called before copying each sub-directory or file.
+	 *   This option is used only when publishing a directory. If the callback returns false, the copy
+	 *   operation for the sub-directory or file will be cancelled.
+	 *   The signature of the callback should be: `function ($from, $to)`, where `$from` is the sub-directory or
+ 	 *   file to be copied from, while `$to` is the copy target.
+	 * - afterCopy: callback, a PHP callback that is called after a sub-directory or file is successfully copied.
+	 *   This option is used only when publishing a directory. The signature of the callback is similar to that
+	 *   of `beforeCopy`.
+	 * - forceCopy: boolean, whether the directory being published should be copied even if
+	 *   it is found in the target directory. This option is used only when publishing a directory.
+	 *   You may want to set this to be true during the development stage to make sure the published
+	 *   directory is always up-to-date. Do not set this to true on production servers as it will
+	 *   significantly degrade the performance.
+	 * @return array the path (directory or file path) and the URL that the asset is published as.
+	 * @throws InvalidParamException if the asset to be published does not exist.
+	 */
+	public function publish($path, $options = array())
+	{
+		if (isset($this->_published[$path])) {
+			return $this->_published[$path];
+		}
+
+		$src = realpath($path);
+		if ($src === false) {
+			throw new InvalidParamException("The file or directory to be published does not exist: $path");
+		}
+
+		if (is_file($src)) {
+			$dir = $this->hash(dirname($src) . filemtime($src));
+			$fileName = basename($src);
+			$dstDir = $this->basePath . DIRECTORY_SEPARATOR . $dir;
+			$dstFile = $dstDir . DIRECTORY_SEPARATOR . $fileName;
+
+			if (!is_dir($dstDir)) {
+				mkdir($dstDir, $this->dirMode, true);
+			}
+
+			if ($this->linkAssets) {
+				if (!is_file($dstFile)) {
+					symlink($src, $dstFile);
+				}
+			} elseif (@filemtime($dstFile) < @filemtime($src)) {
+				copy($src, $dstFile);
+				if ($this->fileMode !== null) {
+					@chmod($dstFile, $this->fileMode);
+				}
+			}
+
+			return $this->_published[$path] = array($dstFile, $this->baseUrl . "/$dir/$fileName");
+		} else {
+			$dir = $this->hash($src . filemtime($src));
+			$dstDir = $this->basePath . DIRECTORY_SEPARATOR . $dir;
+			if ($this->linkAssets) {
+				if (!is_dir($dstDir)) {
+					symlink($src, $dstDir);
+				}
+			} elseif (!is_dir($dstDir) || !empty($options['forceCopy'])) {
+				$opts = array(
+					'dirMode' => $this->dirMode,
+					'fileMode' => $this->fileMode,
+				);
+				if (isset($options['beforeCopy'])) {
+					$opts['beforeCopy'] = $options['beforeCopy'];
+				} else {
+					$opts['beforeCopy'] = function ($from, $to) {
+						return strncmp(basename($from), '.', 1) !== 0;
+					};
+				}
+				if (isset($options['afterCopy'])) {
+					$opts['afterCopy'] = $options['afterCopy'];
+				}
+				FileHelper::copyDirectory($src, $dstDir, $opts);
+			}
+
+			return $this->_published[$path] = array($dstDir, $this->baseUrl . '/' . $dir);
+		}
+	}
+
+	/**
+	 * Returns the published path of a file path.
+	 * This method does not perform any publishing. It merely tells you
+	 * if the file or directory is published, where it will go.
+	 * @param string $path directory or file path being published
+	 * @return string the published file path. False if the file or directory does not exist
+	 */
+	public function getPublishedPath($path)
+	{
+		if (($path = realpath($path)) !== false) {
+			$base = $this->basePath . DIRECTORY_SEPARATOR;
+			if (is_file($path)) {
+				return $base . $this->hash(dirname($path) . filemtime($path)) . DIRECTORY_SEPARATOR . basename($path);
+			} else {
+				return $base . $this->hash($path . filemtime($path));
+			}
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Returns the URL of a published file path.
+	 * This method does not perform any publishing. It merely tells you
+	 * if the file path is published, what the URL will be to access it.
+	 * @param string $path directory or file path being published
+	 * @return string the published URL for the file or directory. False if the file or directory does not exist.
+	 */
+	public function getPublishedUrl($path)
+	{
+		if (isset($this->_published[$path])) {
+			return $this->_published[$path];
+		}
+		if (($path = realpath($path)) !== false) {
+			if (is_file($path)) {
+				return $this->baseUrl . '/' . $this->hash(dirname($path) . filemtime($path)) . '/' . basename($path);
+			} else {
+				return $this->baseUrl . '/' . $this->hash($path . filemtime($path));
+			}
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Generate a CRC32 hash for the directory path. Collisions are higher
+	 * than MD5 but generates a much smaller hash string.
+	 * @param string $path string to be hashed.
+	 * @return string hashed string.
+	 */
+	protected function hash($path)
+	{
+		return sprintf('%x', crc32($path . Yii::getVersion()));
+	}
+}
diff --git a/yii/web/CacheSession.php b/yii/web/CacheSession.php
new file mode 100644
index 0000000..c125f01
--- /dev/null
+++ b/yii/web/CacheSession.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use Yii;
+use yii\caching\Cache;
+use yii\base\InvalidConfigException;
+
+/**
+ * CacheSession implements a session component using cache as storage medium.
+ *
+ * The cache being used can be any cache application component.
+ * The ID of the cache application component is specified via [[cache]], which defaults to 'cache'.
+ *
+ * Beware, by definition cache storage are volatile, which means the data stored on them
+ * may be swapped out and get lost. Therefore, you must make sure the cache used by this component
+ * is NOT volatile. If you want to use database as storage medium, use [[DbSession]] is a better choice.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class CacheSession extends Session
+{
+	/**
+	 * @var Cache|string the cache object or the application component ID of the cache object.
+	 * The session data will be stored using this cache object.
+	 *
+	 * After the CacheSession object is created, if you want to change this property,
+	 * you should only assign it with a cache object.
+	 */
+	public $cache = 'cache';
+
+	/**
+	 * Initializes the application component.
+	 */
+	public function init()
+	{
+		parent::init();
+		if (is_string($this->cache)) {
+			$this->cache = Yii::$app->getComponent($this->cache);
+		}
+		if (!$this->cache instanceof Cache) {
+			throw new InvalidConfigException('CacheSession::cache must refer to the application component ID of a cache object.');
+		}
+	}
+
+	/**
+	 * Returns a value indicating whether to use custom session storage.
+	 * This method overrides the parent implementation and always returns true.
+	 * @return boolean whether to use custom storage.
+	 */
+	public function getUseCustomStorage()
+	{
+		return true;
+	}
+
+	/**
+	 * Session read handler.
+	 * Do not call this method directly.
+	 * @param string $id session ID
+	 * @return string the session data
+	 */
+	public function readSession($id)
+	{
+		$data = $this->cache->get($this->calculateKey($id));
+		return $data === false ? '' : $data;
+	}
+
+	/**
+	 * Session write handler.
+	 * Do not call this method directly.
+	 * @param string $id session ID
+	 * @param string $data session data
+	 * @return boolean whether session write is successful
+	 */
+	public function writeSession($id, $data)
+	{
+		return $this->cache->set($this->calculateKey($id), $data, $this->getTimeout());
+	}
+
+	/**
+	 * Session destroy handler.
+	 * Do not call this method directly.
+	 * @param string $id session ID
+	 * @return boolean whether session is destroyed successfully
+	 */
+	public function destroySession($id)
+	{
+		return $this->cache->delete($this->calculateKey($id));
+	}
+
+	/**
+	 * Generates a unique key used for storing session data in cache.
+	 * @param string $id session variable name
+	 * @return string a safe cache key associated with the session variable name
+	 */
+	protected function calculateKey($id)
+	{
+		return $this->cache->buildKey(array(__CLASS__, $id));
+	}
+}
diff --git a/yii/web/CaptchaAction.php b/yii/web/CaptchaAction.php
new file mode 100644
index 0000000..e3d6eaa
--- /dev/null
+++ b/yii/web/CaptchaAction.php
@@ -0,0 +1,338 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use Yii;
+use yii\base\Action;
+use yii\base\InvalidConfigException;
+use yii\widgets\Captcha;
+
+/**
+ * CaptchaAction renders a CAPTCHA image.
+ *
+ * CaptchaAction is used together with [[Captcha]] and [[\yii\validators\CaptchaValidator]]
+ * to provide the [CAPTCHA](http://en.wikipedia.org/wiki/Captcha) feature.
+ *
+ * By configuring the properties of CaptchaAction, you may customize the appearance of
+ * the generated CAPTCHA images, such as the font color, the background color, etc.
+ *
+ * Note that CaptchaAction requires either GD2 extension or ImageMagick PHP extension.
+ *
+ * Using CAPTCHA involves the following steps:
+ *
+ * 1. Override [[\yii\web\Controller::actions()]] and register an action of class CaptchaAction with ID 'captcha'
+ * 2. In the form model, declare an attribute to store user-entered verification code, and declare the attribute
+ *    to be validated by the 'captcha' validator.
+ * 3. In the controller view, insert a [[Captcha]] widget in the form.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class CaptchaAction extends Action
+{
+	/**
+	 * The name of the GET parameter indicating whether the CAPTCHA image should be regenerated.
+	 */
+	const REFRESH_GET_VAR = 'refresh';
+	/**
+	 * @var integer how many times should the same CAPTCHA be displayed. Defaults to 3.
+	 * A value less than or equal to 0 means the test is unlimited (available since version 1.1.2).
+	 */
+	public $testLimit = 3;
+	/**
+	 * @var integer the width of the generated CAPTCHA image. Defaults to 120.
+	 */
+	public $width = 120;
+	/**
+	 * @var integer the height of the generated CAPTCHA image. Defaults to 50.
+	 */
+	public $height = 50;
+	/**
+	 * @var integer padding around the text. Defaults to 2.
+	 */
+	public $padding = 2;
+	/**
+	 * @var integer the background color. For example, 0x55FF00.
+	 * Defaults to 0xFFFFFF, meaning white color.
+	 */
+	public $backColor = 0xFFFFFF;
+	/**
+	 * @var integer the font color. For example, 0x55FF00. Defaults to 0x2040A0 (blue color).
+	 */
+	public $foreColor = 0x2040A0;
+	/**
+	 * @var boolean whether to use transparent background. Defaults to false.
+	 */
+	public $transparent = false;
+	/**
+	 * @var integer the minimum length for randomly generated word. Defaults to 6.
+	 */
+	public $minLength = 6;
+	/**
+	 * @var integer the maximum length for randomly generated word. Defaults to 7.
+	 */
+	public $maxLength = 7;
+	/**
+	 * @var integer the offset between characters. Defaults to -2. You can adjust this property
+	 * in order to decrease or increase the readability of the captcha.
+	 **/
+	public $offset = -2;
+	/**
+	 * @var string the TrueType font file. This can be either a file path or path alias.
+	 */
+	public $fontFile = '@yii/web/SpicyRice.ttf';
+	/**
+	 * @var string the fixed verification code. When this is property is set,
+	 * [[getVerifyCode()]] will always return the value of this property.
+	 * This is mainly used in automated tests where we want to be able to reproduce
+	 * the same verification code each time we run the tests.
+	 * If not set, it means the verification code will be randomly generated.
+	 */
+	public $fixedVerifyCode;
+
+
+	/**
+	 * Initializes the action.
+	 * @throws InvalidConfigException if the font file does not exist.
+	 */
+	public function init()
+	{
+		$this->fontFile = Yii::getAlias($this->fontFile);
+		if (!is_file($this->fontFile)) {
+			throw new InvalidConfigException("The font file does not exist: {$this->fontFile}");
+		}
+	}
+
+	/**
+	 * Runs the action.
+	 */
+	public function run()
+	{
+		if (isset($_GET[self::REFRESH_GET_VAR])) {
+			// AJAX request for regenerating code
+			$code = $this->getVerifyCode(true);
+			echo json_encode(array(
+				'hash1' => $this->generateValidationHash($code),
+				'hash2' => $this->generateValidationHash(strtolower($code)),
+				// we add a random 'v' parameter so that FireFox can refresh the image
+				// when src attribute of image tag is changed
+				'url' => $this->controller->createUrl($this->id, array('v' => uniqid())),
+			));
+		} else {
+			$this->renderImage($this->getVerifyCode());
+		}
+		Yii::$app->end();
+	}
+
+	/**
+	 * Generates a hash code that can be used for client side validation.
+	 * @param string $code the CAPTCHA code
+	 * @return string a hash code generated from the CAPTCHA code
+	 */
+	public function generateValidationHash($code)
+	{
+		for ($h = 0, $i = strlen($code) - 1; $i >= 0; --$i) {
+			$h += ord($code[$i]);
+		}
+		return $h;
+	}
+
+	/**
+	 * Gets the verification code.
+	 * @param boolean $regenerate whether the verification code should be regenerated.
+	 * @return string the verification code.
+	 */
+	public function getVerifyCode($regenerate = false)
+	{
+		if ($this->fixedVerifyCode !== null) {
+			return $this->fixedVerifyCode;
+		}
+
+		$session = Yii::$app->session;
+		$session->open();
+		$name = $this->getSessionKey();
+		if ($session[$name] === null || $regenerate) {
+			$session[$name] = $this->generateVerifyCode();
+			$session[$name . 'count'] = 1;
+		}
+		return $session[$name];
+	}
+
+	/**
+	 * Validates the input to see if it matches the generated code.
+	 * @param string $input user input
+	 * @param boolean $caseSensitive whether the comparison should be case-sensitive
+	 * @return boolean whether the input is valid
+	 */
+	public function validate($input, $caseSensitive)
+	{
+		$code = $this->getVerifyCode();
+		$valid = $caseSensitive ? ($input === $code) : strcasecmp($input, $code) === 0;
+		$session = Yii::$app->session;
+		$session->open();
+		$name = $this->getSessionKey() . 'count';
+		$session[$name] = $session[$name] + 1;
+		if ($session[$name] > $this->testLimit && $this->testLimit > 0) {
+			$this->getVerifyCode(true);
+		}
+		return $valid;
+	}
+
+	/**
+	 * Generates a new verification code.
+	 * @return string the generated verification code
+	 */
+	protected function generateVerifyCode()
+	{
+		if ($this->minLength < 3) {
+			$this->minLength = 3;
+		}
+		if ($this->maxLength > 20) {
+			$this->maxLength = 20;
+		}
+		if ($this->minLength > $this->maxLength) {
+			$this->maxLength = $this->minLength;
+		}
+		$length = mt_rand($this->minLength, $this->maxLength);
+
+		$letters = 'bcdfghjklmnpqrstvwxyz';
+		$vowels = 'aeiou';
+		$code = '';
+		for ($i = 0; $i < $length; ++$i) {
+			if ($i % 2 && mt_rand(0, 10) > 2 || !($i % 2) && mt_rand(0, 10) > 9) {
+				$code .= $vowels[mt_rand(0, 4)];
+			} else {
+				$code .= $letters[mt_rand(0, 20)];
+			}
+		}
+
+		return $code;
+	}
+
+	/**
+	 * Returns the session variable name used to store verification code.
+	 * @return string the session variable name
+	 */
+	protected function getSessionKey()
+	{
+		return '__captcha/' . $this->getUniqueId();
+	}
+
+	/**
+	 * Renders the CAPTCHA image.
+	 * @param string $code the verification code
+	 */
+	protected function renderImage($code)
+	{
+		if (Captcha::checkRequirements() === 'gd') {
+			$this->renderImageByGD($code);
+		} else {
+			$this->renderImageByImagick($code);
+		}
+	}
+
+	/**
+	 * Renders the CAPTCHA image based on the code using GD library.
+	 * @param string $code the verification code
+	 */
+	protected function renderImageByGD($code)
+	{
+		$image = imagecreatetruecolor($this->width, $this->height);
+
+		$backColor = imagecolorallocate($image,
+			(int)($this->backColor % 0x1000000 / 0x10000),
+			(int)($this->backColor % 0x10000 / 0x100),
+			$this->backColor % 0x100);
+		imagefilledrectangle($image, 0, 0, $this->width, $this->height, $backColor);
+		imagecolordeallocate($image, $backColor);
+
+		if ($this->transparent) {
+			imagecolortransparent($image, $backColor);
+		}
+
+		$foreColor = imagecolorallocate($image,
+			(int)($this->foreColor % 0x1000000 / 0x10000),
+			(int)($this->foreColor % 0x10000 / 0x100),
+			$this->foreColor % 0x100);
+
+		if ($this->fontFile === null) {
+			$this->fontFile = dirname(__FILE__) . '/SpicyRice.ttf';
+		}
+
+		$length = strlen($code);
+		$box = imagettfbbox(30, 0, $this->fontFile, $code);
+		$w = $box[4] - $box[0] + $this->offset * ($length - 1);
+		$h = $box[1] - $box[5];
+		$scale = min(($this->width - $this->padding * 2) / $w, ($this->height - $this->padding * 2) / $h);
+		$x = 10;
+		$y = round($this->height * 27 / 40);
+		for ($i = 0; $i < $length; ++$i) {
+			$fontSize = (int)(rand(26, 32) * $scale * 0.8);
+			$angle = rand(-10, 10);
+			$letter = $code[$i];
+			$box = imagettftext($image, $fontSize, $angle, $x, $y, $foreColor, $this->fontFile, $letter);
+			$x = $box[2] + $this->offset;
+		}
+
+		imagecolordeallocate($image, $foreColor);
+
+		header('Pragma: public');
+		header('Expires: 0');
+		header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+		header('Content-Transfer-Encoding: binary');
+		header("Content-type: image/png");
+		imagepng($image);
+		imagedestroy($image);
+	}
+
+	/**
+	 * Renders the CAPTCHA image based on the code using ImageMagick library.
+	 * @param string $code the verification code
+	 */
+	protected function renderImageByImagick($code)
+	{
+		$backColor = $this->transparent ? new \ImagickPixel('transparent') : new \ImagickPixel('#' . dechex($this->backColor));
+		$foreColor = new \ImagickPixel('#' . dechex($this->foreColor));
+
+		$image = new \Imagick();
+		$image->newImage($this->width, $this->height, $backColor);
+
+		if ($this->fontFile === null) {
+			$this->fontFile = dirname(__FILE__) . '/SpicyRice.ttf';
+		}
+
+		$draw = new \ImagickDraw();
+		$draw->setFont($this->fontFile);
+		$draw->setFontSize(30);
+		$fontMetrics = $image->queryFontMetrics($draw, $code);
+
+		$length = strlen($code);
+		$w = (int)($fontMetrics['textWidth']) - 8 + $this->offset * ($length - 1);
+		$h = (int)($fontMetrics['textHeight']) - 8;
+		$scale = min(($this->width - $this->padding * 2) / $w, ($this->height - $this->padding * 2) / $h);
+		$x = 10;
+		$y = round($this->height * 27 / 40);
+		for ($i = 0; $i < $length; ++$i) {
+			$draw = new \ImagickDraw();
+			$draw->setFont($this->fontFile);
+			$draw->setFontSize((int)(rand(26, 32) * $scale * 0.8));
+			$draw->setFillColor($foreColor);
+			$image->annotateImage($draw, $x, $y, rand(-10, 10), $code[$i]);
+			$fontMetrics = $image->queryFontMetrics($draw, $code[$i]);
+			$x += (int)($fontMetrics['textWidth']) + $this->offset;
+		}
+
+		header('Pragma: public');
+		header('Expires: 0');
+		header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+		header('Content-Transfer-Encoding: binary');
+		header("Content-type: image/png");
+		$image->setImageFormat('png');
+		echo $image;
+	}
+}
diff --git a/yii/web/Controller.php b/yii/web/Controller.php
new file mode 100644
index 0000000..517f4b4
--- /dev/null
+++ b/yii/web/Controller.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use Yii;
+
+/**
+ * Controller is the base class of Web controllers.
+ *
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Controller extends \yii\base\Controller
+{
+	/**
+	 * Creates a URL using the given route and parameters.
+	 *
+	 * This method enhances [[UrlManager::createUrl()]] by supporting relative routes.
+	 * A relative route is a route without a slash, such as "view". If the route is an empty
+	 * string, [[route]] will be used; Otherwise, [[uniqueId]] will be prepended to a relative route.
+	 *
+	 * After this route conversion, the method This method calls [[UrlManager::createUrl()]]
+	 * to create a URL.
+	 *
+	 * @param string $route the route. This can be either an absolute route or a relative route.
+	 * @param array $params the parameters (name-value pairs) to be included in the generated URL
+	 * @return string the created URL
+	 */
+	public function createUrl($route, $params = array())
+	{
+		if (strpos($route, '/') === false) {
+			// a relative route
+			$route = $route === '' ? $this->getRoute() : $this->getUniqueId() . '/' . $route;
+		}
+		return Yii::$app->getUrlManager()->createUrl($route, $params);
+	}
+}
diff --git a/yii/web/Cookie.php b/yii/web/Cookie.php
new file mode 100644
index 0000000..610e5aa
--- /dev/null
+++ b/yii/web/Cookie.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+/**
+ * Cookie represents information related with a cookie, such as [[name]], [[value]], [[domain]], etc.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Cookie extends \yii\base\Object
+{
+	/**
+	 * @var string name of the cookie
+	 */
+	public $name;
+	/**
+	 * @var string value of the cookie
+	 */
+	public $value = '';
+	/**
+	 * @var string domain of the cookie
+	 */
+	public $domain = '';
+	/**
+	 * @var integer the timestamp at which the cookie expires. This is the server timestamp.
+	 * Defaults to 0, meaning "until the browser is closed".
+	 */
+	public $expire = 0;
+	/**
+	 * @var string the path on the server in which the cookie will be available on. The default is '/'.
+	 */
+	public $path = '/';
+	/**
+	 * @var boolean whether cookie should be sent via secure connection
+	 */
+	public $secure = false;
+	/**
+	 * @var boolean whether the cookie should be accessible only through the HTTP protocol.
+	 * By setting this property to true, the cookie will not be accessible by scripting languages,
+	 * such as JavaScript, which can effectively help to reduce identity theft through XSS attacks.
+	 */
+	public $httponly = false;
+
+	/**
+	 * Magic method to turn a cookie object into a string without having to explicitly access [[value]].
+	 *
+	 * ~~~
+	 * if (isset($request->cookies['name'])) {
+	 *     $value = (string)$request->cookies['name'];
+	 * }
+	 * ~~~
+	 *
+	 * @return string The value of the cookie. If the value property is null, an empty string will be returned.
+	 */
+	public function __toString()
+	{
+		return (string)$this->value;
+	}
+}
diff --git a/yii/web/CookieCollection.php b/yii/web/CookieCollection.php
new file mode 100644
index 0000000..c76926b
--- /dev/null
+++ b/yii/web/CookieCollection.php
@@ -0,0 +1,247 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use Yii;
+use yii\base\DictionaryIterator;
+use yii\helpers\SecurityHelper;
+
+/**
+ * CookieCollection maintains the cookies available in the current request.
+ *
+ * @property integer $count the number of cookies in the collection
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class CookieCollection extends \yii\base\Object implements \IteratorAggregate, \ArrayAccess, \Countable
+{
+	/**
+	 * @var boolean whether to enable cookie validation. By setting this property to true,
+	 * if a cookie is tampered on the client side, it will be ignored when received on the server side.
+	 */
+	public $enableValidation = true;
+	/**
+	 * @var string the secret key used for cookie validation. If not set, a random key will be generated and used.
+	 */
+	public $validationKey;
+
+	/**
+	 * @var Cookie[] the cookies in this collection (indexed by the cookie names)
+	 */
+	private $_cookies = array();
+
+	/**
+	 * Constructor.
+	 * @param array $config name-value pairs that will be used to initialize the object properties
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct($config);
+		$this->_cookies = $this->loadCookies();
+	}
+
+	/**
+	 * Returns an iterator for traversing the cookies in the collection.
+	 * This method is required by the SPL interface `IteratorAggregate`.
+	 * It will be implicitly called when you use `foreach` to traverse the collection.
+	 * @return DictionaryIterator an iterator for traversing the cookies in the collection.
+	 */
+	public function getIterator()
+	{
+		return new DictionaryIterator($this->_cookies);
+	}
+
+	/**
+	 * Returns the number of cookies in the collection.
+	 * This method is required by the SPL `Countable` interface.
+	 * It will be implicitly called when you use `count($collection)`.
+	 * @return integer the number of cookies in the collection.
+	 */
+	public function count()
+	{
+		return $this->getCount();
+	}
+
+	/**
+	 * Returns the number of cookies in the collection.
+	 * @return integer the number of cookies in the collection.
+	 */
+	public function getCount()
+	{
+		return count($this->_cookies);
+	}
+
+	/**
+	 * Returns the cookie with the specified name.
+	 * @param string $name the cookie name
+	 * @return Cookie the cookie with the specified name. Null if the named cookie does not exist.
+	 * @see getValue()
+	 */
+	public function get($name)
+	{
+		return isset($this->_cookies[$name]) ? $this->_cookies[$name] : null;
+	}
+
+	/**
+	 * Returns the value of the named cookie.
+	 * @param string $name the cookie name
+	 * @param mixed $defaultValue the value that should be returned when the named cookie does not exist.
+	 * @return mixed the value of the named cookie.
+	 * @see get()
+	 */
+	public function getValue($name, $defaultValue = null)
+	{
+		return isset($this->_cookies[$name]) ? $this->_cookies[$name]->value : $defaultValue;
+	}
+
+	/**
+	 * Adds a cookie to the collection.
+	 * If there is already a cookie with the same name in the collection, it will be removed first.
+	 * @param Cookie $cookie the cookie to be added
+	 */
+	public function add($cookie)
+	{
+		if (isset($this->_cookies[$cookie->name])) {
+			$c = $this->_cookies[$cookie->name];
+			setcookie($c->name, '', 0, $c->path, $c->domain, $c->secure, $c->httponly);
+		}
+
+		$value = $cookie->value;
+		if ($this->enableValidation) {
+			if ($this->validationKey === null) {
+				$key = SecurityHelper::getSecretKey(__CLASS__ . '/' . Yii::$app->id);
+			} else {
+				$key = $this->validationKey;
+			}
+			$value = SecurityHelper::hashData(serialize($value), $key);
+		}
+
+		setcookie($cookie->name, $value, $cookie->expire, $cookie->path, $cookie->domain, $cookie->secure, $cookie->httponly);
+		$this->_cookies[$cookie->name] = $cookie;
+	}
+
+	/**
+	 * Removes a cookie from the collection.
+	 * @param Cookie|string $cookie the cookie object or the name of the cookie to be removed.
+	 */
+	public function remove($cookie)
+	{
+		if (is_string($cookie) && isset($this->_cookies[$cookie])) {
+			$cookie = $this->_cookies[$cookie];
+		}
+		if ($cookie instanceof Cookie) {
+			setcookie($cookie->name, '', 0, $cookie->path, $cookie->domain, $cookie->secure, $cookie->httponly);
+			unset($this->_cookies[$cookie->name]);
+		}
+	}
+
+	/**
+	 * Removes all cookies.
+	 */
+	public function removeAll()
+	{
+		foreach ($this->_cookies as $cookie) {
+			setcookie($cookie->name, '', 0, $cookie->path, $cookie->domain, $cookie->secure, $cookie->httponly);
+		}
+		$this->_cookies = array();
+	}
+
+	/**
+	 * Returns the collection as a PHP array.
+	 * @return array the array representation of the collection.
+	 * The array keys are cookie names, and the array values are the corresponding
+	 * cookie objects.
+	 */
+	public function toArray()
+	{
+		return $this->_cookies;
+	}
+
+	/**
+	 * Returns whether there is a cookie with the specified name.
+	 * This method is required by the SPL interface `ArrayAccess`.
+	 * It is implicitly called when you use something like `isset($collection[$name])`.
+	 * @param string $name the cookie name
+	 * @return boolean whether the named cookie exists
+	 */
+	public function offsetExists($name)
+	{
+		return isset($this->_cookies[$name]);
+	}
+
+	/**
+	 * Returns the cookie with the specified name.
+	 * This method is required by the SPL interface `ArrayAccess`.
+	 * It is implicitly called when you use something like `$cookie = $collection[$name];`.
+	 * This is equivalent to [[get()]].
+	 * @param string $name the cookie name
+	 * @return Cookie the cookie with the specified name, null if the named cookie does not exist.
+	 */
+	public function offsetGet($name)
+	{
+		return $this->get($name);
+	}
+
+	/**
+	 * Adds the cookie to the collection.
+	 * This method is required by the SPL interface `ArrayAccess`.
+	 * It is implicitly called when you use something like `$collection[$name] = $cookie;`.
+	 * This is equivalent to [[add()]].
+	 * @param string $name the cookie name
+	 * @param Cookie $cookie the cookie to be added
+	 */
+	public function offsetSet($name, $cookie)
+	{
+		$this->add($cookie);
+	}
+
+	/**
+	 * Removes the named cookie.
+	 * This method is required by the SPL interface `ArrayAccess`.
+	 * It is implicitly called when you use something like `unset($collection[$name])`.
+	 * This is equivalent to [[remove()]].
+	 * @param string $name the cookie name
+	 */
+	public function offsetUnset($name)
+	{
+		$this->remove($name);
+	}
+
+	/**
+	 * Returns the current cookies in terms of [[Cookie]] objects.
+	 * @return Cookie[] list of current cookies
+	 */
+	protected function loadCookies()
+	{
+		$cookies = array();
+		if ($this->enableValidation) {
+			if ($this->validationKey === null) {
+				$key = SecurityHelper::getSecretKey(__CLASS__ . '/' . Yii::$app->id);
+			} else {
+				$key = $this->validationKey;
+			}
+			foreach ($_COOKIE as $name => $value) {
+				if (is_string($value) && ($value = SecurityHelper::validateData($value, $key)) !== false) {
+					$cookies[$name] = new Cookie(array(
+						'name' => $name,
+						'value' => @unserialize($value),
+					));
+				}
+			}
+		} else {
+			foreach ($_COOKIE as $name => $value) {
+				$cookies[$name] = new Cookie(array(
+					'name' => $name,
+					'value' => $value,
+				));
+			}
+		}
+		return $cookies;
+	}
+}
diff --git a/yii/web/DbSession.php b/yii/web/DbSession.php
new file mode 100644
index 0000000..e81aa7f
--- /dev/null
+++ b/yii/web/DbSession.php
@@ -0,0 +1,221 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use Yii;
+use yii\db\Connection;
+use yii\db\Query;
+use yii\base\InvalidConfigException;
+
+/**
+ * DbSession extends [[Session]] by using database as session data storage.
+ *
+ * By default, DbSession stores session data in a DB table named 'tbl_session'. This table
+ * must be pre-created. The table name can be changed by setting [[sessionTable]].
+ * 
+ * The following example shows how you can configure the application to use DbSession:
+ * 
+ * ~~~
+ * 'session' => array(
+ *     'class' => 'yii\web\DbSession',
+ *     // 'db' => 'mydb',
+ *     // 'sessionTable' => 'my_session',
+ * )
+ * ~~~
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class DbSession extends Session
+{
+	/**
+	 * @var Connection|string the DB connection object or the application component ID of the DB connection.
+	 * After the DbSession object is created, if you want to change this property, you should only assign it
+	 * with a DB connection object.
+	 */
+	public $db = 'db';
+	/**
+	 * @var string the name of the DB table that stores the session data.
+	 * The table should be pre-created as follows:
+	 *
+	 * ~~~
+	 * CREATE TABLE tbl_session
+	 * (
+	 *     id CHAR(40) NOT NULL PRIMARY KEY,
+	 *     expire INTEGER,
+	 *     data BLOB
+	 * )
+	 * ~~~
+	 *
+	 * where 'BLOB' refers to the BLOB-type of your preferred DBMS. Below are the BLOB type
+	 * that can be used for some popular DBMS:
+	 *
+	 * - MySQL: LONGBLOB
+	 * - PostgreSQL: BYTEA
+	 * - MSSQL: BLOB
+	 *
+	 * When using DbSession in a production server, we recommend you create a DB index for the 'expire'
+	 * column in the session table to improve the performance.
+	 */
+	public $sessionTable = 'tbl_session';
+
+	/**
+	 * Initializes the DbSession component.
+	 * This method will initialize the [[db]] property to make sure it refers to a valid DB connection.
+	 * @throws InvalidConfigException if [[db]] is invalid.
+	 */
+	public function init()
+	{
+		if (is_string($this->db)) {
+			$this->db = Yii::$app->getComponent($this->db);
+		}
+		if (!$this->db instanceof Connection) {
+			throw new InvalidConfigException("DbSession::db must be either a DB connection instance or the application component ID of a DB connection.");
+		}
+		parent::init();
+	}
+
+	/**
+	 * Returns a value indicating whether to use custom session storage.
+	 * This method overrides the parent implementation and always returns true.
+	 * @return boolean whether to use custom storage.
+	 */
+	public function getUseCustomStorage()
+	{
+		return true;
+	}
+
+	/**
+	 * Updates the current session ID with a newly generated one .
+	 * Please refer to [[http://php.net/session_regenerate_id]] for more details.
+	 * @param boolean $deleteOldSession Whether to delete the old associated session file or not.
+	 */
+	public function regenerateID($deleteOldSession = false)
+	{
+		$oldID = session_id();
+
+		// if no session is started, there is nothing to regenerate
+		if (empty($oldID)) {
+			return;
+		}
+
+		parent::regenerateID(false);
+		$newID = session_id();
+
+		$query = new Query;
+		$row = $query->from($this->sessionTable)
+			->where(array('id' => $oldID))
+			->createCommand($this->db)
+			->queryRow();
+		if ($row !== false) {
+			if ($deleteOldSession) {
+				$this->db->createCommand()
+					->update($this->sessionTable, array('id' => $newID), array('id' => $oldID))
+					->execute();
+			} else {
+				$row['id'] = $newID;
+				$this->db->createCommand()
+					->insert($this->sessionTable, $row)
+					->execute();
+			}
+		} else {
+			// shouldn't reach here normally
+			$this->db->createCommand()
+				->insert($this->sessionTable, array(
+					'id' => $newID,
+					'expire' => time() + $this->getTimeout(),
+				))->execute();
+		}
+	}
+
+	/**
+	 * Session read handler.
+	 * Do not call this method directly.
+	 * @param string $id session ID
+	 * @return string the session data
+	 */
+	public function readSession($id)
+	{
+		$query = new Query;
+		$data = $query->select(array('data'))
+			->from($this->sessionTable)
+			->where('[[expire]]>:expire AND [[id]]=:id', array(':expire' => time(), ':id' => $id))
+			->createCommand($this->db)
+			->queryScalar();
+		return $data === false ? '' : $data;
+	}
+
+	/**
+	 * Session write handler.
+	 * Do not call this method directly.
+	 * @param string $id session ID
+	 * @param string $data session data
+	 * @return boolean whether session write is successful
+	 */
+	public function writeSession($id, $data)
+	{
+		// exception must be caught in session write handler
+		// http://us.php.net/manual/en/function.session-set-save-handler.php
+		try {
+			$expire = time() + $this->getTimeout();
+			$query = new Query;
+			$exists = $query->select(array('id'))
+				->from($this->sessionTable)
+				->where(array('id' => $id))
+				->createCommand($this->db)
+				->queryScalar();
+			if ($exists === false) {
+				$this->db->createCommand()
+					->insert($this->sessionTable, array(
+						'id' => $id,
+						'data' => $data,
+						'expire' => $expire,
+					))->execute();
+			} else {
+				$this->db->createCommand()
+					->update($this->sessionTable, array('data' => $data, 'expire' => $expire), array('id' => $id))
+					->execute();
+			}
+		} catch (\Exception $e) {
+			if (YII_DEBUG) {
+				echo $e->getMessage();
+			}
+			// it is too late to log an error message here
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Session destroy handler.
+	 * Do not call this method directly.
+	 * @param string $id session ID
+	 * @return boolean whether session is destroyed successfully
+	 */
+	public function destroySession($id)
+	{
+		$this->db->createCommand()
+			->delete($this->sessionTable, array('id' => $id))
+			->execute();
+		return true;
+	}
+
+	/**
+	 * Session GC (garbage collection) handler.
+	 * Do not call this method directly.
+	 * @param integer $maxLifetime the number of seconds after which data will be seen as 'garbage' and cleaned up.
+	 * @return boolean whether session is GCed successfully
+	 */
+	public function gcSession($maxLifetime)
+	{
+		$this->db->createCommand()
+			->delete($this->sessionTable, '[[expire]]<:expire', array(':expire' => time()))
+			->execute();
+		return true;
+	}
+}
diff --git a/yii/web/HttpCache.php b/yii/web/HttpCache.php
new file mode 100644
index 0000000..0a3bb86
--- /dev/null
+++ b/yii/web/HttpCache.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use Yii;
+use yii\base\ActionFilter;
+use yii\base\Action;
+
+/**
+ * @author Da:Sourcerer <webmaster@dasourcerer.net>
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class HttpCache extends ActionFilter
+{
+	/**
+	 * @var callback a PHP callback that returns the UNIX timestamp of the last modification time.
+	 * The callback's signature should be:
+	 *
+	 * ~~~
+	 * function ($action, $params)
+	 * ~~~
+	 *
+	 * where `$action` is the [[Action]] object that this filter is currently handling;
+	 * `$params` takes the value of [[params]]. The callback should return a UNIX timestamp.
+	 */
+	public $lastModified;
+	/**
+	 * @var callback a PHP callback that generates the Etag seed string.
+	 * The callback's signature should be:
+	 *
+	 * ~~~
+	 * function ($action, $params)
+	 * ~~~
+	 *
+	 * where `$action` is the [[Action]] object that this filter is currently handling;
+	 * `$params` takes the value of [[params]]. The callback should return a string serving
+	 * as the seed for generating an Etag.
+	 */
+	public $etagSeed;
+	/**
+	 * @var mixed additional parameters that should be passed to the [[lastModified]] and [[etagSeed]] callbacks.
+	 */
+	public $params;
+	/**
+	 * @var string HTTP cache control header. If null, the header will not be sent.
+	 */
+	public $cacheControlHeader = 'Cache-Control: max-age=3600, public';
+
+	/**
+	 * This method is invoked right before an action is to be executed (after all possible filters.)
+	 * You may override this method to do last-minute preparation for the action.
+	 * @param Action $action the action to be executed.
+	 * @return boolean whether the action should continue to be executed.
+	 */
+	public function beforeAction($action)
+	{
+		$verb = Yii::$app->request->getRequestMethod();
+		if ($verb !== 'GET' && $verb !== 'HEAD' || $this->lastModified === null && $this->etagSeed === null) {
+			return true;
+		}
+
+		$lastModified = $etag = null;
+		if ($this->lastModified !== null) {
+			$lastModified = call_user_func($this->lastModified, $action, $this->params);
+		}
+		if ($this->etagSeed !== null) {
+			$seed = call_user_func($this->etagSeed, $action, $this->params);
+			$etag = $this->generateEtag($seed);
+		}
+
+		$this->sendCacheControlHeader();
+		if ($etag !== null) {
+			header("ETag: $etag");
+		}
+
+		if ($this->validateCache($lastModified, $etag)) {
+			header('HTTP/1.1 304 Not Modified');
+			return false;
+		}
+
+		if ($lastModified !== null) {
+			header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $lastModified) . ' GMT');
+		}
+		return true;
+	}
+
+	/**
+	 * Validates if the HTTP cache contains valid content.
+	 * @param integer $lastModified the calculated Last-Modified value in terms of a UNIX timestamp.
+	 * If null, the Last-Modified header will not be validated.
+	 * @param string $etag the calculated ETag value. If null, the ETag header will not be validated.
+	 * @return boolean whether the HTTP cache is still valid.
+	 */
+	protected function validateCache($lastModified, $etag)
+	{
+		if ($lastModified !== null && (!isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) || @strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) < $lastModified)) {
+			return false;
+		} else {
+			return $etag === null || isset($_SERVER['HTTP_IF_NONE_MATCH']) && $_SERVER['HTTP_IF_NONE_MATCH'] === $etag;
+		}
+	}
+
+	/**
+	 * Sends the cache control header to the client
+	 * @see cacheControl
+	 */
+	protected function sendCacheControlHeader()
+	{
+		session_cache_limiter('public');
+		header('Pragma:', true);
+		if ($this->cacheControlHeader !== null) {
+			header($this->cacheControlHeader, true);
+		}
+	}
+
+	/**
+	 * Generates an Etag from the given seed string.
+	 * @param string $seed Seed for the ETag
+	 * @return string the generated Etag
+	 */
+	protected function generateEtag($seed)
+	{
+		return '"' . base64_encode(sha1($seed, true)) . '"';
+	}
+}
diff --git a/yii/web/IAssetConverter.php b/yii/web/IAssetConverter.php
new file mode 100644
index 0000000..d1d1da0
--- /dev/null
+++ b/yii/web/IAssetConverter.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+/**
+ * The IAssetConverter interface must be implemented by asset converter classes.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+interface IAssetConverter
+{
+	/**
+	 * Converts a given asset file into a CSS or JS file.
+	 * @param string $asset the asset file path, relative to $basePath
+	 * @param string $basePath the directory the $asset is relative to.
+	 * @param string $baseUrl the URL corresponding to $basePath
+	 * @return string the URL to the converted asset file. If the given asset does not
+	 * need conversion, "$baseUrl/$asset" should be returned.
+	 */
+	public function convert($asset, $basePath, $baseUrl);
+}
diff --git a/yii/web/Identity.php b/yii/web/Identity.php
new file mode 100644
index 0000000..101ecdb
--- /dev/null
+++ b/yii/web/Identity.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+/**
+ * Identity is the interface that should be implemented by a class providing identity information.
+ *
+ * This interface can typically be implemented by a user model class. For example, the following
+ * code shows how to implement this interface by a User ActiveRecord class:
+ *
+ * ~~~
+ * class User extends ActiveRecord implements Identity
+ * {
+ *     public static function findIdentity($id)
+ *     {
+ *         return static::find($id);
+ *     }
+ *
+ *     public function getId()
+ *     {
+ *         return $this->id;
+ *     }
+ *
+ *     public function getAuthKey()
+ *     {
+ *         return $this->authKey;
+ *     }
+ *
+ *     public function validateAuthKey($authKey)
+ *     {
+ *         return $this->authKey === $authKey;
+ *     }
+ * }
+ * ~~~
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+interface Identity
+{
+	/**
+	 * Finds an identity by the given ID.
+	 * @param string|integer $id the ID to be looked for
+	 * @return Identity the identity object that matches the given ID.
+	 * Null should be returned if such an identity cannot be found
+	 * or the identity is not in an active state (disabled, deleted, etc.)
+	 */
+	public static function findIdentity($id);
+	/**
+	 * Returns an ID that can uniquely identify a user identity.
+	 * @return string|integer an ID that uniquely identifies a user identity.
+	 */
+	public function getId();
+	/**
+	 * Returns a key that can be used to check the validity of a given identity ID.
+	 *
+	 * The key should be unique for each individual user, and should be persistent
+	 * so that it can be used to check the validity of the user identity.
+	 *
+	 * The space of such keys should be big enough to defeat potential identity attacks.
+	 *
+	 * This is required if [[User::enableAutoLogin]] is enabled.
+	 * @return string a key that is used to check the validity of a given identity ID.
+	 * @see validateAuthKey()
+	 */
+	public function getAuthKey();
+	/**
+	 * Validates the given auth key.
+	 *
+	 * This is required if [[User::enableAutoLogin]] is enabled.
+	 * @param string $authKey the given auth key
+	 * @return boolean whether the given auth key is valid.
+	 * @see getAuthKey()
+	 */
+	public function validateAuthKey($authKey);
+}
diff --git a/yii/web/JsExpression.php b/yii/web/JsExpression.php
new file mode 100644
index 0000000..027c065
--- /dev/null
+++ b/yii/web/JsExpression.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use yii\base\Object;
+
+/**
+ * JsExpression marks a string as a JavaScript expression.
+ * When using [[Json::encode()]] to encode a value, JsonExpression objects
+ * will be specially handled and encoded as a JavaScript expression instead of a string.
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class JsExpression extends Object
+{
+	/**
+	 * @var string the JavaScript expression represented by this object
+	 */
+	public $expression;
+
+	/**
+	 * Constructor.
+	 * @param string $expression the JavaScript expression represented by this object
+	 * @param array $config additional configurations for this object
+	 */
+	public function __construct($expression, $config = array())
+	{
+		$this->expression = $expression;
+		parent::__construct($config);
+	}
+
+	/**
+	 * The PHP magic function converting an object into a string.
+	 * @return string the JavaScript expression.
+	 */
+	public function __toString()
+	{
+		return $this->expression;
+	}
+}
diff --git a/yii/web/PageCache.php b/yii/web/PageCache.php
new file mode 100644
index 0000000..2fe36b3
--- /dev/null
+++ b/yii/web/PageCache.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use Yii;
+use yii\base\ActionFilter;
+use yii\base\Action;
+use yii\base\View;
+use yii\caching\Dependency;
+
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class PageCache extends ActionFilter
+{
+	/**
+	 * @var boolean whether the content being cached should be differentiated according to the route.
+	 * A route consists of the requested controller ID and action ID. Defaults to true.
+	 */
+	public $varyByRoute = true;
+	/**
+	 * @var string the application component ID of the [[\yii\caching\Cache|cache]] object.
+	 */
+	public $cache = 'cache';
+	/**
+	 * @var integer number of seconds that the data can remain valid in cache.
+	 * Use 0 to indicate that the cached data will never expire.
+	 */
+	public $duration = 60;
+	/**
+	 * @var array|Dependency the dependency that the cached content depends on.
+	 * This can be either a [[Dependency]] object or a configuration array for creating the dependency object.
+	 * For example,
+	 *
+	 * ~~~
+	 * array(
+	 *     'class' => 'yii\caching\DbDependency',
+	 *     'sql' => 'SELECT MAX(lastModified) FROM Post',
+	 * )
+	 * ~~~
+	 *
+	 * would make the output cache depends on the last modified time of all posts.
+	 * If any post has its modification time changed, the cached content would be invalidated.
+	 */
+	public $dependency;
+	/**
+	 * @var array list of factors that would cause the variation of the content being cached.
+	 * Each factor is a string representing a variation (e.g. the language, a GET parameter).
+	 * The following variation setting will cause the content to be cached in different versions
+	 * according to the current application language:
+	 *
+	 * ~~~
+	 * array(
+	 *     Yii::$app->language,
+	 * )
+	 */
+	public $variations;
+	/**
+	 * @var boolean whether to enable the fragment cache. You may use this property to turn on and off
+	 * the fragment cache according to specific setting (e.g. enable fragment cache only for GET requests).
+	 */
+	public $enabled = true;
+
+
+	public function init()
+	{
+		parent::init();
+		if ($this->view === null) {
+			$this->view = Yii::$app->getView();
+		}
+	}
+
+	/**
+	 * This method is invoked right before an action is to be executed (after all possible filters.)
+	 * You may override this method to do last-minute preparation for the action.
+	 * @param Action $action the action to be executed.
+	 * @return boolean whether the action should continue to be executed.
+	 */
+	public function beforeAction($action)
+	{
+		$properties = array();
+		foreach (array('cache', 'duration', 'dependency', 'variations', 'enabled') as $name) {
+			$properties[$name] = $this->$name;
+		}
+		$id = $this->varyByRoute ? $action->getUniqueId() : __CLASS__;
+		return $this->view->beginCache($id, $properties);
+	}
+
+	/**
+	 * This method is invoked right after an action is executed.
+	 * You may override this method to do some postprocessing for the action.
+	 * @param Action $action the action just executed.
+	 */
+	public function afterAction($action)
+	{
+		$this->view->endCache();
+	}
+}
diff --git a/yii/web/Pagination.php b/yii/web/Pagination.php
new file mode 100644
index 0000000..764dbb4
--- /dev/null
+++ b/yii/web/Pagination.php
@@ -0,0 +1,208 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use Yii;
+
+/**
+ * Pagination represents information relevant to pagination of data items.
+ *
+ * When data needs to be rendered in multiple pages, Pagination can be used to
+ * represent information such as [[itemCount|total item count]], [[pageSize|page size]],
+ * [[page|current page]], etc. These information can be passed to [[yii\widgets\Pager|pagers]]
+ * to render pagination buttons or links.
+ *
+ * The following example shows how to create a pagination object and feed it
+ * to a pager.
+ *
+ * Controller action:
+ *
+ * ~~~
+ * function actionIndex()
+ * {
+ *     $query = Article::find()->where(array('status' => 1));
+ *     $countQuery = clone $query;
+ *     $pages = new Pagination($countQuery->count());
+ *     $models = $query->offset($pages->offset)
+ *         ->limit($pages->limit)
+ *         ->all();
+ *
+ *     $this->render('index', array(
+ *          'models' => $models,
+ *          'pages' => $pages,
+ *     ));
+ * }
+ * ~~~
+ *
+ * View:
+ *
+ * ~~~
+ * foreach($models as $model) {
+ *     // display $model here
+ * }
+ *
+ * // display pagination
+ * $this->widget('yii\widgets\LinkPager', array(
+ *     'pages' => $pages,
+ * ));
+ * ~~~
+ *
+ * @property integer $pageCount Number of pages.
+ * @property integer $page The zero-based index of the current page.
+ * @property integer $offset The offset of the data. This may be used to set the
+ * OFFSET value for a SQL statement for fetching the current page of data.
+ * @property integer $limit The limit of the data. This may be used to set the
+ * LIMIT value for a SQL statement for fetching the current page of data.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Pagination extends \yii\base\Object
+{
+	/**
+	 * @var string name of the parameter storing the current page index. Defaults to 'page'.
+	 * @see params
+	 */
+	public $pageVar = 'page';
+	/**
+	 * @var boolean whether to always have the page parameter in the URL created by [[createUrl()]].
+	 * If false and [[page]] is 0, the page parameter will not be put in the URL.
+	 */
+	public $forcePageVar = false;
+	/**
+	 * @var string the route of the controller action for displaying the paged contents.
+	 * If not set, it means using the currently requested route.
+	 */
+	public $route;
+	/**
+	 * @var array parameters (name=>value) that should be used to obtain the current page number
+	 * and to create new pagination URLs. If not set, $_GET will be used instead.
+	 *
+	 * The array element indexed by [[pageVar]] is considered to be the current page number.
+	 * If the element does not exist, the current page number is considered 0.
+	 */
+	public $params;
+	/**
+	 * @var boolean whether to check if [[page]] is within valid range.
+	 * When this property is true, the value of [[page]] will always be between 0 and ([[pageCount]]-1).
+	 * Because [[pageCount]] relies on the correct value of [[itemCount]] which may not be available
+	 * in some cases (e.g. MongoDB), you may want to set this property to be false to disable the page
+	 * number validation. By doing so, [[page]] will return the value indexed by [[pageVar]] in [[params]].
+	 */
+	public $validatePage = true;
+	/**
+	 * @var integer number of items on each page. Defaults to 10.
+	 * If it is less than 1, it means the page size is infinite, and thus a single page contains all items.
+	 */
+	public $pageSize = 10;
+	/**
+	 * @var integer total number of items.
+	 */
+	public $itemCount;
+
+	/**
+	 * Constructor.
+	 * @param integer $itemCount total number of items.
+	 * @param array $config name-value pairs that will be used to initialize the object properties
+	 */
+	public function __construct($itemCount, $config = array())
+	{
+		$this->itemCount = $itemCount;
+		parent::__construct($config);
+	}
+
+	/**
+	 * @return integer number of pages
+	 */
+	public function getPageCount()
+	{
+		if ($this->pageSize < 1) {
+			return $this->itemCount > 0 ? 1 : 0;
+		} else {
+			$itemCount = $this->itemCount < 0 ? 0 : (int)$this->itemCount;
+			return (int)(($itemCount + $this->pageSize - 1) / $this->pageSize);
+		}
+	}
+
+	private $_page;
+
+	/**
+	 * Returns the zero-based current page number.
+	 * @param boolean $recalculate whether to recalculate the current page based on the page size and item count.
+	 * @return integer the zero-based current page number.
+	 */
+	public function getPage($recalculate = false)
+	{
+		if ($this->_page === null || $recalculate) {
+			$params = $this->params === null ? $_GET : $this->params;
+			if (isset($params[$this->pageVar]) && is_scalar($params[$this->pageVar])) {
+				$this->_page = (int)$params[$this->pageVar] - 1;
+				if ($this->validatePage) {
+					$pageCount = $this->getPageCount();
+					if ($this->_page >= $pageCount) {
+						$this->_page = $pageCount - 1;
+					}
+				}
+				if ($this->_page < 0) {
+					$this->_page = 0;
+				}
+			} else {
+				$this->_page = 0;
+			}
+		}
+		return $this->_page;
+	}
+
+	/**
+	 * Sets the current page number.
+	 * @param integer $value the zero-based index of the current page.
+	 */
+	public function setPage($value)
+	{
+		$this->_page = $value;
+	}
+
+	/**
+	 * Creates the URL suitable for pagination with the specified page number.
+	 * This method is mainly called by pagers when creating URLs used to perform pagination.
+	 * @param integer $page the zero-based page number that the URL should point to.
+	 * @return string the created URL
+	 * @see params
+	 * @see forcePageVar
+	 */
+	public function createUrl($page)
+	{
+		$params = $this->params === null ? $_GET : $this->params;
+		if ($page > 0 || $page >= 0 && $this->forcePageVar) {
+			$params[$this->pageVar] = $page + 1;
+		} else {
+			unset($params[$this->pageVar]);
+		}
+		$route = $this->route === null ? Yii::$app->controller->route : $this->route;
+		return Yii::$app->getUrlManager()->createUrl($route, $params);
+	}
+
+	/**
+	 * @return integer the offset of the data. This may be used to set the
+	 * OFFSET value for a SQL statement for fetching the current page of data.
+	 */
+	public function getOffset()
+	{
+		return $this->pageSize < 1 ? 0 : $this->getPage() * $this->pageSize;
+	}
+
+	/**
+	 * @return integer the limit of the data. This may be used to set the
+	 * LIMIT value for a SQL statement for fetching the current page of data.
+	 * Note that if the page size is infinite, a value -1 will be returned.
+	 */
+	public function getLimit()
+	{
+		return $this->pageSize < 1 ? -1 : $this->pageSize;
+	}
+}
diff --git a/yii/web/Request.php b/yii/web/Request.php
new file mode 100644
index 0000000..d3f419b
--- /dev/null
+++ b/yii/web/Request.php
@@ -0,0 +1,794 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use Yii;
+use yii\base\HttpException;
+use yii\base\InvalidConfigException;
+
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Request extends \yii\base\Request
+{
+	/**
+	 * @var boolean whether to enable CSRF (Cross-Site Request Forgery) validation. Defaults to false.
+	 * By setting this property to true, forms submitted to an Yii Web application must be originated
+	 * from the same application. If not, a 400 HTTP exception will be raised.
+	 *
+	 * Note, this feature requires that the user client accepts cookie. Also, to use this feature,
+	 * forms submitted via POST method must contain a hidden input whose name is specified by [[csrfTokenName]].
+	 * You may use [[\yii\web\Html::beginForm()]] to generate his hidden input.
+	 * @see http://en.wikipedia.org/wiki/Cross-site_request_forgery
+	 */
+	public $enableCsrfValidation = false;
+	/**
+	 * @var string the name of the token used to prevent CSRF. Defaults to 'YII_CSRF_TOKEN'.
+	 * This property is effectively only when {@link enableCsrfValidation} is true.
+	 */
+	public $csrfTokenName = '_csrf';
+	/**
+	 * @var array the configuration of the CSRF cookie. This property is used only when [[enableCsrfValidation]] is true.
+	 * @see Cookie
+	 */
+	public $csrfCookie = array('httponly' => true);
+	/**
+	 * @var boolean whether cookies should be validated to ensure they are not tampered. Defaults to true.
+	 */
+	public $enableCookieValidation = true;
+	/**
+	 * @var string the secret key used for cookie validation. If not set, a random key will be generated and used.
+	 */
+	public $cookieValidationKey;
+	/**
+	 * @var string|boolean the name of the POST parameter that is used to indicate if a request is a PUT or DELETE
+	 * request tunneled through POST. Default to '_method'.
+	 * @see getRequestMethod
+	 * @see getRestParams
+	 */
+	public $restVar = '_method';
+
+	private $_cookies;
+
+
+	/**
+	 * Resolves the current request into a route and the associated parameters.
+	 * @return array the first element is the route, and the second is the associated parameters.
+	 * @throws HttpException if the request cannot be resolved.
+	 */
+	public function resolve()
+	{
+		$this->validateCsrfToken();
+
+		$result = Yii::$app->getUrlManager()->parseRequest($this);
+		if ($result !== false) {
+			list ($route, $params) = $result;
+			$_GET = array_merge($_GET, $params);
+			return array($route, $_GET);
+		} else {
+			throw new HttpException(404, Yii::t('yii|Page not found.'));
+		}
+	}
+
+	/**
+	 * Returns the method of the current request (e.g. GET, POST, HEAD, PUT, DELETE).
+	 * @return string request method, such as GET, POST, HEAD, PUT, DELETE.
+	 * The value returned is turned into upper case.
+	 */
+	public function getRequestMethod()
+	{
+		if (isset($_POST[$this->restVar])) {
+			return strtoupper($_POST[$this->restVar]);
+		} else {
+			return isset($_SERVER['REQUEST_METHOD']) ? strtoupper($_SERVER['REQUEST_METHOD']) : 'GET';
+		}
+	}
+
+	/**
+	 * Returns whether this is a POST request.
+	 * @return boolean whether this is a POST request.
+	 */
+	public function getIsPostRequest()
+	{
+		return $this->getRequestMethod() === 'POST';
+	}
+
+	/**
+	 * Returns whether this is a DELETE request.
+	 * @return boolean whether this is a DELETE request.
+	 */
+	public function getIsDeleteRequest()
+	{
+		return $this->getRequestMethod() === 'DELETE';
+	}
+
+	/**
+	 * Returns whether this is a PUT request.
+	 * @return boolean whether this is a PUT request.
+	 */
+	public function getIsPutRequest()
+	{
+		return $this->getRequestMethod() === 'PUT';
+	}
+
+	/**
+	 * Returns whether this is an AJAX (XMLHttpRequest) request.
+	 * @return boolean whether this is an AJAX (XMLHttpRequest) request.
+	 */
+	public function getIsAjaxRequest()
+	{
+		return isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest';
+	}
+
+	/**
+	 * Returns whether this is an Adobe Flash or Flex request.
+	 * @return boolean whether this is an Adobe Flash or Adobe Flex request.
+	 */
+	public function getIsFlashRequest()
+	{
+		return isset($_SERVER['HTTP_USER_AGENT']) &&
+			(stripos($_SERVER['HTTP_USER_AGENT'], 'Shockwave') !== false || stripos($_SERVER['HTTP_USER_AGENT'], 'Flash') !== false);
+	}
+
+	private $_restParams;
+
+	/**
+	 * Returns the request parameters for the RESTful request.
+	 * @return array the RESTful request parameters
+	 * @see getRequestMethod
+	 */
+	public function getRestParams()
+	{
+		if ($this->_restParams === null) {
+			if (isset($_POST[$this->restVar])) {
+				$this->_restParams = $_POST;
+			} else {
+				$this->_restParams = array();
+				if (function_exists('mb_parse_str')) {
+					mb_parse_str($this->getRawBody(), $this->_restParams);
+				} else {
+					parse_str($this->getRawBody(), $this->_restParams);
+				}
+			}
+		}
+		return $this->_restParams;
+	}
+
+	private $_rawBody;
+
+	/**
+	 * Returns the raw HTTP request body.
+	 * @return string the request body
+	 */
+	public function getRawBody()
+	{
+		if ($this->_rawBody === null) {
+			$this->_rawBody = file_get_contents('php://input');
+		}
+		return $this->_rawBody;
+	}
+
+	/**
+	 * Sets the RESTful parameters.
+	 * @param array $values the RESTful parameters (name-value pairs)
+	 */
+	public function setRestParams($values)
+	{
+		$this->_restParams = $values;
+	}
+
+	/**
+	 * Returns the named RESTful parameter value.
+	 * @param string $name the parameter name
+	 * @param mixed $defaultValue the default parameter value if the parameter does not exist.
+	 * @return mixed the parameter value
+	 */
+	public function getRestParam($name, $defaultValue = null)
+	{
+		$params = $this->getRestParams();
+		return isset($params[$name]) ? $params[$name] : $defaultValue;
+	}
+
+	/**
+	 * Returns the named GET parameter value.
+	 * If the GET parameter does not exist, the second parameter to this method will be returned.
+	 * @param string $name the GET parameter name
+	 * @param mixed $defaultValue the default parameter value if the GET parameter does not exist.
+	 * @return mixed the GET parameter value
+	 * @see getPost
+	 */
+	public function getParam($name, $defaultValue = null)
+	{
+		return isset($_GET[$name]) ? $_GET[$name] : $defaultValue;
+	}
+
+	/**
+	 * Returns the named POST parameter value.
+	 * If the POST parameter does not exist, the second parameter to this method will be returned.
+	 * @param string $name the POST parameter name
+	 * @param mixed $defaultValue the default parameter value if the POST parameter does not exist.
+	 * @return mixed the POST parameter value
+	 * @see getParam
+	 */
+	public function getPost($name, $defaultValue = null)
+	{
+		return isset($_POST[$name]) ? $_POST[$name] : $defaultValue;
+	}
+
+	/**
+	 * Returns the named DELETE parameter value.
+	 * @param string $name the DELETE parameter name
+	 * @param mixed $defaultValue the default parameter value if the DELETE parameter does not exist.
+	 * @return mixed the DELETE parameter value
+	 */
+	public function getDelete($name, $defaultValue = null)
+	{
+		return $this->getIsDeleteRequest() ? $this->getRestParam($name, $defaultValue) : null;
+	}
+
+	/**
+	 * Returns the named PUT parameter value.
+	 * @param string $name the PUT parameter name
+	 * @param mixed $defaultValue the default parameter value if the PUT parameter does not exist.
+	 * @return mixed the PUT parameter value
+	 */
+	public function getPut($name, $defaultValue = null)
+	{
+		return $this->getIsPutRequest() ? $this->getRestParam($name, $defaultValue) : null;
+	}
+
+	private $_hostInfo;
+
+	/**
+	 * Returns the schema and host part of the current request URL.
+	 * The returned URL does not have an ending slash.
+	 * By default this is determined based on the user request information.
+	 * You may explicitly specify it by setting the [[setHostInfo()|hostInfo]] property.
+	 * @return string schema and hostname part (with port number if needed) of the request URL (e.g. `http://www.yiiframework.com`)
+	 * @see setHostInfo
+	 */
+	public function getHostInfo()
+	{
+		if ($this->_hostInfo === null) {
+			$secure = $this->getIsSecureConnection();
+			$http = $secure ? 'https' : 'http';
+			if (isset($_SERVER['HTTP_HOST'])) {
+				$this->_hostInfo = $http . '://' . $_SERVER['HTTP_HOST'];
+			} else {
+				$this->_hostInfo = $http . '://' . $_SERVER['SERVER_NAME'];
+				$port = $secure ? $this->getSecurePort() : $this->getPort();
+				if (($port !== 80 && !$secure) || ($port !== 443 && $secure)) {
+					$this->_hostInfo .= ':' . $port;
+				}
+			}
+		}
+
+		return $this->_hostInfo;
+	}
+
+	/**
+	 * Sets the schema and host part of the application URL.
+	 * This setter is provided in case the schema and hostname cannot be determined
+	 * on certain Web servers.
+	 * @param string $value the schema and host part of the application URL. The trailing slashes will be removed.
+	 */
+	public function setHostInfo($value)
+	{
+		$this->_hostInfo = rtrim($value, '/');
+	}
+
+	private $_baseUrl;
+
+	/**
+	 * Returns the relative URL for the application.
+	 * This is similar to [[scriptUrl]] except that it does not include the script file name,
+	 * and the ending slashes are removed.
+	 * @return string the relative URL for the application
+	 * @see setScriptUrl
+	 */
+	public function getBaseUrl()
+	{
+		if ($this->_baseUrl === null) {
+			$this->_baseUrl = rtrim(dirname($this->getScriptUrl()), '\\/');
+		}
+		return $this->_baseUrl;
+	}
+
+	/**
+	 * Sets the relative URL for the application.
+	 * By default the URL is determined based on the entry script URL.
+	 * This setter is provided in case you want to change this behavior.
+	 * @param string $value the relative URL for the application
+	 */
+	public function setBaseUrl($value)
+	{
+		$this->_baseUrl = $value;
+	}
+
+	private $_scriptUrl;
+
+	/**
+	 * Returns the relative URL of the entry script.
+	 * The implementation of this method referenced Zend_Controller_Request_Http in Zend Framework.
+	 * @return string the relative URL of the entry script.
+	 * @throws InvalidConfigException if unable to determine the entry script URL
+	 */
+	public function getScriptUrl()
+	{
+		if ($this->_scriptUrl === null) {
+			$scriptFile = $this->getScriptFile();
+			$scriptName = basename($scriptFile);
+			if (basename($_SERVER['SCRIPT_NAME']) === $scriptName) {
+				$this->_scriptUrl = $_SERVER['SCRIPT_NAME'];
+			} elseif (basename($_SERVER['PHP_SELF']) === $scriptName) {
+				$this->_scriptUrl = $_SERVER['PHP_SELF'];
+			} elseif (isset($_SERVER['ORIG_SCRIPT_NAME']) && basename($_SERVER['ORIG_SCRIPT_NAME']) === $scriptName) {
+				$this->_scriptUrl = $_SERVER['ORIG_SCRIPT_NAME'];
+			} elseif (($pos = strpos($_SERVER['PHP_SELF'], '/' . $scriptName)) !== false) {
+				$this->_scriptUrl = substr($_SERVER['SCRIPT_NAME'], 0, $pos) . '/' . $scriptName;
+			} elseif (isset($_SERVER['DOCUMENT_ROOT']) && strpos($scriptFile, $_SERVER['DOCUMENT_ROOT']) === 0) {
+				$this->_scriptUrl = str_replace('\\', '/', str_replace($_SERVER['DOCUMENT_ROOT'], '', $scriptFile));
+			} else {
+				throw new InvalidConfigException('Unable to determine the entry script URL.');
+			}
+		}
+		return $this->_scriptUrl;
+	}
+
+	/**
+	 * Sets the relative URL for the application entry script.
+	 * This setter is provided in case the entry script URL cannot be determined
+	 * on certain Web servers.
+	 * @param string $value the relative URL for the application entry script.
+	 */
+	public function setScriptUrl($value)
+	{
+		$this->_scriptUrl = '/' . trim($value, '/');
+	}
+
+	private $_scriptFile;
+
+	/**
+	 * Returns the entry script file path.
+	 * The default implementation will simply return `$_SERVER['SCRIPT_FILENAME']`.
+	 * @return string the entry script file path
+	 */
+	public function getScriptFile()
+	{
+		return isset($this->_scriptFile) ? $this->_scriptFile : $_SERVER['SCRIPT_FILENAME'];
+	}
+
+	/**
+	 * Sets the entry script file path.
+	 * The entry script file path normally can be obtained from `$_SERVER['SCRIPT_FILENAME']`.
+	 * If your server configuration does not return the correct value, you may configure
+	 * this property to make it right.
+	 * @param string $value the entry script file path.
+	 */
+	public function setScriptFile($value)
+	{
+		$this->_scriptFile = $value;
+	}
+
+	private $_pathInfo;
+
+	/**
+	 * Returns the path info of the currently requested URL.
+	 * A path info refers to the part that is after the entry script and before the question mark (query string).
+	 * The starting and ending slashes are both removed.
+	 * @return string part of the request URL that is after the entry script and before the question mark.
+	 * Note, the returned path info is already URL-decoded.
+	 * @throws InvalidConfigException if the path info cannot be determined due to unexpected server configuration
+	 */
+	public function getPathInfo()
+	{
+		if ($this->_pathInfo === null) {
+			$this->_pathInfo = $this->resolvePathInfo();
+		}
+		return $this->_pathInfo;
+	}
+
+	/**
+	 * Sets the path info of the current request.
+	 * This method is mainly provided for testing purpose.
+	 * @param string $value the path info of the current request
+	 */
+	public function setPathInfo($value)
+	{
+		$this->_pathInfo = trim($value, '/');
+	}
+
+	/**
+	 * Resolves the path info part of the currently requested URL.
+	 * A path info refers to the part that is after the entry script and before the question mark (query string).
+	 * The starting and ending slashes are both removed.
+	 * @return string part of the request URL that is after the entry script and before the question mark.
+	 * Note, the returned path info is decoded.
+	 * @throws InvalidConfigException if the path info cannot be determined due to unexpected server configuration
+	 */
+	protected function resolvePathInfo()
+	{
+		$pathInfo = $this->getUrl();
+
+		if (($pos = strpos($pathInfo, '?')) !== false) {
+			$pathInfo = substr($pathInfo, 0, $pos);
+		}
+
+		$pathInfo = urldecode($pathInfo);
+
+		// try to encode in UTF8 if not so
+		// http://w3.org/International/questions/qa-forms-utf-8.html
+		if (!preg_match('%^(?:
+				[\x09\x0A\x0D\x20-\x7E]              # ASCII
+				| [\xC2-\xDF][\x80-\xBF]             # non-overlong 2-byte
+				| \xE0[\xA0-\xBF][\x80-\xBF]         # excluding overlongs
+				| [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}  # straight 3-byte
+				| \xED[\x80-\x9F][\x80-\xBF]         # excluding surrogates
+				| \xF0[\x90-\xBF][\x80-\xBF]{2}      # planes 1-3
+				| [\xF1-\xF3][\x80-\xBF]{3}          # planes 4-15
+				| \xF4[\x80-\x8F][\x80-\xBF]{2}      # plane 16
+				)*$%xs', $pathInfo)) {
+			$pathInfo = utf8_encode($pathInfo);
+		}
+
+		$scriptUrl = $this->getScriptUrl();
+		$baseUrl = $this->getBaseUrl();
+		if (strpos($pathInfo, $scriptUrl) === 0) {
+			$pathInfo = substr($pathInfo, strlen($scriptUrl));
+		} elseif ($baseUrl === '' || strpos($pathInfo, $baseUrl) === 0) {
+			$pathInfo = substr($pathInfo, strlen($baseUrl));
+		} elseif (strpos($_SERVER['PHP_SELF'], $scriptUrl) === 0) {
+			$pathInfo = substr($_SERVER['PHP_SELF'], strlen($scriptUrl));
+		} else {
+			throw new InvalidConfigException('Unable to determine the path info of the current request.');
+		}
+
+		return trim($pathInfo, '/');
+	}
+
+	/**
+	 * Returns the currently requested absolute URL.
+	 * This is a shortcut to the concatenation of [[hostInfo]] and [[url]].
+	 * @return string the currently requested absolute URL.
+	 */
+	public function getAbsoluteUrl()
+	{
+		return $this->getHostInfo() . $this->getUrl();
+	}
+
+	private $_url;
+
+	/**
+	 * Returns the currently requested relative URL.
+	 * This refers to the portion of the URL that is after the [[hostInfo]] part.
+	 * It includes the [[queryString]] part if any.
+	 * @return string the currently requested relative URL. Note that the URI returned is URL-encoded.
+	 * @throws InvalidConfigException if the URL cannot be determined due to unusual server configuration
+	 */
+	public function getUrl()
+	{
+		if ($this->_url === null) {
+			$this->_url = $this->resolveRequestUri();
+		}
+		return $this->_url;
+	}
+
+	/**
+	 * Sets the currently requested relative URL.
+	 * The URI must refer to the portion that is after [[hostInfo]].
+	 * Note that the URI should be URL-encoded.
+	 * @param string $value the request URI to be set
+	 */
+	public function setUrl($value)
+	{
+		$this->_url = $value;
+	}
+
+	/**
+	 * Resolves the request URI portion for the currently requested URL.
+	 * This refers to the portion that is after the [[hostInfo]] part. It includes the [[queryString]] part if any.
+	 * The implementation of this method referenced Zend_Controller_Request_Http in Zend Framework.
+	 * @return string|boolean the request URI portion for the currently requested URL.
+	 * Note that the URI returned is URL-encoded.
+	 * @throws InvalidConfigException if the request URI cannot be determined due to unusual server configuration
+	 */
+	protected function resolveRequestUri()
+	{
+		if (isset($_SERVER['HTTP_X_REWRITE_URL'])) { // IIS
+			$requestUri = $_SERVER['HTTP_X_REWRITE_URL'];
+		} elseif (isset($_SERVER['REQUEST_URI'])) {
+			$requestUri = $_SERVER['REQUEST_URI'];
+			if ($requestUri !== '' && $requestUri[0] !== '/') {
+				$requestUri = preg_replace('/^(http|https):\/\/[^\/]+/i', '', $requestUri);
+			}
+		} elseif (isset($_SERVER['ORIG_PATH_INFO'])) { // IIS 5.0 CGI
+			$requestUri = $_SERVER['ORIG_PATH_INFO'];
+			if (!empty($_SERVER['QUERY_STRING'])) {
+				$requestUri .= '?' . $_SERVER['QUERY_STRING'];
+			}
+		} else {
+			throw new InvalidConfigException('Unable to determine the request URI.');
+		}
+		return $requestUri;
+	}
+
+	/**
+	 * Returns part of the request URL that is after the question mark.
+	 * @return string part of the request URL that is after the question mark
+	 */
+	public function getQueryString()
+	{
+		return isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '';
+	}
+
+	/**
+	 * Return if the request is sent via secure channel (https).
+	 * @return boolean if the request is sent via secure channel (https)
+	 */
+	public function getIsSecureConnection()
+	{
+		return !empty($_SERVER['HTTPS']) && strcasecmp($_SERVER['HTTPS'], 'off');
+	}
+
+	/**
+	 * Returns the server name.
+	 * @return string server name
+	 */
+	public function getServerName()
+	{
+		return $_SERVER['SERVER_NAME'];
+	}
+
+	/**
+	 * Returns the server port number.
+	 * @return integer server port number
+	 */
+	public function getServerPort()
+	{
+		return (int)$_SERVER['SERVER_PORT'];
+	}
+
+	/**
+	 * Returns the URL referrer, null if not present
+	 * @return string URL referrer, null if not present
+	 */
+	public function getReferrer()
+	{
+		return isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : null;
+	}
+
+	/**
+	 * Returns the user agent, null if not present.
+	 * @return string user agent, null if not present
+	 */
+	public function getUserAgent()
+	{
+		return isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : null;
+	}
+
+	/**
+	 * Returns the user IP address.
+	 * @return string user IP address
+	 */
+	public function getUserIP()
+	{
+		return isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '127.0.0.1';
+	}
+
+	/**
+	 * Returns the user host name, null if it cannot be determined.
+	 * @return string user host name, null if cannot be determined
+	 */
+	public function getUserHost()
+	{
+		return isset($_SERVER['REMOTE_HOST']) ? $_SERVER['REMOTE_HOST'] : null;
+	}
+
+	/**
+	 * Returns user browser accept types, null if not present.
+	 * @return string user browser accept types, null if not present
+	 */
+	public function getAcceptTypes()
+	{
+		return isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null;
+	}
+
+	private $_port;
+
+	/**
+	 * Returns the port to use for insecure requests.
+	 * Defaults to 80, or the port specified by the server if the current
+	 * request is insecure.
+	 * @return integer port number for insecure requests.
+	 * @see setPort
+	 */
+	public function getPort()
+	{
+		if ($this->_port === null) {
+			$this->_port = !$this->getIsSecureConnection() && isset($_SERVER['SERVER_PORT']) ? (int)$_SERVER['SERVER_PORT'] : 80;
+		}
+		return $this->_port;
+	}
+
+	/**
+	 * Sets the port to use for insecure requests.
+	 * This setter is provided in case a custom port is necessary for certain
+	 * server configurations.
+	 * @param integer $value port number.
+	 */
+	public function setPort($value)
+	{
+		if ($value != $this->_port) {
+			$this->_port = (int)$value;
+			$this->_hostInfo = null;
+		}
+	}
+
+	private $_securePort;
+
+	/**
+	 * Returns the port to use for secure requests.
+	 * Defaults to 443, or the port specified by the server if the current
+	 * request is secure.
+	 * @return integer port number for secure requests.
+	 * @see setSecurePort
+	 */
+	public function getSecurePort()
+	{
+		if ($this->_securePort === null) {
+			$this->_securePort = $this->getIsSecureConnection() && isset($_SERVER['SERVER_PORT']) ? (int)$_SERVER['SERVER_PORT'] : 443;
+		}
+		return $this->_securePort;
+	}
+
+	/**
+	 * Sets the port to use for secure requests.
+	 * This setter is provided in case a custom port is necessary for certain
+	 * server configurations.
+	 * @param integer $value port number.
+	 */
+	public function setSecurePort($value)
+	{
+		if ($value != $this->_securePort) {
+			$this->_securePort = (int)$value;
+			$this->_hostInfo = null;
+		}
+	}
+
+	private $_preferredLanguages;
+
+	/**
+	 * Returns the user preferred languages.
+	 * The languages returned are ordered by user's preference, starting with the language that the user
+	 * prefers the most.
+	 * @return string the user preferred languages. An empty array may be returned if the user has no preference.
+	 */
+	public function getPreferredLanguages()
+	{
+		if ($this->_preferredLanguages === null) {
+			if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) && ($n = preg_match_all('/([\w\-_]+)\s*(;\s*q\s*=\s*(\d*\.\d*))?/', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $matches)) > 0) {
+				$languages = array();
+				for ($i = 0; $i < $n; ++$i) {
+					$languages[$matches[1][$i]] = empty($matches[3][$i]) ? 1.0 : floatval($matches[3][$i]);
+				}
+				arsort($languages);
+				$this->_preferredLanguages = array_keys($languages);
+			} else {
+				$this->_preferredLanguages = array();
+			}
+		}
+		return $this->_preferredLanguages;
+	}
+
+	/**
+	 * Returns the language most preferred by the user.
+	 * @return string|boolean the language most preferred by the user. If the user has no preference, false
+	 * will be returned.
+	 */
+	public function getPreferredLanguage()
+	{
+		$languages = $this->getPreferredLanguages();
+		return isset($languages[0]) ? $languages[0] : false;
+	}
+
+	/**
+	 * Returns the cookie collection.
+	 * Through the returned cookie collection, you may access a cookie using the following syntax:
+	 *
+	 * ~~~
+	 * $cookie = $request->cookies['name']
+	 * if ($cookie !== null) {
+	 *     $value = $cookie->value;
+	 * }
+	 *
+	 * // alternatively
+	 * $value = $request->cookies->getValue('name');
+	 * ~~~
+	 *
+	 * @return CookieCollection the cookie collection.
+	 */
+	public function getCookies()
+	{
+		if ($this->_cookies === null) {
+			$this->_cookies = new CookieCollection(array(
+				'enableValidation' => $this->enableCookieValidation,
+				'validationKey' => $this->cookieValidationKey,
+			));
+		}
+		return $this->_cookies;
+	}
+
+	private $_csrfToken;
+
+	/**
+	 * Returns the random token used to perform CSRF validation.
+	 * The token will be read from cookie first. If not found, a new token will be generated.
+	 * @return string the random token for CSRF validation.
+	 * @see enableCsrfValidation
+	 */
+	public function getCsrfToken()
+	{
+		if ($this->_csrfToken === null) {
+			$cookies = $this->getCookies();
+			if (($this->_csrfToken = $cookies->getValue($this->csrfTokenName)) === null) {
+				$cookie = $this->createCsrfCookie();
+				$this->_csrfToken = $cookie->value;
+				$cookies->add($cookie);
+			}
+		}
+
+		return $this->_csrfToken;
+	}
+
+	/**
+	 * Creates a cookie with a randomly generated CSRF token.
+	 * Initial values specified in [[csrfCookie]] will be applied to the generated cookie.
+	 * @return Cookie the generated cookie
+	 * @see enableCsrfValidation
+	 */
+	protected function createCsrfCookie()
+	{
+		$options = $this->csrfCookie;
+		$options['name'] = $this->csrfTokenName;
+		$options['value'] = sha1(uniqid(mt_rand(), true));
+		return new Cookie($options);
+	}
+
+	/**
+	 * Performs the CSRF validation.
+	 * The method will compare the CSRF token obtained from a cookie and from a POST field.
+	 * If they are different, a CSRF attack is detected and a 400 HTTP exception will be raised.
+	 * @throws HttpException if the validation fails
+	 */
+	public function validateCsrfToken()
+	{
+		if (!$this->enableCsrfValidation) {
+			return;
+		}
+		$method = $this->getRequestMethod();
+		if ($method === 'POST' || $method === 'PUT' || $method === 'DELETE') {
+			$cookies = $this->getCookies();
+			switch ($method) {
+				case 'POST':
+					$token = $this->getPost($this->csrfTokenName);
+					break;
+				case 'PUT':
+					$token = $this->getPut($this->csrfTokenName);
+					break;
+				case 'DELETE':
+					$token = $this->getDelete($this->csrfTokenName);
+			}
+
+			if (empty($token) || $cookies->getValue($this->csrfTokenName) !== $token) {
+				throw new HttpException(400, Yii::t('yii|Unable to verify your data submission.'));
+			}
+		}
+	}
+}
+
diff --git a/yii/web/Response.php b/yii/web/Response.php
new file mode 100644
index 0000000..0503755
--- /dev/null
+++ b/yii/web/Response.php
@@ -0,0 +1,235 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use Yii;
+use yii\helpers\FileHelper;
+use yii\helpers\Html;
+
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Response extends \yii\base\Response
+{
+	/**
+	 * @var integer the HTTP status code that should be used when redirecting in AJAX mode.
+	 * This is used by [[redirect()]]. A 2xx code should normally be used for this purpose
+	 * so that the AJAX handler will treat the response as a success.
+	 * @see redirect
+	 */
+	public $ajaxRedirectCode = 278;
+
+	/**
+	 * Sends a file to user.
+	 * @param string $fileName file name
+	 * @param string $content content to be set.
+	 * @param string $mimeType mime type of the content. If null, it will be guessed automatically based on the given file name.
+	 * @param boolean $terminate whether to terminate the current application after calling this method
+	 * @todo
+	 */
+	public function sendFile($fileName, $content, $mimeType = null, $terminate = true)
+	{
+		if ($mimeType === null && ($mimeType = FileHelper::getMimeType($fileName)) === null) {
+			$mimeType = 'application/octet-stream';
+		}
+		header('Pragma: public');
+		header('Expires: 0');
+		header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+		header("Content-type: $mimeType");
+		if (ob_get_length() === false) {
+			header('Content-Length: ' . (function_exists('mb_strlen') ? mb_strlen($content, '8bit') : strlen($content)));
+		}
+		header("Content-Disposition: attachment; filename=\"$fileName\"");
+		header('Content-Transfer-Encoding: binary');
+
+		if ($terminate) {
+			// clean up the application first because the file downloading could take long time
+			// which may cause timeout of some resources (such as DB connection)
+			Yii::app()->end(0, false);
+			echo $content;
+			exit(0);
+		} else {
+			echo $content;
+		}
+	}
+
+	/**
+	 * Sends existing file to a browser as a download using x-sendfile.
+	 *
+	 * X-Sendfile is a feature allowing a web application to redirect the request for a file to the webserver
+	 * that in turn processes the request, this way eliminating the need to perform tasks like reading the file
+	 * and sending it to the user. When dealing with a lot of files (or very big files) this can lead to a great
+	 * increase in performance as the web application is allowed to terminate earlier while the webserver is
+	 * handling the request.
+	 *
+	 * The request is sent to the server through a special non-standard HTTP-header.
+	 * When the web server encounters the presence of such header it will discard all output and send the file
+	 * specified by that header using web server internals including all optimizations like caching-headers.
+	 *
+	 * As this header directive is non-standard different directives exists for different web servers applications:
+	 * <ul>
+	 * <li>Apache: {@link http://tn123.org/mod_xsendfile X-Sendfile}</li>
+	 * <li>Lighttpd v1.4: {@link http://redmine.lighttpd.net/projects/lighttpd/wiki/X-LIGHTTPD-send-file X-LIGHTTPD-send-file}</li>
+	 * <li>Lighttpd v1.5: {@link http://redmine.lighttpd.net/projects/lighttpd/wiki/X-LIGHTTPD-send-file X-Sendfile}</li>
+	 * <li>Nginx: {@link http://wiki.nginx.org/XSendfile X-Accel-Redirect}</li>
+	 * <li>Cherokee: {@link http://www.cherokee-project.com/doc/other_goodies.html#x-sendfile X-Sendfile and X-Accel-Redirect}</li>
+	 * </ul>
+	 * So for this method to work the X-SENDFILE option/module should be enabled by the web server and
+	 * a proper xHeader should be sent.
+	 *
+	 * <b>Note:</b>
+	 * This option allows to download files that are not under web folders, and even files that are otherwise protected (deny from all) like .htaccess
+	 *
+	 * <b>Side effects</b>:
+	 * If this option is disabled by the web server, when this method is called a download configuration dialog
+	 * will open but the downloaded file will have 0 bytes.
+	 *
+	 * <b>Known issues</b>:
+	 * There is a Bug with Internet Explorer 6, 7 and 8 when X-SENDFILE is used over an SSL connection, it will show
+	 * an error message like this: "Internet Explorer was not able to open this Internet site. The requested site is either unavailable or cannot be found.".
+	 * You can work around this problem by removing the <code>Pragma</code>-header.
+	 *
+	 * <b>Example</b>:
+	 * <pre>
+	 * <?php
+	 *    Yii::app()->request->xSendFile('/home/user/Pictures/picture1.jpg',array(
+	 *        'saveName'=>'image1.jpg',
+	 *        'mimeType'=>'image/jpeg',
+	 *        'terminate'=>false,
+	 *    ));
+	 * ?>
+	 * </pre>
+	 * @param string $filePath file name with full path
+	 * @param array $options additional options:
+	 * <ul>
+	 * <li>saveName: file name shown to the user, if not set real file name will be used</li>
+	 * <li>mimeType: mime type of the file, if not set it will be guessed automatically based on the file name, if set to null no content-type header will be sent.</li>
+	 * <li>xHeader: appropriate x-sendfile header, defaults to "X-Sendfile"</li>
+	 * <li>terminate: whether to terminate the current application after calling this method, defaults to true</li>
+	 * <li>forceDownload: specifies whether the file will be downloaded or shown inline, defaults to true</li>
+	 * <li>addHeaders: an array of additional http headers in header-value pairs</li>
+	 * </ul>
+	 * @todo
+	 */
+	public function xSendFile($filePath, $options = array())
+	{
+		if (!isset($options['forceDownload']) || $options['forceDownload']) {
+			$disposition = 'attachment';
+		} else {
+			$disposition = 'inline';
+		}
+
+		if (!isset($options['saveName'])) {
+			$options['saveName'] = basename($filePath);
+		}
+
+		if (!isset($options['mimeType'])) {
+			if (($options['mimeType'] = CFileHelper::getMimeTypeByExtension($filePath)) === null) {
+				$options['mimeType'] = 'text/plain';
+			}
+		}
+
+		if (!isset($options['xHeader'])) {
+			$options['xHeader'] = 'X-Sendfile';
+		}
+
+		if ($options['mimeType'] !== null) {
+			header('Content-type: ' . $options['mimeType']);
+		}
+		header('Content-Disposition: ' . $disposition . '; filename="' . $options['saveName'] . '"');
+		if (isset($options['addHeaders'])) {
+			foreach ($options['addHeaders'] as $header => $value) {
+				header($header . ': ' . $value);
+			}
+		}
+		header(trim($options['xHeader']) . ': ' . $filePath);
+
+		if (!isset($options['terminate']) || $options['terminate']) {
+			Yii::$app->end();
+		}
+	}
+
+	/**
+	 * Redirects the browser to the specified URL.
+	 * This method will send out a "Location" header to achieve the redirection.
+	 * In AJAX mode, this normally will not work as expected unless there are some
+	 * client-side JavaScript code handling the redirection. To help achieve this goal,
+	 * this method will use [[ajaxRedirectCode]] as the HTTP status code when performing
+	 * redirection in AJAX mode. The following JavaScript code may be used on the client
+	 * side to handle the redirection response:
+	 *
+	 * ~~~
+	 * $(document).ajaxSuccess(function(event, xhr, settings) {
+	 *     if (xhr.status == 278) {
+	 *         window.location = xhr.getResponseHeader('Location');
+	 *     }
+	 * });
+	 * ~~~
+	 *
+	 * @param array|string $url the URL to be redirected to. [[\yii\helpers\Html::url()]]
+	 * will be used to normalize the URL. If the resulting URL is still a relative URL
+	 * (one without host info), the current request host info will be used.
+	 * @param boolean $terminate whether to terminate the current application
+	 * @param integer $statusCode the HTTP status code. Defaults to 302.
+	 * See [[http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html]]
+	 * for details about HTTP status code.
+	 * Note that if the request is an AJAX request, [[ajaxRedirectCode]] will be used instead.
+	 */
+	public function redirect($url, $terminate = true, $statusCode = 302)
+	{
+		$url = Html::url($url);
+		if (strpos($url, '/') === 0 && strpos($url, '//') !== 0) {
+			$url = Yii::$app->getRequest()->getHostInfo() . $url;
+		}
+		if (Yii::$app->getRequest()->getIsAjaxRequest()) {
+			$statusCode = $this->ajaxRedirectCode;
+		}
+		header('Location: ' . $url, true, $statusCode);
+		if ($terminate) {
+			Yii::$app->end();
+		}
+	}
+
+	/**
+	 * Refreshes the current page.
+	 * The effect of this method call is the same as the user pressing the refresh button of his browser
+	 * (without re-posting data).
+	 * @param boolean $terminate whether to terminate the current application after calling this method
+	 * @param string $anchor the anchor that should be appended to the redirection URL.
+	 * Defaults to empty. Make sure the anchor starts with '#' if you want to specify it.
+	 */
+	public function refresh($terminate = true, $anchor = '')
+	{
+		$this->redirect(Yii::$app->getRequest()->getUrl() . $anchor, $terminate);
+	}
+
+	/**
+	 * Returns the cookie collection.
+	 * Through the returned cookie collection, you add or remove cookies as follows,
+	 *
+	 * ~~~
+	 * // add a cookie
+	 * $response->cookies->add(new Cookie(array(
+	 *     'name' => $name,
+	 *     'value' => $value,
+	 * ));
+	 *
+	 * // remove a cookie
+	 * $response->cookies->remove('name');
+	 * // alternatively
+	 * unset($response->cookies['name']);
+	 * ~~~
+	 *
+	 * @return CookieCollection the cookie collection.
+	 */
+	public function getCookies()
+	{
+		return Yii::$app->getRequest()->getCookies();
+	}
+}
diff --git a/yii/web/Session.php b/yii/web/Session.php
new file mode 100644
index 0000000..1b48433
--- /dev/null
+++ b/yii/web/Session.php
@@ -0,0 +1,678 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use Yii;
+use yii\base\Component;
+use yii\base\InvalidParamException;
+
+/**
+ * Session provides session data management and the related configurations.
+ *
+ * Session is a Web application component that can be accessed via `Yii::$app->session`.
+
+ * To start the session, call [[open()]]; To complete and send out session data, call [[close()]];
+ * To destroy the session, call [[destroy()]].
+ *
+ * By default, [[autoStart]] is true which means the session will be started automatically
+ * when the session component is accessed the first time.
+ *
+ * Session can be used like an array to set and get session data. For example,
+ *
+ * ~~~
+ * $session = new Session;
+ * $session->open();
+ * $value1 = $session['name1'];  // get session variable 'name1'
+ * $value2 = $session['name2'];  // get session variable 'name2'
+ * foreach ($session as $name => $value) // traverse all session variables
+ * $session['name3'] = $value3;  // set session variable 'name3'
+ * ~~~
+ *
+ * Session can be extended to support customized session storage.
+ * To do so, override [[useCustomStorage()]] so that it returns true, and
+ * override these methods with the actual logic about using custom storage:
+ * [[openSession()]], [[closeSession()]], [[readSession()]], [[writeSession()]],
+ * [[destroySession()]] and [[gcSession()]].
+ *
+ * Session also supports a special type of session data, called *flash messages*.
+ * A flash message is available only in the current request and the next request.
+ * After that, it will be deleted automatically. Flash messages are particularly
+ * useful for displaying confirmation messages. To use flash messages, simply
+ * call methods such as [[setFlash()]], [[getFlash()]].
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Session extends Component implements \IteratorAggregate, \ArrayAccess, \Countable
+{
+	/**
+	 * @var boolean whether the session should be automatically started when the session component is initialized.
+	 */
+	public $autoStart = true;
+	/**
+	 * @var string the name of the session variable that stores the flash message data.
+	 */
+	public $flashVar = '__flash';
+
+	/**
+	 * @var array parameter-value pairs to override default session cookie parameters
+	 */
+	public $cookieParams = array(
+		'httponly' => true
+	);
+
+	/**
+	 * Initializes the application component.
+	 * This method is required by IApplicationComponent and is invoked by application.
+	 */
+	public function init()
+	{
+		parent::init();
+		if ($this->autoStart) {
+			$this->open();
+		}
+		register_shutdown_function(array($this, 'close'));
+	}
+
+	/**
+	 * Returns a value indicating whether to use custom session storage.
+	 * This method should be overridden to return true by child classes that implement custom session storage.
+	 * To implement custom session storage, override these methods: [[openSession()]], [[closeSession()]],
+	 * [[readSession()]], [[writeSession()]], [[destroySession()]] and [[gcSession()]].
+	 * @return boolean whether to use custom storage.
+	 */
+	public function getUseCustomStorage()
+	{
+		return false;
+	}
+
+	private $_opened = false;
+
+	/**
+	 * Starts the session.
+	 */
+	public function open()
+	{
+		// this is available in PHP 5.4.0+
+		if (function_exists('session_status')) {
+			if (session_status() == PHP_SESSION_ACTIVE) {
+				$this->_opened = true;
+				return;
+			}
+		}
+
+		if (!$this->_opened) {
+			if ($this->getUseCustomStorage()) {
+				@session_set_save_handler(
+					array($this, 'openSession'),
+					array($this, 'closeSession'),
+					array($this, 'readSession'),
+					array($this, 'writeSession'),
+					array($this, 'destroySession'),
+					array($this, 'gcSession')
+				);
+			}
+
+			$this->setCookieParams($this->cookieParams);
+
+			@session_start();
+
+			if (session_id() == '') {
+				$this->_opened = false;
+				$error = error_get_last();
+				$message = isset($error['message']) ? $error['message'] : 'Failed to start session.';
+				Yii::error($message, __METHOD__);
+			} else {
+				$this->_opened = true;
+				$this->updateFlashCounters();
+			}
+		}
+	}
+
+	/**
+	 * Ends the current session and store session data.
+	 */
+	public function close()
+	{
+		$this->_opened = false;
+		if (session_id() !== '') {
+			@session_write_close();
+		}
+	}
+
+	/**
+	 * Frees all session variables and destroys all data registered to a session.
+	 */
+	public function destroy()
+	{
+		if (session_id() !== '') {
+			@session_unset();
+			@session_destroy();
+		}
+	}
+
+	/**
+	 * @return boolean whether the session has started
+	 */
+	public function getIsActive()
+	{
+		if (function_exists('session_status')) {
+			// available in PHP 5.4.0+
+			return session_status() == PHP_SESSION_ACTIVE;
+		} else {
+			// this is not very reliable
+			return $this->_opened && session_id() !== '';
+		}
+	}
+
+	/**
+	 * @return string the current session ID
+	 */
+	public function getId()
+	{
+		return session_id();
+	}
+
+	/**
+	 * @param string $value the session ID for the current session
+	 */
+	public function setId($value)
+	{
+		session_id($value);
+	}
+
+	/**
+	 * Updates the current session ID with a newly generated one .
+	 * Please refer to [[http://php.net/session_regenerate_id]] for more details.
+	 * @param boolean $deleteOldSession Whether to delete the old associated session file or not.
+	 */
+	public function regenerateID($deleteOldSession = false)
+	{
+		session_regenerate_id($deleteOldSession);
+	}
+
+	/**
+	 * @return string the current session name
+	 */
+	public function getName()
+	{
+		return session_name();
+	}
+
+	/**
+	 * @param string $value the session name for the current session, must be an alphanumeric string.
+	 * It defaults to "PHPSESSID".
+	 */
+	public function setName($value)
+	{
+		session_name($value);
+	}
+
+	/**
+	 * @return string the current session save path, defaults to '/tmp'.
+	 */
+	public function getSavePath()
+	{
+		return session_save_path();
+	}
+
+	/**
+	 * @param string $value the current session save path. This can be either a directory name or a path alias.
+	 * @throws InvalidParamException if the path is not a valid directory
+	 */
+	public function setSavePath($value)
+	{
+		$path = Yii::getAlias($value);
+		if (is_dir($path)) {
+			session_save_path($path);
+		} else {
+			throw new InvalidParamException("Session save path is not a valid directory: $value");
+		}
+	}
+
+	/**
+	 * @return array the session cookie parameters.
+	 * @see http://us2.php.net/manual/en/function.session-get-cookie-params.php
+	 */
+	public function getCookieParams()
+	{
+		return session_get_cookie_params();
+	}
+
+	/**
+	 * Sets the session cookie parameters.
+	 * The effect of this method only lasts for the duration of the script.
+	 * Call this method before the session starts.
+	 * @param array $value cookie parameters, valid keys include: lifetime, path, domain, secure and httponly.
+	 * @throws InvalidParamException if the parameters are incomplete.
+	 * @see http://us2.php.net/manual/en/function.session-set-cookie-params.php
+	 */
+	public function setCookieParams($value)
+	{
+		$data = session_get_cookie_params();
+		extract($data);
+		extract($value);
+		if (isset($lifetime, $path, $domain, $secure, $httponly)) {
+			session_set_cookie_params($lifetime, $path, $domain, $secure, $httponly);
+		} else {
+			throw new InvalidParamException('Please make sure these parameters are provided: lifetime, path, domain, secure and httponly.');
+		}
+	}
+
+	/**
+	 * Returns the value indicating whether cookies should be used to store session IDs.
+	 * @return boolean|null the value indicating whether cookies should be used to store session IDs.
+	 * @see setUseCookies()
+	 */
+	public function getUseCookies()
+	{
+		if (ini_get('session.use_cookies') === '0') {
+			return false;
+		} elseif (ini_get('session.use_only_cookies') === '1') {
+			return true;
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * Sets the value indicating whether cookies should be used to store session IDs.
+	 * Three states are possible:
+	 *
+	 * - true: cookies and only cookies will be used to store session IDs.
+	 * - false: cookies will not be used to store session IDs.
+	 * - null: if possible, cookies will be used to store session IDs; if not, other mechanisms will be used (e.g. GET parameter)
+	 *
+	 * @param boolean|null $value the value indicating whether cookies should be used to store session IDs.
+	 */
+	public function setUseCookies($value)
+	{
+		if ($value === false) {
+			ini_set('session.use_cookies', '0');
+			ini_set('session.use_only_cookies', '0');
+		} elseif ($value === true) {
+			ini_set('session.use_cookies', '1');
+			ini_set('session.use_only_cookies', '1');
+		} else {
+			ini_set('session.use_cookies', '1');
+			ini_set('session.use_only_cookies', '0');
+		}
+	}
+
+	/**
+	 * @return float the probability (percentage) that the GC (garbage collection) process is started on every session initialization, defaults to 1 meaning 1% chance.
+	 */
+	public function getGCProbability()
+	{
+		return (float)(ini_get('session.gc_probability') / ini_get('session.gc_divisor') * 100);
+	}
+
+	/**
+	 * @param float $value the probability (percentage) that the GC (garbage collection) process is started on every session initialization.
+	 * @throws InvalidParamException if the value is not between 0 and 100.
+	 */
+	public function setGCProbability($value)
+	{
+		if ($value >= 0 && $value <= 100) {
+			// percent * 21474837 / 2147483647 ≈ percent * 0.01
+			ini_set('session.gc_probability', floor($value * 21474836.47));
+			ini_set('session.gc_divisor', 2147483647);
+		} else {
+			throw new InvalidParamException('GCProbability must be a value between 0 and 100.');
+		}
+	}
+
+	/**
+	 * @return boolean whether transparent sid support is enabled or not, defaults to false.
+	 */
+	public function getUseTransparentSessionID()
+	{
+		return ini_get('session.use_trans_sid') == 1;
+	}
+
+	/**
+	 * @param boolean $value whether transparent sid support is enabled or not.
+	 */
+	public function setUseTransparentSessionID($value)
+	{
+		ini_set('session.use_trans_sid', $value ? '1' : '0');
+	}
+
+	/**
+	 * @return integer the number of seconds after which data will be seen as 'garbage' and cleaned up.
+	 * The default value is 1440 seconds (or the value of "session.gc_maxlifetime" set in php.ini).
+	 */
+	public function getTimeout()
+	{
+		return (int)ini_get('session.gc_maxlifetime');
+	}
+
+	/**
+	 * @param integer $value the number of seconds after which data will be seen as 'garbage' and cleaned up
+	 */
+	public function setTimeout($value)
+	{
+		ini_set('session.gc_maxlifetime', $value);
+	}
+
+	/**
+	 * Session open handler.
+	 * This method should be overridden if [[useCustomStorage()]] returns true.
+	 * Do not call this method directly.
+	 * @param string $savePath session save path
+	 * @param string $sessionName session name
+	 * @return boolean whether session is opened successfully
+	 */
+	public function openSession($savePath, $sessionName)
+	{
+		return true;
+	}
+
+	/**
+	 * Session close handler.
+	 * This method should be overridden if [[useCustomStorage()]] returns true.
+	 * Do not call this method directly.
+	 * @return boolean whether session is closed successfully
+	 */
+	public function closeSession()
+	{
+		return true;
+	}
+
+	/**
+	 * Session read handler.
+	 * This method should be overridden if [[useCustomStorage()]] returns true.
+	 * Do not call this method directly.
+	 * @param string $id session ID
+	 * @return string the session data
+	 */
+	public function readSession($id)
+	{
+		return '';
+	}
+
+	/**
+	 * Session write handler.
+	 * This method should be overridden if [[useCustomStorage()]] returns true.
+	 * Do not call this method directly.
+	 * @param string $id session ID
+	 * @param string $data session data
+	 * @return boolean whether session write is successful
+	 */
+	public function writeSession($id, $data)
+	{
+		return true;
+	}
+
+	/**
+	 * Session destroy handler.
+	 * This method should be overridden if [[useCustomStorage()]] returns true.
+	 * Do not call this method directly.
+	 * @param string $id session ID
+	 * @return boolean whether session is destroyed successfully
+	 */
+	public function destroySession($id)
+	{
+		return true;
+	}
+
+	/**
+	 * Session GC (garbage collection) handler.
+	 * This method should be overridden if [[useCustomStorage()]] returns true.
+	 * Do not call this method directly.
+	 * @param integer $maxLifetime the number of seconds after which data will be seen as 'garbage' and cleaned up.
+	 * @return boolean whether session is GCed successfully
+	 */
+	public function gcSession($maxLifetime)
+	{
+		return true;
+	}
+
+	/**
+	 * Returns an iterator for traversing the session variables.
+	 * This method is required by the interface IteratorAggregate.
+	 * @return SessionIterator an iterator for traversing the session variables.
+	 */
+	public function getIterator()
+	{
+		return new SessionIterator;
+	}
+
+	/**
+	 * Returns the number of items in the session.
+	 * @return integer the number of session variables
+	 */
+	public function getCount()
+	{
+		return count($_SESSION);
+	}
+
+	/**
+	 * Returns the number of items in the session.
+	 * This method is required by Countable interface.
+	 * @return integer number of items in the session.
+	 */
+	public function count()
+	{
+		return $this->getCount();
+	}
+
+	/**
+	 * Returns the session variable value with the session variable name.
+	 * If the session variable does not exist, the `$defaultValue` will be returned.
+	 * @param string $key the session variable name
+	 * @param mixed $defaultValue the default value to be returned when the session variable does not exist.
+	 * @return mixed the session variable value, or $defaultValue if the session variable does not exist.
+	 */
+	public function get($key, $defaultValue = null)
+	{
+		return isset($_SESSION[$key]) ? $_SESSION[$key] : $defaultValue;
+	}
+
+	/**
+	 * Adds a session variable.
+	 * If the specified name already exists, the old value will be overwritten.
+	 * @param string $key session variable name
+	 * @param mixed $value session variable value
+	 */
+	public function set($key, $value)
+	{
+		$_SESSION[$key] = $value;
+	}
+
+	/**
+	 * Removes a session variable.
+	 * @param string $key the name of the session variable to be removed
+	 * @return mixed the removed value, null if no such session variable.
+	 */
+	public function remove($key)
+	{
+		if (isset($_SESSION[$key])) {
+			$value = $_SESSION[$key];
+			unset($_SESSION[$key]);
+			return $value;
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * Removes all session variables
+	 */
+	public function removeAll()
+	{
+		foreach (array_keys($_SESSION) as $key) {
+			unset($_SESSION[$key]);
+		}
+	}
+
+	/**
+	 * @param mixed $key session variable name
+	 * @return boolean whether there is the named session variable
+	 */
+	public function has($key)
+	{
+		return isset($_SESSION[$key]);
+	}
+
+	/**
+	 * @return array the list of all session variables in array
+	 */
+	public function toArray()
+	{
+		return $_SESSION;
+	}
+
+	/**
+	 * Updates the counters for flash messages and removes outdated flash messages.
+	 * This method should only be called once in [[init()]].
+	 */
+	protected function updateFlashCounters()
+	{
+		$counters = $this->get($this->flashVar, array());
+		if (is_array($counters)) {
+			foreach ($counters as $key => $count) {
+				if ($count) {
+					unset($counters[$key], $_SESSION[$key]);
+				} else {
+					$counters[$key]++;
+				}
+			}
+			$_SESSION[$this->flashVar] = $counters;
+		} else {
+			// fix the unexpected problem that flashVar doesn't return an array
+			unset($_SESSION[$this->flashVar]);
+		}
+	}
+
+	/**
+	 * Returns a flash message.
+	 * A flash message is available only in the current request and the next request.
+	 * @param string $key the key identifying the flash message
+	 * @param mixed $defaultValue value to be returned if the flash message does not exist.
+	 * @return mixed the flash message
+	 */
+	public function getFlash($key, $defaultValue = null)
+	{
+		$counters = $this->get($this->flashVar, array());
+		return isset($counters[$key]) ? $this->get($key, $defaultValue) : $defaultValue;
+	}
+
+	/**
+	 * Returns all flash messages.
+	 * @return array flash messages (key => message).
+	 */
+	public function getAllFlashes()
+	{
+		$counters = $this->get($this->flashVar, array());
+		$flashes = array();
+		foreach (array_keys($counters) as $key) {
+			if (isset($_SESSION[$key])) {
+				$flashes[$key] = $_SESSION[$key];
+			}
+		}
+		return $flashes;
+	}
+
+	/**
+	 * Stores a flash message.
+	 * A flash message is available only in the current request and the next request.
+	 * @param string $key the key identifying the flash message. Note that flash messages
+	 * and normal session variables share the same name space. If you have a normal
+	 * session variable using the same name, its value will be overwritten by this method.
+	 * @param mixed $value flash message
+	 */
+	public function setFlash($key, $value = true)
+	{
+		$counters = $this->get($this->flashVar, array());
+		$counters[$key] = 0;
+		$_SESSION[$key] = $value;
+		$_SESSION[$this->flashVar] = $counters;
+	}
+
+	/**
+	 * Removes a flash message.
+	 * Note that flash messages will be automatically removed after the next request.
+	 * @param string $key the key identifying the flash message. Note that flash messages
+	 * and normal session variables share the same name space.  If you have a normal
+	 * session variable using the same name, it will be removed by this method.
+	 * @return mixed the removed flash message. Null if the flash message does not exist.
+	 */
+	public function removeFlash($key)
+	{
+		$counters = $this->get($this->flashVar, array());
+		$value = isset($_SESSION[$key], $counters[$key]) ? $_SESSION[$key] : null;
+		unset($counters[$key], $_SESSION[$key]);
+		$_SESSION[$this->flashVar] = $counters;
+		return $value;
+	}
+
+	/**
+	 * Removes all flash messages.
+	 * Note that flash messages and normal session variables share the same name space.
+	 * If you have a normal session variable using the same name, it will be removed
+	 * by this method.
+	 */
+	public function removeAllFlashes()
+	{
+		$counters = $this->get($this->flashVar, array());
+		foreach (array_keys($counters) as $key) {
+			unset($_SESSION[$key]);
+		}
+		unset($_SESSION[$this->flashVar]);
+	}
+
+	/**
+	 * Returns a value indicating whether there is a flash message associated with the specified key.
+	 * @param string $key key identifying the flash message
+	 * @return boolean whether the specified flash message exists
+	 */
+	public function hasFlash($key)
+	{
+		return $this->getFlash($key) !== null;
+	}
+
+	/**
+	 * This method is required by the interface ArrayAccess.
+	 * @param mixed $offset the offset to check on
+	 * @return boolean
+	 */
+	public function offsetExists($offset)
+	{
+		return isset($_SESSION[$offset]);
+	}
+
+	/**
+	 * This method is required by the interface ArrayAccess.
+	 * @param integer $offset the offset to retrieve element.
+	 * @return mixed the element at the offset, null if no element is found at the offset
+	 */
+	public function offsetGet($offset)
+	{
+		return isset($_SESSION[$offset]) ? $_SESSION[$offset] : null;
+	}
+
+	/**
+	 * This method is required by the interface ArrayAccess.
+	 * @param integer $offset the offset to set element
+	 * @param mixed $item the element value
+	 */
+	public function offsetSet($offset, $item)
+	{
+		$_SESSION[$offset] = $item;
+	}
+
+	/**
+	 * This method is required by the interface ArrayAccess.
+	 * @param mixed $offset the offset to unset element
+	 */
+	public function offsetUnset($offset)
+	{
+		unset($_SESSION[$offset]);
+	}
+}
diff --git a/yii/web/SessionIterator.php b/yii/web/SessionIterator.php
new file mode 100644
index 0000000..c960dd4
--- /dev/null
+++ b/yii/web/SessionIterator.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+/**
+ * SessionIterator implements an iterator for traversing session variables managed by [[Session]].
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class SessionIterator implements \Iterator
+{
+	/**
+	 * @var array list of keys in the map
+	 */
+	private $_keys;
+	/**
+	 * @var mixed current key
+	 */
+	private $_key;
+
+	/**
+	 * Constructor.
+	 */
+	public function __construct()
+	{
+		$this->_keys = array_keys($_SESSION);
+	}
+
+	/**
+	 * Rewinds internal array pointer.
+	 * This method is required by the interface Iterator.
+	 */
+	public function rewind()
+	{
+		$this->_key = reset($this->_keys);
+	}
+
+	/**
+	 * Returns the key of the current array element.
+	 * This method is required by the interface Iterator.
+	 * @return mixed the key of the current array element
+	 */
+	public function key()
+	{
+		return $this->_key;
+	}
+
+	/**
+	 * Returns the current array element.
+	 * This method is required by the interface Iterator.
+	 * @return mixed the current array element
+	 */
+	public function current()
+	{
+		return isset($_SESSION[$this->_key]) ? $_SESSION[$this->_key] : null;
+	}
+
+	/**
+	 * Moves the internal pointer to the next array element.
+	 * This method is required by the interface Iterator.
+	 */
+	public function next()
+	{
+		do {
+			$this->_key = next($this->_keys);
+		} while (!isset($_SESSION[$this->_key]) && $this->_key !== false);
+	}
+
+	/**
+	 * Returns whether there is an element at current position.
+	 * This method is required by the interface Iterator.
+	 * @return boolean
+	 */
+	public function valid()
+	{
+		return $this->_key !== false;
+	}
+}
diff --git a/yii/web/Sort.php b/yii/web/Sort.php
new file mode 100644
index 0000000..324e733
--- /dev/null
+++ b/yii/web/Sort.php
@@ -0,0 +1,336 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use Yii;
+use yii\helpers\Html;
+
+/**
+ * Sort represents information relevant to sorting.
+ *
+ * When data needs to be sorted according to one or several attributes,
+ * we can use Sort to represent the sorting information and generate
+ * appropriate hyperlinks that can lead to sort actions.
+ *
+ * A typical usage example is as follows,
+ *
+ * ~~~
+ * function actionIndex()
+ * {
+ *     $sort = new Sort(array(
+ *         'attributes' => array(
+ *             'age',
+ *             'name' => array(
+ *                 'asc' => array('last_name', 'first_name'),
+ *                 'desc' => array('last_name' => true, 'first_name' => true),
+ *             ),
+ *         ),
+ *     ));
+ *
+ *     $models = Article::find()
+ *         ->where(array('status' => 1))
+ *         ->orderBy($sort->orders)
+ *         ->all();
+ *
+ *     $this->render('index', array(
+ *          'models' => $models,
+ *          'sort' => $sort,
+ *     ));
+ * }
+ * ~~~
+ *
+ * View:
+ *
+ * ~~~
+ * // display links leading to sort actions
+ * echo $sort->link('name', 'Name') . ' | ' . $sort->link('age', 'Age');
+ *
+ * foreach($models as $model) {
+ *     // display $model here
+ * }
+ * ~~~
+ *
+ * In the above, we declare two [[attributes]] that support sorting: name and age.
+ * We pass the sort information to the Article query so that the query results are
+ * sorted by the orders specified by the Sort object. In the view, we show two hyperlinks
+ * that can lead to pages with the data sorted by the corresponding attributes.
+ *
+ * @property array $orders Sort directions indexed by column names. The sort direction
+ * can be either [[Sort::ASC]] for ascending order or [[Sort::DESC]] for descending order.
+ * @property array $attributeOrders Sort directions indexed by attribute names. The sort
+ * direction can be either [[Sort::ASC]] for ascending order or [[Sort::DESC]] for descending order.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Sort extends \yii\base\Object
+{
+	/**
+	 * Sort ascending
+	 */
+	const ASC = false;
+
+	/**
+	 * Sort descending
+	 */
+	const DESC = true;
+
+	/**
+	 * @var boolean whether the sorting can be applied to multiple attributes simultaneously.
+	 * Defaults to false, which means each time the data can only be sorted by one attribute.
+	 */
+	public $enableMultiSort = false;
+
+	/**
+	 * @var array list of attributes that are allowed to be sorted. Its syntax can be
+	 * described using the following example:
+	 *
+	 * ~~~
+	 * array(
+	 *     'age',
+	 *     'user' => array(
+	 *         'asc' => array('first_name' => Sort::ASC, 'last_name' => Sort::ASC),
+	 *         'desc' => array('first_name' => Sort::DESC, 'last_name' => Sort::DESC),
+	 *         'default' => 'desc',
+	 *     ),
+	 * )
+	 * ~~~
+	 *
+	 * In the above, two attributes are declared: "age" and "user". The "age" attribute is
+	 * a simple attribute which is equivalent to the following:
+	 *
+	 * ~~~
+	 * 'age' => array(
+	 *     'asc' => array('age' => Sort::ASC),
+	 *     'desc' => array('age' => Sort::DESC),
+	 * )
+	 * ~~~
+	 *
+	 * The "user" attribute is a composite attribute:
+	 *
+	 * - The "user" key represents the attribute name which will appear in the URLs leading
+	 *   to sort actions. Attribute names cannot contain characters listed in [[separators]].
+	 * - The "asc" and "desc" elements specify how to sort by the attribute in ascending
+	 *   and descending orders, respectively. Their values represent the actual columns and
+	 *   the directions by which the data should be sorted by.
+	 * - And the "default" element specifies if the attribute is not sorted currently,
+	 *   in which direction it should be sorted (the default value is ascending order).
+	 */
+	public $attributes = array();
+	/**
+	 * @var string the name of the parameter that specifies which attributes to be sorted
+	 * in which direction. Defaults to 'sort'.
+	 * @see params
+	 */
+	public $sortVar = 'sort';
+	/**
+	 * @var string the tag appeared in the [[sortVar]] parameter that indicates the attribute should be sorted
+	 * in descending order. Defaults to 'desc'.
+	 */
+	public $descTag = 'desc';
+	/**
+	 * @var array the order that should be used when the current request does not specify any order.
+	 * The array keys are attribute names and the array values are the corresponding sort directions. For example,
+	 *
+	 * ~~~
+	 * array(
+	 *     'name' => Sort::ASC,
+	 *     'create_time' => Sort::DESC,
+	 * )
+	 * ~~~
+	 *
+	 * @see attributeOrders
+	 */
+	public $defaults;
+	/**
+	 * @var string the route of the controller action for displaying the sorted contents.
+	 * If not set, it means using the currently requested route.
+	 */
+	public $route;
+	/**
+	 * @var array separators used in the generated URL. This must be an array consisting of
+	 * two elements. The first element specifies the character separating different
+	 * attributes, while the second element specifies the character separating attribute name
+	 * and the corresponding sort direction. Defaults to `array('-', '.')`.
+	 */
+	public $separators = array('-', '.');
+	/**
+	 * @var array parameters (name => value) that should be used to obtain the current sort directions
+	 * and to create new sort URLs. If not set, $_GET will be used instead.
+	 *
+	 * The array element indexed by [[sortVar]] is considered to be the current sort directions.
+	 * If the element does not exist, the [[defaults|default order]] will be used.
+	 *
+	 * @see sortVar
+	 * @see defaults
+	 */
+	public $params;
+
+	/**
+	 * Returns the columns and their corresponding sort directions.
+	 * @return array the columns (keys) and their corresponding sort directions (values).
+	 * This can be passed to [[\yii\db\Query::orderBy()]] to construct a DB query.
+	 */
+	public function getOrders()
+	{
+		$attributeOrders = $this->getAttributeOrders();
+		$orders = array();
+		foreach ($attributeOrders as $attribute => $direction) {
+			$definition = $this->getAttribute($attribute);
+			$columns = $definition[$direction === self::ASC ? 'asc' : 'desc'];
+			foreach ($columns as $name => $dir) {
+				$orders[$name] = $dir;
+			}
+		}
+		return $orders;
+	}
+
+	/**
+	 * Generates a hyperlink that links to the sort action to sort by the specified attribute.
+	 * Based on the sort direction, the CSS class of the generated hyperlink will be appended
+	 * with "asc" or "desc".
+	 * @param string $attribute the attribute name by which the data should be sorted by.
+	 * @param string $label the link label. Note that the label will not be HTML-encoded.
+	 * @param array $htmlOptions additional HTML attributes for the hyperlink tag
+	 * @return string the generated hyperlink
+	 */
+	public function link($attribute, $label, $htmlOptions = array())
+	{
+		if (($definition = $this->getAttribute($attribute)) === false) {
+			return $label;
+		}
+
+		if (($direction = $this->getAttributeOrder($attribute)) !== null) {
+			$class = $direction ? 'desc' : 'asc';
+			if (isset($htmlOptions['class'])) {
+				$htmlOptions['class'] .= ' ' . $class;
+			} else {
+				$htmlOptions['class'] = $class;
+			}
+		}
+
+		$url = $this->createUrl($attribute);
+
+		return Html::a($label, $url, $htmlOptions);
+	}
+
+	private $_attributeOrders;
+
+	/**
+	 * Returns the currently requested sort information.
+	 * @param boolean $recalculate whether to recalculate the sort directions
+	 * @return array sort directions indexed by attribute names.
+	 * Sort direction can be either [[Sort::ASC]] for ascending order or
+	 * [[Sort::DESC]] for descending order.
+	 */
+	public function getAttributeOrders($recalculate = false)
+	{
+		if ($this->_attributeOrders === null || $recalculate) {
+			$this->_attributeOrders = array();
+			$params = $this->params === null ? $_GET : $this->params;
+			if (isset($params[$this->sortVar]) && is_scalar($params[$this->sortVar])) {
+				$attributes = explode($this->separators[0], $params[$this->sortVar]);
+				foreach ($attributes as $attribute) {
+					$descending = false;
+					if (($pos = strrpos($attribute, $this->separators[1])) !== false) {
+						if ($descending = (substr($attribute, $pos + 1) === $this->descTag)) {
+							$attribute = substr($attribute, 0, $pos);
+						}
+					}
+
+					if (($this->getAttribute($attribute)) !== false) {
+						$this->_attributeOrders[$attribute] = $descending;
+						if (!$this->enableMultiSort) {
+							return $this->_attributeOrders;
+						}
+					}
+				}
+			}
+			if (empty($this->_attributeOrders) && is_array($this->defaults)) {
+				$this->_attributeOrders = $this->defaults;
+			}
+		}
+		return $this->_attributeOrders;
+	}
+
+	/**
+	 * Returns the sort direction of the specified attribute in the current request.
+	 * @param string $attribute the attribute name
+	 * @return boolean|null Sort direction of the attribute. Can be either [[Sort::ASC]]
+	 * for ascending order or [[Sort::DESC]] for descending order. Null is returned
+	 * if the attribute is invalid or does not need to be sorted.
+	 */
+	public function getAttributeOrder($attribute)
+	{
+		$this->getAttributeOrders();
+		return isset($this->_attributeOrders[$attribute]) ? $this->_attributeOrders[$attribute] : null;
+	}
+
+	/**
+	 * Creates a URL for sorting the data by the specified attribute.
+	 * This method will consider the current sorting status given by [[attributeOrders]].
+	 * For example, if the current page already sorts the data by the specified attribute in ascending order,
+	 * then the URL created will lead to a page that sorts the data by the specified attribute in descending order.
+	 * @param string $attribute the attribute name
+	 * @return string|boolean the URL for sorting. False if the attribute is invalid.
+	 * @see attributeOrders
+	 * @see params
+	 */
+	public function createUrl($attribute)
+	{
+		if (($definition = $this->getAttribute($attribute)) === false) {
+			return false;
+		}
+		$directions = $this->getAttributeOrders();
+		if (isset($directions[$attribute])) {
+			$descending = !$directions[$attribute];
+			unset($directions[$attribute]);
+		} elseif (isset($definition['default'])) {
+			$descending = $definition['default'] === 'desc';
+		} else {
+			$descending = false;
+		}
+
+		if ($this->enableMultiSort) {
+			$directions = array_merge(array($attribute => $descending), $directions);
+		} else {
+			$directions = array($attribute => $descending);
+		}
+
+		$sorts = array();
+		foreach ($directions as $attribute => $descending) {
+			$sorts[] = $descending ? $attribute . $this->separators[1] . $this->descTag : $attribute;
+		}
+		$params = $this->params === null ? $_GET : $this->params;
+		$params[$this->sortVar] = implode($this->separators[0], $sorts);
+		$route = $this->route === null ? Yii::$app->controller->route : $this->route;
+
+		return Yii::$app->getUrlManager()->createUrl($route, $params);
+	}
+
+	/**
+	 * Returns the attribute definition of the specified name.
+	 * @param string $name the attribute name
+	 * @return array|boolean the sort definition (column names => sort directions).
+	 * False is returned if the attribute cannot be sorted.
+	 * @see attributes
+	 */
+	public function getAttribute($name)
+	{
+		if (isset($this->attributes[$name])) {
+			return $this->attributes[$name];
+		} elseif (in_array($name, $this->attributes, true)) {
+			return array(
+				'asc' => array($name => self::ASC),
+				'desc' => array($name => self::DESC),
+			);
+		} else {
+			return false;
+		}
+	}
+}
diff --git a/yii/web/SpicyRice.md b/yii/web/SpicyRice.md
new file mode 100644
index 0000000..d99f3dc
--- /dev/null
+++ b/yii/web/SpicyRice.md
@@ -0,0 +1,11 @@
+## Spicy Rice font
+
+* **Author:** Brian J. Bonislawsky, Astigmatic (AOETI, Astigmatic One Eye Typographic Institute)
+* **License:** SIL Open Font License (OFL), version 1.1, [notes and FAQ](http://scripts.sil.org/OFL)
+
+## Links
+
+* [Astigmatic](http://www.astigmatic.com/)
+* [Google WebFonts](http://www.google.com/webfonts/specimen/Spicy+Rice)
+* [fontsquirrel.com](http://www.fontsquirrel.com/fonts/spicy-rice)
+* [fontspace.com](http://www.fontspace.com/astigmatic-one-eye-typographic-institute/spicy-rice)
diff --git a/yii/web/SpicyRice.ttf b/yii/web/SpicyRice.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..638436cd38eab22a9e9d1a3d160a4542ec73f955
GIT binary patch
literal 67244
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
W)Br(I?aL1N<zBQ1@#S7c`TqbUUn^Gt

literal 0
HcmV?d00001

diff --git a/yii/web/UploadedFile.php b/yii/web/UploadedFile.php
new file mode 100644
index 0000000..6e685a3
--- /dev/null
+++ b/yii/web/UploadedFile.php
@@ -0,0 +1,246 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use yii\widgets\Html;
+
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class UploadedFile extends \yii\base\Object
+{
+	private static $_files;
+	private $_name;
+	private $_tempName;
+	private $_type;
+	private $_size;
+	private $_error;
+
+
+	/**
+	 * Constructor.
+	 * Instead of using the constructor to create a new instance,
+	 * you should normally call [[getInstance()]] or [[getInstances()]]
+	 * to obtain new instances.
+	 * @param string $name the original name of the file being uploaded
+	 * @param string $tempName the path of the uploaded file on the server.
+	 * @param string $type the MIME-type of the uploaded file (such as "image/gif").
+	 * @param integer $size the actual size of the uploaded file in bytes
+	 * @param integer $error the error code
+	 */
+	public function __construct($name, $tempName, $type, $size, $error)
+	{
+		$this->_name = $name;
+		$this->_tempName = $tempName;
+		$this->_type = $type;
+		$this->_size = $size;
+		$this->_error = $error;
+	}
+
+	/**
+	 * String output.
+	 * This is PHP magic method that returns string representation of an object.
+	 * The implementation here returns the uploaded file's name.
+	 * @return string the string representation of the object
+	 */
+	public function __toString()
+	{
+		return $this->_name;
+	}
+
+	/**
+	 * Returns an uploaded file for the given model attribute.
+	 * The file should be uploaded using [[ActiveForm::fileInput()]].
+	 * @param \yii\base\Model $model the data model
+	 * @param string $attribute the attribute name. The attribute name may contain array indexes.
+	 * For example, '[1]file' for tabular file uploading; and 'file[1]' for an element in a file array.
+	 * @return UploadedFile the instance of the uploaded file.
+	 * Null is returned if no file is uploaded for the specified model attribute.
+	 * @see getInstanceByName
+	 */
+	public static function getInstance($model, $attribute)
+	{
+		$name = Html::getInputName($model, $attribute);
+		return static::getInstanceByName($name);
+	}
+
+	/**
+	 * Returns all uploaded files for the given model attribute.
+	 * @param \yii\base\Model $model the data model
+	 * @param string $attribute the attribute name. The attribute name may contain array indexes
+	 * for tabular file uploading, e.g. '[1]file'.
+	 * @return UploadedFile[] array of UploadedFile objects.
+	 * Empty array is returned if no available file was found for the given attribute.
+	 */
+	public static function getInstances($model, $attribute)
+	{
+		$name = Html::getInputName($model, $attribute);
+		return static::getInstancesByName($name);
+	}
+
+	/**
+	 * Returns an uploaded file according to the given file input name.
+	 * The name can be a plain string or a string like an array element (e.g. 'Post[imageFile]', or 'Post[0][imageFile]').
+	 * @param string $name the name of the file input field.
+	 * @return UploadedFile the instance of the uploaded file.
+	 * Null is returned if no file is uploaded for the specified name.
+	 */
+	public static function getInstanceByName($name)
+	{
+		$files = static::loadFiles();
+		return isset($files[$name]) ? $files[$name] : null;
+	}
+
+	/**
+	 * Returns an array of uploaded files corresponding to the specified file input name.
+	 * This is mainly used when multiple files were uploaded and saved as 'files[0]', 'files[1]',
+	 * 'files[n]'..., and you can retrieve them all by passing 'files' as the name.
+	 * @param string $name the name of the array of files
+	 * @return UploadedFile[] the array of CUploadedFile objects. Empty array is returned
+	 * if no adequate upload was found. Please note that this array will contain
+	 * all files from all sub-arrays regardless how deeply nested they are.
+	 */
+	public static function getInstancesByName($name)
+	{
+		$files = static::loadFiles();
+		if (isset($files[$name])) {
+			return array($files[$name]);
+		}
+		$results = array();
+		foreach ($files as $key => $file) {
+			if (strpos($key, "{$name}[") === 0) {
+				$results[] = self::$_files[$key];
+			}
+		}
+		return $results;
+	}
+
+	/**
+	 * Cleans up the loaded UploadedFile instances.
+	 * This method is mainly used by test scripts to set up a fixture.
+	 */
+	public static function reset()
+	{
+		self::$_files = null;
+	}
+
+	/**
+	 * Saves the uploaded file.
+	 * Note that this method uses php's move_uploaded_file() method. If the target file `$file`
+	 * already exists, it will be overwritten.
+	 * @param string $file the file path used to save the uploaded file
+	 * @param boolean $deleteTempFile whether to delete the temporary file after saving.
+	 * If true, you will not be able to save the uploaded file again in the current request.
+	 * @return boolean true whether the file is saved successfully
+	 * @see error
+	 */
+	public function saveAs($file, $deleteTempFile = true)
+	{
+		if ($this->_error == UPLOAD_ERR_OK) {
+			if ($deleteTempFile) {
+				return move_uploaded_file($this->_tempName, $file);
+			} elseif (is_uploaded_file($this->_tempName)) {
+				return copy($this->_tempName, $file);
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * @return string the original name of the file being uploaded
+	 */
+	public function getName()
+	{
+		return $this->_name;
+	}
+
+	/**
+	 * @return string the path of the uploaded file on the server.
+	 * Note, this is a temporary file which will be automatically deleted by PHP
+	 * after the current request is processed.
+	 */
+	public function getTempName()
+	{
+		return $this->_tempName;
+	}
+
+	/**
+	 * @return string the MIME-type of the uploaded file (such as "image/gif").
+	 * Since this MIME type is not checked on the server side, do not take this value for granted.
+	 * Instead, use [[FileHelper::getMimeType()]] to determine the exact MIME type.
+	 */
+	public function getType()
+	{
+		return $this->_type;
+	}
+
+	/**
+	 * @return integer the actual size of the uploaded file in bytes
+	 */
+	public function getSize()
+	{
+		return $this->_size;
+	}
+
+	/**
+	 * Returns an error code describing the status of this file uploading.
+	 * @return integer the error code
+	 * @see http://www.php.net/manual/en/features.file-upload.errors.php
+	 */
+	public function getError()
+	{
+		return $this->_error;
+	}
+
+	/**
+	 * @return boolean whether there is an error with the uploaded file.
+	 * Check [[error]] for detailed error code information.
+	 */
+	public function getHasError()
+	{
+		return $this->_error != UPLOAD_ERR_OK;
+	}
+
+	/**
+	 * Creates UploadedFile instances from $_FILE.
+	 * @return array the UploadedFile instances
+	 */
+	private static function loadFiles()
+	{
+		if (self::$_files === null) {
+			self::$_files = array();
+			if (isset($_FILES) && is_array($_FILES)) {
+				foreach ($_FILES as $class => $info) {
+					self::loadFilesRecursive($class, $info['name'], $info['tmp_name'], $info['type'], $info['size'], $info['error']);
+				}
+			}
+		}
+		return self::$_files;
+	}
+
+	/**
+	 * Creates UploadedFile instances from $_FILE recursively.
+	 * @param string $key key for identifying uploaded file: class name and sub-array indexes
+	 * @param mixed $names file names provided by PHP
+	 * @param mixed $tempNames temporary file names provided by PHP
+	 * @param mixed $types file types provided by PHP
+	 * @param mixed $sizes file sizes provided by PHP
+	 * @param mixed $errors uploading issues provided by PHP
+	 */
+	private static function loadFilesRecursive($key, $names, $tempNames, $types, $sizes, $errors)
+	{
+		if (is_array($names)) {
+			foreach ($names as $i => $name) {
+				self::loadFilesRecursive($key . '[' . $i . ']', $name, $tempNames[$i], $types[$i], $sizes[$i], $errors[$i]);
+			}
+		} else {
+			self::$_files[$key] = new self($names, $tempNames, $types, $sizes, $errors);
+		}
+	}
+}
diff --git a/yii/web/UrlManager.php b/yii/web/UrlManager.php
new file mode 100644
index 0000000..aab7979
--- /dev/null
+++ b/yii/web/UrlManager.php
@@ -0,0 +1,264 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use Yii;
+use yii\base\Component;
+use yii\caching\Cache;
+
+/**
+ * UrlManager handles HTTP request parsing and creation of URLs based on a set of rules.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class UrlManager extends Component
+{
+	/**
+	 * @var boolean whether to enable pretty URLs. Instead of putting all parameters in the query
+	 * string part of a URL, pretty URLs allow using path info to represent some of the parameters
+	 * and can thus produce more user-friendly URLs, such as "/news/Yii-is-released", instead of
+	 * "/index.php?r=news/view&id=100".
+	 */
+	public $enablePrettyUrl = false;
+	/**
+	 * @var array the rules for creating and parsing URLs when [[enablePrettyUrl]] is true.
+	 * This property is used only if [[enablePrettyUrl]] is true. Each element in the array
+	 * is the configuration array for creating a single URL rule. The configuration will
+	 * be merged with [[ruleConfig]] first before it is used for creating the rule object.
+	 *
+	 * A special shortcut format can be used if a rule only specifies [[UrlRule::pattern|pattern]]
+	 * and [[UrlRule::route|route]]: `'pattern' => 'route'`. That is, instead of using a configuration
+	 * array, one can use the key to represent the pattern and the value the corresponding route.
+	 * For example, `'post/<id:\d+>' => 'post/view'`.
+	 *
+	 * Note that if you modify this property after the UrlManager object is created, make sure
+	 * you populate the array with rule objects instead of rule configurations.
+	 */
+	public $rules = array();
+	/**
+	 * @var string the URL suffix used when in 'path' format.
+	 * For example, ".html" can be used so that the URL looks like pointing to a static HTML page.
+	 * This property is used only if [[enablePrettyUrl]] is true.
+	 */
+	public $suffix;
+	/**
+	 * @var boolean whether to show entry script name in the constructed URL. Defaults to true.
+	 * This property is used only if [[enablePrettyUrl]] is true.
+	 */
+	public $showScriptName = false;
+	/**
+	 * @var string the GET variable name for route. This property is used only if [[enablePrettyUrl]] is false.
+	 */
+	public $routeVar = 'r';
+	/**
+	 * @var Cache|string the cache object or the application component ID of the cache object.
+	 * Compiled URL rules will be cached through this cache object, if it is available.
+	 *
+	 * After the UrlManager object is created, if you want to change this property,
+	 * you should only assign it with a cache object.
+	 * Set this property to null if you do not want to cache the URL rules.
+	 */
+	public $cache = 'cache';
+	/**
+	 * @var array the default configuration of URL rules. Individual rule configurations
+	 * specified via [[rules]] will take precedence when the same property of the rule is configured.
+	 */
+	public $ruleConfig = array(
+		'class' => 'yii\web\UrlRule',
+	);
+
+	private $_baseUrl;
+	private $_hostInfo;
+
+	/**
+	 * Initializes UrlManager.
+	 */
+	public function init()
+	{
+		parent::init();
+		$this->compileRules();
+	}
+
+	/**
+	 * Parses the URL rules.
+	 */
+	protected function compileRules()
+	{
+		if (!$this->enablePrettyUrl || empty($this->rules)) {
+			return;
+		}
+		if (is_string($this->cache)) {
+			$this->cache = Yii::$app->getComponent($this->cache);
+		}
+		if ($this->cache instanceof Cache) {
+			$key = $this->cache->buildKey(__CLASS__);
+			$hash = md5(json_encode($this->rules));
+			if (($data = $this->cache->get($key)) !== false && isset($data[1]) && $data[1] === $hash) {
+				$this->rules = $data[0];
+				return;
+			}
+		}
+
+		$rules = array();
+		foreach ($this->rules as $key => $rule) {
+			if (!is_array($rule)) {
+				$rule = array(
+					'pattern' => $key,
+					'route' => $rule,
+				);
+			}
+			$rules[] = Yii::createObject(array_merge($this->ruleConfig, $rule));
+		}
+		$this->rules = $rules;
+
+		if (isset($key, $hash)) {
+			$this->cache->set($key, array($this->rules, $hash));
+		}
+	}
+
+	/**
+	 * Parses the user request.
+	 * @param Request $request the request component
+	 * @return array|boolean the route and the associated parameters. The latter is always empty
+	 * if [[enablePrettyUrl]] is false. False is returned if the current request cannot be successfully parsed.
+	 */
+	public function parseRequest($request)
+	{
+		if ($this->enablePrettyUrl) {
+			$pathInfo = $request->pathInfo;
+			/** @var $rule UrlRule */
+			foreach ($this->rules as $rule) {
+				if (($result = $rule->parseRequest($this, $request)) !== false) {
+					return $result;
+				}
+			}
+
+			$suffix = (string)$this->suffix;
+			if ($suffix !== '' && $suffix !== '/' && $pathInfo !== '') {
+				$n = strlen($this->suffix);
+				if (substr($pathInfo, -$n) === $this->suffix) {
+					$pathInfo = substr($pathInfo, 0, -$n);
+					if ($pathInfo === '') {
+						// suffix alone is not allowed
+						return false;
+					}
+				} else {
+					// suffix doesn't match
+					return false;
+				}
+			}
+
+			return array($pathInfo, array());
+		} else {
+			$route = $request->getParam($this->routeVar);
+			if (is_array($route)) {
+				$route = '';
+			}
+			return array((string)$route, array());
+		}
+	}
+
+	/**
+	 * Creates a URL using the given route and parameters.
+	 * The URL created is a relative one. Use [[createAbsoluteUrl()]] to create an absolute URL.
+	 * @param string $route the route
+	 * @param array $params the parameters (name-value pairs)
+	 * @return string the created URL
+	 */
+	public function createUrl($route, $params = array())
+	{
+		$anchor = isset($params['#']) ? '#' . $params['#'] : '';
+		unset($params['#'], $params[$this->routeVar]);
+
+		$route = trim($route, '/');
+		$baseUrl = $this->getBaseUrl();
+
+		if ($this->enablePrettyUrl) {
+			/** @var $rule UrlRule */
+			foreach ($this->rules as $rule) {
+				if (($url = $rule->createUrl($this, $route, $params)) !== false) {
+					return rtrim($baseUrl, '/') . '/' . $url . $anchor;
+				}
+			}
+
+			if ($this->suffix !== null) {
+				$route .= $this->suffix;
+			}
+			if (!empty($params)) {
+				$route .= '?' . http_build_query($params);
+			}
+			return rtrim($baseUrl, '/') . '/' . $route . $anchor;
+		} else {
+			$url = $baseUrl . '?' . $this->routeVar . '=' . $route;
+			if (!empty($params)) {
+				$url .= '&' . http_build_query($params);
+			}
+			return $url;
+		}
+	}
+
+	/**
+	 * Creates an absolute URL using the given route and parameters.
+	 * This method prepends the URL created by [[createUrl()]] with the [[hostInfo]].
+	 * @param string $route the route
+	 * @param array $params the parameters (name-value pairs)
+	 * @return string the created URL
+	 * @see createUrl()
+	 */
+	public function createAbsoluteUrl($route, $params = array())
+	{
+		return $this->getHostInfo() . $this->createUrl($route, $params);
+	}
+
+	/**
+	 * Returns the base URL that is used by [[createUrl()]] to prepend URLs it creates.
+	 * It defaults to [[Request::scriptUrl]] if [[showScriptName]] is true or [[enablePrettyUrl]] is false;
+	 * otherwise, it defaults to [[Request::baseUrl]].
+	 * @return string the base URL that is used by [[createUrl()]] to prepend URLs it creates.
+	 */
+	public function getBaseUrl()
+	{
+		if ($this->_baseUrl === null) {
+			/** @var $request \yii\web\Request */
+			$request = Yii::$app->getRequest();
+			$this->_baseUrl = $this->showScriptName || !$this->enablePrettyUrl ? $request->getScriptUrl() : $request->getBaseUrl();
+		}
+		return $this->_baseUrl;
+	}
+
+	/**
+	 * Sets the base URL that is used by [[createUrl()]] to prepend URLs it creates.
+	 * @param string $value the base URL that is used by [[createUrl()]] to prepend URLs it creates.
+	 */
+	public function setBaseUrl($value)
+	{
+		$this->_baseUrl = $value;
+	}
+
+	/**
+	 * Returns the host info that is used by [[createAbsoluteUrl()]] to prepend URLs it creates.
+	 * @return string the host info (e.g. "http://www.example.com") that is used by [[createAbsoluteUrl()]] to prepend URLs it creates.
+	 */
+	public function getHostInfo()
+	{
+		if ($this->_hostInfo === null) {
+			$this->_hostInfo = Yii::$app->getRequest()->getHostInfo();
+		}
+		return $this->_hostInfo;
+	}
+
+	/**
+	 * Sets the host info that is used by [[createAbsoluteUrl()]] to prepend URLs it creates.
+	 * @param string $value the host info (e.g. "http://www.example.com") that is used by [[createAbsoluteUrl()]] to prepend URLs it creates.
+	 */
+	public function setHostInfo($value)
+	{
+		$this->_hostInfo = rtrim($value, '/');
+	}
+}
diff --git a/yii/web/UrlRule.php b/yii/web/UrlRule.php
new file mode 100644
index 0000000..96cb994
--- /dev/null
+++ b/yii/web/UrlRule.php
@@ -0,0 +1,283 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use yii\base\Object;
+use yii\base\InvalidConfigException;
+
+/**
+ * UrlRule represents a rule used for parsing and generating URLs.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class UrlRule extends Object
+{
+	/**
+	 * Set [[mode]] with this value to mark that this rule is for URL parsing only
+	 */
+	const PARSING_ONLY = 1;
+	/**
+	 * Set [[mode]] with this value to mark that this rule is for URL creation only
+	 */
+	const CREATION_ONLY = 2;
+
+	/**
+	 * @var string regular expression used to parse a URL
+	 */
+	public $pattern;
+	/**
+	 * @var string the route to the controller action
+	 */
+	public $route;
+	/**
+	 * @var array the default GET parameters (name=>value) that this rule provides.
+	 * When this rule is used to parse the incoming request, the values declared in this property
+	 * will be injected into $_GET.
+	 */
+	public $defaults = array();
+	/**
+	 * @var string the URL suffix used for this rule.
+	 * For example, ".html" can be used so that the URL looks like pointing to a static HTML page.
+	 * If not, the value of [[UrlManager::suffix]] will be used.
+	 */
+	public $suffix;
+	/**
+	 * @var string|array the HTTP verb (e.g. GET, POST, DELETE) that this rule should match.
+	 * Use array to represent multiple verbs that this rule may match.
+	 * If this property is not set, the rule can match any verb.
+	 * Note that this property is only used when parsing a request. It is ignored for URL creation.
+	 */
+	public $verb;
+	/**
+	 * @var integer a value indicating if this rule should be used for both request parsing and URL creation,
+	 * parsing only, or creation only.
+	 * If not set or 0, it means the rule is both request parsing and URL creation.
+	 * If it is [[PARSING_ONLY]], the rule is for request parsing only.
+	 * If it is [[CREATION_ONLY]], the rule is for URL creation only.
+	 */
+	public $mode;
+
+	/**
+	 * @var string the template for generating a new URL. This is derived from [[pattern]] and is used in generating URL.
+	 */
+	private $_template;
+	/**
+	 * @var string the regex for matching the route part. This is used in generating URL.
+	 */
+	private $_routeRule;
+	/**
+	 * @var array list of regex for matching parameters. This is used in generating URL.
+	 */
+	private $_paramRules = array();
+	/**
+	 * @var array list of parameters used in the route.
+	 */
+	private $_routeParams = array();
+
+	/**
+	 * Initializes this rule.
+	 */
+	public function init()
+	{
+		if ($this->pattern === null) {
+			throw new InvalidConfigException('UrlRule::pattern must be set.');
+		}
+		if ($this->route === null) {
+			throw new InvalidConfigException('UrlRule::route must be set.');
+		}
+		if ($this->verb !== null) {
+			if (is_array($this->verb)) {
+				foreach ($this->verb as $i => $verb) {
+					$this->verb[$i] = strtoupper($verb);
+				}
+			} else {
+				$this->verb = array(strtoupper($this->verb));
+			}
+		}
+
+		$this->pattern = trim($this->pattern, '/');
+		if ($this->pattern === '') {
+			$this->_template = '';
+			$this->pattern = '#^$#u';
+			return;
+		} else {
+			$this->pattern = '/' . $this->pattern . '/';
+		}
+
+		$this->route = trim($this->route, '/');
+		if (strpos($this->route, '<') !== false && preg_match_all('/<(\w+)>/', $this->route, $matches)) {
+			foreach ($matches[1] as $name) {
+				$this->_routeParams[$name] = "<$name>";
+			}
+		}
+
+		$tr = $tr2 = array();
+		if (preg_match_all('/<(\w+):?([^>]+)?>/', $this->pattern, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+			foreach ($matches as $match) {
+				$name = $match[1][0];
+				$pattern = isset($match[2][0]) ? $match[2][0] : '[^\/]+';
+				if (isset($this->defaults[$name])) {
+					$length = strlen($match[0][0]);
+					$offset = $match[0][1];
+					if ($offset > 1 && $this->pattern[$offset - 1] === '/' && $this->pattern[$offset + $length] === '/') {
+						$tr["/<$name>"] = "(/(?P<$name>$pattern))?";
+					} else {
+						$tr["<$name>"] = "(?P<$name>$pattern)?";
+					}
+				} else {
+					$tr["<$name>"] = "(?P<$name>$pattern)";
+				}
+				if (isset($this->_routeParams[$name])) {
+					$tr2["<$name>"] = "(?P<$name>$pattern)";
+				} else {
+					$this->_paramRules[$name] = $pattern === '[^\/]+' ? '' : "#^$pattern$#";
+				}
+			}
+		}
+
+		$this->_template = preg_replace('/<(\w+):?([^>]+)?>/', '<$1>', $this->pattern);
+		$this->pattern = '#^' . trim(strtr($this->_template, $tr), '/') . '$#u';
+
+		if (!empty($this->_routeParams)) {
+			$this->_routeRule = '#^' . strtr($this->route, $tr2) . '$#u';
+		}
+	}
+
+	/**
+	 * Parses the given request and returns the corresponding route and parameters.
+	 * @param UrlManager $manager the URL manager
+	 * @param Request $request the request component
+	 * @return array|boolean the parsing result. The route and the parameters are returned as an array.
+	 * If false, it means this rule cannot be used to parse this path info.
+	 */
+	public function parseRequest($manager, $request)
+	{
+		if ($this->mode === self::CREATION_ONLY) {
+			return false;
+		}
+
+		if ($this->verb !== null && !in_array($request->verb, $this->verb, true)) {
+			return false;
+		}
+
+		$pathInfo = $request->pathInfo;
+		$suffix = (string)($this->suffix === null ? $manager->suffix : $this->suffix);
+		if ($suffix !== '' && $pathInfo !== '') {
+			$n = strlen($suffix);
+			if (substr($pathInfo, -$n) === $suffix) {
+				$pathInfo = substr($pathInfo, 0, -$n);
+				if ($pathInfo === '') {
+					// suffix alone is not allowed
+					return false;
+				}
+			} elseif ($suffix !== '/') {
+				// we allow the ending '/' to be optional if it is a suffix
+				return false;
+			}
+		}
+
+		if (!preg_match($this->pattern, $pathInfo, $matches)) {
+			return false;
+		}
+		foreach ($this->defaults as $name => $value) {
+			if (!isset($matches[$name]) || $matches[$name] === '') {
+				$matches[$name] = $value;
+			}
+		}
+		$params = $this->defaults;
+		$tr = array();
+		foreach ($matches as $name => $value) {
+			if (isset($this->_routeParams[$name])) {
+				$tr[$this->_routeParams[$name]] = $value;
+				unset($params[$name]);
+			} elseif (isset($this->_paramRules[$name])) {
+				$params[$name] = $value;
+			}
+		}
+		if ($this->_routeRule !== null) {
+			$route = strtr($this->route, $tr);
+		} else {
+			$route = $this->route;
+		}
+		return array($route, $params);
+	}
+
+	/**
+	 * Creates a URL according to the given route and parameters.
+	 * @param UrlManager $manager the URL manager
+	 * @param string $route the route. It should not have slashes at the beginning or the end.
+	 * @param array $params the parameters
+	 * @return string|boolean the created URL, or false if this rule cannot be used for creating this URL.
+	 */
+	public function createUrl($manager, $route, $params)
+	{
+		if ($this->mode === self::PARSING_ONLY) {
+			return false;
+		}
+
+		$tr = array();
+
+		// match the route part first
+		if ($route !== $this->route) {
+			if ($this->_routeRule !== null && preg_match($this->_routeRule, $route, $matches)) {
+				foreach ($this->_routeParams as $name => $token) {
+					if (isset($this->defaults[$name]) && strcmp($this->defaults[$name], $matches[$name]) === 0) {
+						$tr[$token] = '';
+					} else {
+						$tr[$token] = $matches[$name];
+					}
+				}
+			} else {
+				return false;
+			}
+		}
+
+		// match default params
+		// if a default param is not in the route pattern, its value must also be matched
+		foreach ($this->defaults as $name => $value) {
+			if (isset($this->_routeParams[$name])) {
+				continue;
+			}
+			if (!isset($params[$name])) {
+				return false;
+			} elseif (strcmp($params[$name], $value) === 0) { // strcmp will do string conversion automatically
+				unset($params[$name]);
+				if (isset($this->_paramRules[$name])) {
+					$tr["<$name>"] = '';
+				}
+			} elseif (!isset($this->_paramRules[$name])) {
+				return false;
+			}
+		}
+
+		// match params in the pattern
+		foreach ($this->_paramRules as $name => $rule) {
+			if (isset($params[$name]) && ($rule === '' || preg_match($rule, $params[$name]))) {
+				$tr["<$name>"] = urlencode($params[$name]);
+				unset($params[$name]);
+			} elseif (!isset($this->defaults[$name]) || isset($params[$name])) {
+				return false;
+			}
+		}
+
+		$url = trim(strtr($this->_template, $tr), '/');
+		if (strpos($url, '//') !== false) {
+			$url = preg_replace('#/+#', '/', $url);
+		}
+
+		if ($url !== '') {
+			$url .= ($this->suffix === null ? $manager->suffix : $this->suffix);
+		}
+
+		if (!empty($params)) {
+			$url .= '?' . http_build_query($params);
+		}
+		return $url;
+	}
+}
diff --git a/yii/web/User.php b/yii/web/User.php
new file mode 100644
index 0000000..88fc12d
--- /dev/null
+++ b/yii/web/User.php
@@ -0,0 +1,467 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use Yii;
+use yii\base\Component;
+use yii\base\HttpException;
+use yii\base\InvalidConfigException;
+
+/**
+ * User is the class for the "user" application component that manages the user authentication status.
+ *
+ * In particular, [[User::isGuest]] returns a value indicating whether the current user is a guest or not.
+ * Through methods [[login()]] and [[logout()]], you can change the user authentication status.
+ *
+ * User works with a class implementing the [[Identity]] interface. This class implements
+ * the actual user authentication logic and is often backed by a user database table.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class User extends Component
+{
+	const EVENT_BEFORE_LOGIN = 'beforeLogin';
+	const EVENT_AFTER_LOGIN = 'afterLogin';
+	const EVENT_BEFORE_LOGOUT = 'beforeLogout';
+	const EVENT_AFTER_LOGOUT = 'afterLogout';
+
+	/**
+	 * @var string the class name of the [[identity]] object.
+	 */
+	public $identityClass;
+	/**
+	 * @var boolean whether to enable cookie-based login. Defaults to false.
+	 */
+	public $enableAutoLogin = false;
+	/**
+	 * @var string|array the URL for login when [[loginRequired()]] is called. 
+	 * If an array is given, [[UrlManager::createUrl()]] will be called to create the corresponding URL.
+	 * The first element of the array should be the route to the login action, and the rest of 
+	 * the name-value pairs are GET parameters used to construct the login URL. For example,
+	 * 
+	 * ~~~
+	 * array('site/login', 'ref' => 1)
+	 * ~~~
+	 *
+	 * If this property is null, a 403 HTTP exception will be raised when [[loginRequired()]] is called.
+	 */
+	public $loginUrl = array('site/login');
+	/**
+	 * @var array the configuration of the identity cookie. This property is used only when [[enableAutoLogin]] is true.
+	 * @see Cookie
+	 */
+	public $identityCookie = array('name' => '_identity', 'httponly' => true);
+	/**
+	 * @var integer the number of seconds in which the user will be logged out automatically if he
+	 * remains inactive. If this property is not set, the user will be logged out after
+	 * the current session expires (c.f. [[Session::timeout]]).
+	 */
+	public $authTimeout;
+	/**
+	 * @var boolean whether to automatically renew the identity cookie each time a page is requested.
+	 * This property is effective only when [[enableAutoLogin]] is true.
+	 * When this is false, the identity cookie will expire after the specified duration since the user
+	 * is initially logged in. When this is true, the identity cookie will expire after the specified duration
+	 * since the user visits the site the last time.
+	 * @see enableAutoLogin
+	 */
+	public $autoRenewCookie = true;
+	/**
+	 * @var string the session variable name used to store the value of [[id]].
+	 */
+	public $idVar = '__id';
+	/**
+	 * @var string the session variable name used to store the value of expiration timestamp of the authenticated state.
+	 * This is used when [[authTimeout]] is set.
+	 */
+	public $authTimeoutVar = '__expire';
+	/**
+	 * @var string the session variable name used to store the value of [[returnUrl]].
+	 */
+	public $returnUrlVar = '__returnUrl';
+
+
+	/**
+	 * Initializes the application component.
+	 */
+	public function init()
+	{
+		parent::init();
+
+		if ($this->identityClass === null) {
+			throw new InvalidConfigException('User::identityClass must be set.');
+		}
+		if ($this->enableAutoLogin && !isset($this->identityCookie['name'])) {
+			throw new InvalidConfigException('User::identityCookie must contain the "name" element.');
+		}
+
+		Yii::$app->getSession()->open();
+
+		$this->renewAuthStatus();
+
+		if ($this->enableAutoLogin) {
+			if ($this->getIsGuest()) {
+				$this->loginByCookie();
+			} elseif ($this->autoRenewCookie) {
+				$this->renewIdentityCookie();
+			}
+		}
+	}
+
+	private $_identity = false;
+
+	/**
+	 * Returns the identity object associated with the currently logged user.
+	 * @return Identity the identity object associated with the currently logged user.
+	 * Null is returned if the user is not logged in (not authenticated).
+	 * @see login
+	 * @see logout
+	 */
+	public function getIdentity()
+	{
+		if ($this->_identity === false) {
+			$id = $this->getId();
+			if ($id === null) {
+				$this->_identity = null;
+			} else {
+				/** @var $class Identity */
+				$class = Yii::import($this->identityClass);
+				$this->_identity = $class::findIdentity($id);
+			}
+		}
+		return $this->_identity;
+	}
+
+	/**
+	 * Sets the identity object.
+	 * This method should be mainly be used by the User component or its child class
+	 * to maintain the identity object.
+	 *
+	 * You should normally update the user identity via methods [[login()]], [[logout()]]
+	 * or [[switchIdentity()]].
+	 *
+	 * @param Identity $identity the identity object associated with the currently logged user.
+	 */
+	public function setIdentity($identity)
+	{
+		$this->_identity = $identity;
+	}
+
+	/**
+	 * Logs in a user.
+	 *
+	 * This method stores the necessary session information to keep track
+	 * of the user identity information. If `$duration` is greater than 0
+	 * and [[enableAutoLogin]] is true, it will also send out an identity
+	 * cookie to support cookie-based login.
+	 *
+	 * @param Identity $identity the user identity (which should already be authenticated)
+	 * @param integer $duration number of seconds that the user can remain in logged-in status.
+	 * Defaults to 0, meaning login till the user closes the browser or the session is manually destroyed.
+	 * If greater than 0 and [[enableAutoLogin]] is true, cookie-based login will be supported.
+	 * @return boolean whether the user is logged in
+	 */
+	public function login($identity, $duration = 0)
+	{
+		if ($this->beforeLogin($identity, false)) {
+			$this->switchIdentity($identity, $duration);
+			$this->afterLogin($identity, false);
+		}
+		return !$this->getIsGuest();
+	}
+
+	/**
+	 * Logs in a user by cookie.
+	 *
+	 * This method attempts to log in a user using the ID and authKey information
+	 * provided by the given cookie.
+	 */
+	protected function loginByCookie()
+	{
+		$name = $this->identityCookie['name'];
+		$value = Yii::$app->getRequest()->getCookies()->getValue($name);
+		if ($value !== null) {
+			$data = json_decode($value, true);
+			if (count($data) === 3 && isset($data[0], $data[1], $data[2])) {
+				list ($id, $authKey, $duration) = $data;
+				/** @var $class Identity */
+				$class = $this->identityClass;
+				$identity = $class::findIdentity($id);
+				if ($identity !== null && $identity->validateAuthKey($authKey)) {
+					if ($this->beforeLogin($identity, true)) {
+						$this->switchIdentity($identity, $this->autoRenewCookie ? $duration : 0);
+						$this->afterLogin($identity, true);
+					}
+				} elseif ($identity !== null) {
+					Yii::warning("Invalid auth key attempted for user '$id': $authKey", __METHOD__);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Logs out the current user.
+	 * This will remove authentication-related session data.
+	 * If `$destroySession` is true, all session data will be removed.
+	 * @param boolean $destroySession whether to destroy the whole session. Defaults to true.
+	 */
+	public function logout($destroySession = true)
+	{
+		$identity = $this->getIdentity();
+		if ($identity !== null && $this->beforeLogout($identity)) {
+			$this->switchIdentity(null);
+			if ($destroySession) {
+				Yii::$app->getSession()->destroy();
+			}
+ 			$this->afterLogout($identity);
+		}
+	}
+
+	/**
+	 * Returns a value indicating whether the user is a guest (not authenticated).
+	 * @return boolean whether the current user is a guest.
+	 */
+	public function getIsGuest()
+	{
+		return $this->getIdentity() === null;
+	}
+
+	/**
+	 * Returns a value that uniquely represents the user.
+	 * @return string|integer the unique identifier for the user. If null, it means the user is a guest.
+	 */
+	public function getId()
+	{
+		return Yii::$app->getSession()->get($this->idVar);
+	}
+
+	/**
+	 * Returns the URL that the user should be redirected to after successful login.
+	 * This property is usually used by the login action. If the login is successful,
+	 * the action should read this property and use it to redirect the user browser.
+	 * @param string|array $defaultUrl the default return URL in case it was not set previously.
+	 * If this is null, it means [[Application::homeUrl]] will be redirected to.
+	 * Please refer to [[\yii\helpers\Html::url()]] on acceptable URL formats.
+	 * @return string the URL that the user should be redirected to after login.
+	 * @see loginRequired
+	 */
+	public function getReturnUrl($defaultUrl = null)
+	{
+		$url = Yii::$app->getSession()->get($this->returnUrlVar, $defaultUrl);
+		return $url === null ? Yii::$app->getHomeUrl() : $url;
+	}
+
+	/**
+	 * @param string|array $url the URL that the user should be redirected to after login.
+	 * Please refer to [[\yii\helpers\Html::url()]] on acceptable URL formats.
+	 */
+	public function setReturnUrl($url)
+	{
+		Yii::$app->getSession()->set($this->returnUrlVar, $url);
+	}
+
+	/**
+	 * Redirects the user browser to the login page.
+	 * Before the redirection, the current URL (if it's not an AJAX url) will be
+	 * kept as [[returnUrl]] so that the user browser may be redirected back
+	 * to the current page after successful login. Make sure you set [[loginUrl]]
+	 * so that the user browser can be redirected to the specified login URL after
+	 * calling this method.
+	 * After calling this method, the current request processing will be terminated.
+	 */
+	public function loginRequired()
+	{
+		$request = Yii::$app->getRequest();
+		if (!$request->getIsAjaxRequest()) {
+			$this->setReturnUrl($request->getUrl());
+		}
+		if ($this->loginUrl !== null) {
+			Yii::$app->getResponse()->redirect($this->loginUrl);
+		} else {
+			throw new HttpException(403, Yii::t('yii|Login Required'));
+		}
+	}
+
+	/**
+	 * This method is called before logging in a user.
+	 * The default implementation will trigger the [[EVENT_BEFORE_LOGIN]] event.
+	 * If you override this method, make sure you call the parent implementation
+	 * so that the event is triggered.
+	 * @param Identity $identity the user identity information
+	 * @param boolean $cookieBased whether the login is cookie-based
+	 * @return boolean whether the user should continue to be logged in
+	 */
+	protected function beforeLogin($identity, $cookieBased)
+	{
+		$event = new UserEvent(array(
+			'identity' => $identity,
+			'cookieBased' => $cookieBased,
+		));
+		$this->trigger(self::EVENT_BEFORE_LOGIN, $event);
+		return $event->isValid;
+	}
+
+	/**
+	 * This method is called after the user is successfully logged in.
+	 * The default implementation will trigger the [[EVENT_AFTER_LOGIN]] event.
+	 * If you override this method, make sure you call the parent implementation
+	 * so that the event is triggered.
+	 * @param Identity $identity the user identity information
+	 * @param boolean $cookieBased whether the login is cookie-based
+	 */
+	protected function afterLogin($identity, $cookieBased)
+	{
+		$this->trigger(self::EVENT_AFTER_LOGIN, new UserEvent(array(
+			'identity' => $identity,
+			'cookieBased' => $cookieBased,
+		)));
+	}
+
+	/**
+	 * This method is invoked when calling [[logout()]] to log out a user.
+	 * The default implementation will trigger the [[EVENT_BEFORE_LOGOUT]] event.
+	 * If you override this method, make sure you call the parent implementation
+	 * so that the event is triggered.
+	 * @param Identity $identity the user identity information
+	 * @return boolean whether the user should continue to be logged out
+	 */
+	protected function beforeLogout($identity)
+	{
+		$event = new UserEvent(array(
+			'identity' => $identity,
+		));
+		$this->trigger(self::EVENT_BEFORE_LOGOUT, $event);
+		return $event->isValid;
+	}
+
+	/**
+	 * This method is invoked right after a user is logged out via [[logout()]].
+	 * The default implementation will trigger the [[EVENT_AFTER_LOGOUT]] event.
+	 * If you override this method, make sure you call the parent implementation
+	 * so that the event is triggered.
+	 * @param Identity $identity the user identity information
+	 */
+	protected function afterLogout($identity)
+	{
+		$this->trigger(self::EVENT_AFTER_LOGOUT, new UserEvent(array(
+			'identity' => $identity,
+		)));
+	}
+
+	/**
+	 * Renews the identity cookie.
+	 * This method will set the expiration time of the identity cookie to be the current time
+	 * plus the originally specified cookie duration.
+	 */
+	protected function renewIdentityCookie()
+	{
+		$name = $this->identityCookie['name'];
+		$value = Yii::$app->getRequest()->getCookies()->getValue($name);
+		if ($value !== null) {
+			$data = json_decode($value, true);
+			if (is_array($data) && isset($data[2])) {
+				$cookie = new Cookie($this->identityCookie);
+				$cookie->value = $value;
+				$cookie->expire = time() + (int)$data[2];
+				Yii::$app->getResponse()->getCookies()->add($cookie);
+			}
+		}
+	}
+
+	/**
+	 * Sends an identity cookie.
+	 * This method is used when [[enableAutoLogin]] is true.
+	 * It saves [[id]], [[Identity::getAuthKey()|auth key]], and the duration of cookie-based login
+	 * information in the cookie.
+	 * @param Identity $identity
+	 * @param integer $duration number of seconds that the user can remain in logged-in status.
+	 * @see loginByCookie
+	 */
+	protected function sendIdentityCookie($identity, $duration)
+	{
+		$cookie = new Cookie($this->identityCookie);
+		$cookie->value = json_encode(array(
+			$identity->getId(),
+			$identity->getAuthKey(),
+			$duration,
+		));
+		$cookie->expire = time() + $duration;
+		Yii::$app->getResponse()->getCookies()->add($cookie);
+	}
+
+	/**
+	 * Switches to a new identity for the current user.
+	 *
+	 * This method will save necessary session information to keep track of the user authentication status.
+	 * If `$duration` is provided, it will also send out appropriate identity cookie
+	 * to support cookie-based login.
+	 *
+	 * This method is mainly called by [[login()]], [[logout()]] and [[loginByCookie()]]
+	 * when the current user needs to be associated with the corresponding identity information.
+	 *
+	 * @param Identity $identity the identity information to be associated with the current user.
+	 * If null, it means switching to be a guest.
+	 * @param integer $duration number of seconds that the user can remain in logged-in status.
+	 * This parameter is used only when `$identity` is not null.
+	 */
+	public function switchIdentity($identity, $duration = 0)
+	{
+		$session = Yii::$app->getSession();
+		$session->regenerateID(true);
+		$this->setIdentity($identity);
+		$session->remove($this->idVar);
+		$session->remove($this->authTimeoutVar);
+		if ($identity instanceof Identity) {
+			$session->set($this->idVar, $identity->getId());
+			if ($this->authTimeout !== null) {
+				$session->set($this->authTimeoutVar, time() + $this->authTimeout);
+			}
+			if ($duration > 0 && $this->enableAutoLogin) {
+				$this->sendIdentityCookie($identity, $duration);
+			}
+		} elseif ($this->enableAutoLogin) {
+			Yii::$app->getResponse()->getCookies()->remove(new Cookie($this->identityCookie));
+		}
+	}
+
+	/**
+	 * Updates the authentication status according to [[authTimeout]].
+	 * This method is called during [[init()]].
+	 * It will update the user's authentication status if it has not outdated yet.
+	 * Otherwise, it will logout the user.
+	 */
+	protected function renewAuthStatus()
+	{
+		if ($this->authTimeout !== null && !$this->getIsGuest()) {
+			$expire = Yii::$app->getSession()->get($this->authTimeoutVar);
+			if ($expire !== null && $expire < time()) {
+				$this->logout(false);
+			} else {
+				Yii::$app->getSession()->set($this->authTimeoutVar, time() + $this->authTimeout);
+			}
+		}
+	}
+
+	/**
+	 * Checks whether the user has access to the specified operation.
+	 * @param $operator
+	 * @param array $params
+	 * @return bool
+	 * @todo
+	 */
+	public function checkAccess($operation, $params = array())
+	{
+		$auth = Yii::$app->getAuthManager();
+		if ($auth !== null) {
+			return $auth->checkAccess($this->getId(), $operation, $params);
+		} else {
+			return false;
+		}
+	}
+}
diff --git a/yii/web/UserEvent.php b/yii/web/UserEvent.php
new file mode 100644
index 0000000..4e39380
--- /dev/null
+++ b/yii/web/UserEvent.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use yii\base\Event;
+
+/**
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class UserEvent extends Event
+{
+	/**
+	 * @var Identity the identity object associated with this event
+	 */
+	public $identity;
+	/**
+	 * @var boolean whether the login is cookie-based. This property is only meaningful
+	 * for [[User::EVENT_BEFORE_LOGIN]] and [[User::EVENT_AFTER_LOGIN]] events.
+	 */
+	public $cookieBased;
+	/**
+	 * @var boolean whether the login or logout should proceed.
+	 * Event handlers may modify this property to determine whether the login or logout should proceed.
+	 * This property is only meaningful for [[User::EVENT_BEFORE_LOGIN]] and [[User::EVENT_BEFORE_LOGOUT]] events.
+	 */
+	public $isValid = true;
+}
diff --git a/yii/widgets/ActiveField.php b/yii/widgets/ActiveField.php
new file mode 100644
index 0000000..9f3f201
--- /dev/null
+++ b/yii/widgets/ActiveField.php
@@ -0,0 +1,544 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+namespace yii\widgets;
+
+use yii\base\Component;
+use yii\db\ActiveRecord;
+use yii\helpers\Html;
+use yii\base\Model;
+use yii\web\JsExpression;
+
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class ActiveField extends Component
+{
+	/**
+	 * @var ActiveForm the form that this field is associated with.
+	 */
+	public $form;
+	/**
+	 * @var Model the data model that this field is associated with
+	 */
+	public $model;
+	/**
+	 * @var string the model attribute that this field is associated with
+	 */
+	public $attribute;
+	/**
+	 * @var string the tag name for the field container.
+	 */
+	public $tag = 'div';
+	/**
+	 * @var array the HTML attributes (name-value pairs) for the field container tag.
+	 * The values will be HTML-encoded using [[Html::encode()]].
+	 * If a value is null, the corresponding attribute will not be rendered.
+	 */
+	public $options = array(
+		'class' => 'control-group',
+	);
+	/**
+	 * @var string the template that is used to arrange the label, the input and the error message.
+	 * The following tokens will be replaced when [[render()]] is called: `{label}`, `{input}` and `{error}`.
+	 */
+	public $template = "{label}\n<div class=\"controls\">\n{input}\n{error}\n</div>";
+	/**
+	 * @var array the default options for the input tags. The parameter passed to individual input methods
+	 * (e.g. [[textInput()]]) will be merged with this property when rendering the input tag.
+	 */
+	public $inputOptions = array();
+	/**
+	 * @var array the default options for the error tags. The parameter passed to [[error()]] will be
+	 * merged with this property when rendering the error tag.
+	 */
+	public $errorOptions = array('tag' => 'span', 'class' => 'help-inline');
+	/**
+	 * @var array the default options for the label tags. The parameter passed to [[label()]] will be
+	 * merged with this property when rendering the label tag.
+	 */
+	public $labelOptions = array('class' => 'control-label');
+	/**
+	 * @var boolean whether to enable client-side data validation.
+	 * If not set, it will take the value of [[ActiveForm::enableClientValidation]].
+	 */
+	public $enableClientValidation;
+	/**
+	 * @var boolean whether to enable AJAX-based data validation.
+	 * If not set, it will take the value of [[ActiveForm::enableAjaxValidation]].
+	 */
+	public $enableAjaxValidation;
+	/**
+	 * @var boolean whether to perform validation when the input field loses focus and its value is found changed.
+	 * If not set, it will take the value of [[ActiveForm::validateOnChange]].
+	 */
+	public $validateOnChange;
+	/**
+	 * @var boolean whether to perform validation while the user is typing in the input field.
+	 * If not set, it will take the value of [[ActiveForm::validateOnType]].
+	 * @see validationDelay
+	 */
+	public $validateOnType;
+	/**
+	 * @var integer number of milliseconds that the validation should be delayed when the input field
+	 * is changed or the user types in the field.
+	 * If not set, it will take the value of [[ActiveForm::validationDelay]].
+	 */
+	public $validationDelay;
+	/**
+	 * @var array the jQuery selectors for selecting the container, input and error tags.
+	 * The array keys should be "container", "input", and/or "error", and the array values
+	 * are the corresponding selectors. For example, `array('input' => '#my-input')`.
+	 *
+	 * The container selector is used under the context of the form, while the input and the error
+	 * selectors are used under the context of the container.
+	 *
+	 * You normally do not need to set this property as the default selectors should work well for most cases.
+	 */
+	public $selectors;
+
+	public function begin()
+	{
+		$options = $this->getClientOptions();
+		if (!empty($options)) {
+			$this->form->attributes[$this->attribute] = $options;
+		}
+
+		$inputID = Html::getInputId($this->model, $this->attribute);
+		$attribute = Html::getAttributeName($this->attribute);
+		$options = $this->options;
+		$class = isset($options['class']) ? array($options['class']) : array();
+		$class[] = "field-$inputID";
+		if ($this->model->isAttributeRequired($attribute)) {
+			$class[] = $this->form->requiredCssClass;
+		}
+		if ($this->model->hasErrors($attribute)) {
+			$class[] = $this->form->errorCssClass;
+		}
+		$options['class'] = implode(' ', $class);
+
+		return Html::beginTag($this->tag, $options);
+	}
+
+	public function end()
+	{
+		return Html::endTag($this->tag);
+	}
+
+	protected function getClientOptions()
+	{
+		$enableClientValidation = $this->enableClientValidation || $this->enableClientValidation === null && $this->form->enableClientValidation;
+		$enableAjaxValidation = $this->enableAjaxValidation || $this->enableAjaxValidation === null && $this->form->enableAjaxValidation;
+		if ($enableClientValidation) {
+			$attribute = Html::getAttributeName($this->attribute);
+			$validators = array();
+			foreach ($this->model->getActiveValidators($attribute) as $validator) {
+				/** @var \yii\validators\Validator $validator */
+				$js = $validator->clientValidateAttribute($this->model, $attribute);
+				if ($validator->enableClientValidation && $js != '') {
+					$validators[] = $js;
+				}
+			}
+			if (!empty($validators)) {
+				$options['validate'] = new JsExpression("function(attribute,value,messages){" . implode('', $validators) . '}');
+			}
+		}
+
+		if ($enableAjaxValidation) {
+			$options['enableAjaxValidation'] = 1;
+		}
+
+		if ($enableClientValidation && !empty($options['validate']) || $enableAjaxValidation) {
+			$inputID = Html::getInputId($this->model, $this->attribute);
+			$options['name'] = $inputID;
+			$names = array(
+				'validateOnChange',
+				'validateOnType',
+				'validationDelay',
+			);
+			foreach ($names as $name) {
+				$options[$name] = $this->$name === null ? $this->form->$name : $this->$name;
+			}
+			$options['container'] = isset($this->selectors['container']) ? $this->selectors['container'] : ".field-$inputID";
+			$options['input'] = isset($this->selectors['input']) ? $this->selectors['input'] : "#$inputID";
+			if (isset($this->errorOptions['class'])) {
+				$options['error'] = '.' . implode('.', preg_split('/\s+/', $this->errorOptions['class'], -1, PREG_SPLIT_NO_EMPTY));
+			} else {
+				$options['error'] = isset($this->errorOptions['tag']) ? $this->errorOptions['tag'] : 'span';
+			}
+			return $options;
+		} else {
+			return array();
+		}
+	}
+
+	/**
+	 * Generates a label tag for [[attribute]].
+	 * The label text is the label associated with the attribute, obtained via [[Model::getAttributeLabel()]].
+	 * @param array $options the tag options in terms of name-value pairs. It will be merged with [[labelOptions]].
+	 * The options will be rendered as the attributes of the resulting tag. The values will be HTML-encoded
+	 * using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
+	 *
+	 * The following options are specially handled:
+	 *
+	 * - label: this specifies the label to be displayed. Note that this will NOT be [[encoded()]].
+	 *   If this is not set, [[Model::getAttributeLabel()]] will be called to get the label for display
+	 *   (after encoding).
+	 *
+	 * @return string the generated label tag
+	 */
+	public function label($options = array())
+	{
+		$options = array_merge($this->labelOptions, $options);
+		return Html::activeLabel($this->model, $this->attribute, $options);
+	}
+
+	/**
+	 * Generates a tag that contains the first validation error of [[attribute]].
+	 * Note that even if there is no validation error, this method will still return an empty error tag.
+	 * @param array $options the tag options in terms of name-value pairs. It will be merged with [[errorOptions]].
+	 * The options will be rendered as the attributes of the resulting tag. The values will be HTML-encoded
+	 * using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
+	 *
+	 * The following options are specially handled:
+	 *
+	 * - tag: this specifies the tag name. If not set, "span" will be used.
+	 *
+	 * @return string the generated label tag
+	 */
+	public function error($options = array())
+	{
+		$options = array_merge($this->errorOptions, $options);
+		$attribute = Html::getAttributeName($this->attribute);
+		$error = $this->model->getFirstError($attribute);
+		$tag = isset($options['tag']) ? $options['tag'] : 'span';
+		unset($options['tag']);
+		return Html::tag($tag, Html::encode($error), $options);
+	}
+
+	/**
+	 * Renders the field with the given input HTML.
+	 * This method will generate the label and error tags, and return them together with the given
+	 * input HTML according to [[template]].
+	 * @param string $input the input HTML
+	 * @return string the rendering result
+	 */
+	public function render($input)
+	{
+		return $this->begin() . "\n" . strtr($this->template, array(
+			'{input}' => $input,
+			'{label}' => $this->label(),
+			'{error}' => $this->error(),
+		)) . "\n" . $this->end();
+	}
+
+	/**
+	 * Generates an input tag for the given model attribute.
+	 * @param string $type the input type (e.g. 'text', 'password')
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * @return string the generated input tag
+	 */
+	public function input($type, $options = array())
+	{
+		$options = array_merge($this->inputOptions, $options);
+		return $this->render(Html::activeInput($type, $this->model, $this->attribute, $options));
+	}
+
+	/**
+	 * Generates a text input tag for the given model attribute.
+	 * This method will generate the "name" and "value" tag attributes automatically for the model attribute
+	 * unless they are explicitly specified in `$options`.
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * @return string the generated input tag
+	 */
+	public function textInput($options = array())
+	{
+		$options = array_merge($this->inputOptions, $options);
+		return $this->render(Html::activeTextInput($this->model, $this->attribute, $options));
+	}
+
+	/**
+	 * Generates a hidden input tag for the given model attribute.
+	 * This method will generate the "name" and "value" tag attributes automatically for the model attribute
+	 * unless they are explicitly specified in `$options`.
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * @return string the generated input tag
+	 */
+	public function hiddenInput($options = array())
+	{
+		$options = array_merge($this->inputOptions, $options);
+		return $this->render(Html::activeHiddenInput($this->model, $this->attribute, $options));
+	}
+
+	/**
+	 * Generates a password input tag for the given model attribute.
+	 * This method will generate the "name" and "value" tag attributes automatically for the model attribute
+	 * unless they are explicitly specified in `$options`.
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * @return string the generated input tag
+	 */
+	public function passwordInput($options = array())
+	{
+		$options = array_merge($this->inputOptions, $options);
+		return $this->render(Html::activePasswordInput($this->model, $this->attribute, $options));
+	}
+
+	/**
+	 * Generates a file input tag for the given model attribute.
+	 * This method will generate the "name" and "value" tag attributes automatically for the model attribute
+	 * unless they are explicitly specified in `$options`.
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * @return string the generated input tag
+	 */
+	public function fileInput($options = array())
+	{
+		$options = array_merge($this->inputOptions, $options);
+		return $this->render(Html::activeFileInput($this->model, $this->attribute, $options));
+	}
+
+	/**
+	 * Generates a textarea tag for the given model attribute.
+	 * The model attribute value will be used as the content in the textarea.
+	 * @param array $options the tag options in terms of name-value pairs. These will be rendered as
+	 * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]].
+	 * @return string the generated textarea tag
+	 */
+	public function textarea($options = array())
+	{
+		$options = array_merge($this->inputOptions, $options);
+		return $this->render(Html::activeTextarea($this->model, $this->attribute, $options));
+	}
+
+	/**
+	 * Generates a radio button tag for the given model attribute.
+	 * This method will generate the "name" tag attribute automatically unless it is explicitly specified in `$options`.
+	 * This method will generate the "checked" tag attribute according to the model attribute value.
+	 * @param array $options the tag options in terms of name-value pairs. The following options are specially handled:
+	 *
+	 * - uncheck: string, the value associated with the uncheck state of the radio button. If not set,
+	 *   it will take the default value '0'. This method will render a hidden input so that if the radio button
+	 *   is not checked and is submitted, the value of this attribute will still be submitted to the server
+	 *   via the hidden input.
+	 *
+	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will
+	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
+	 * @param boolean $enclosedByLabel whether to enclose the radio within the label.
+	 * If true, the method will still use [[template]] to layout the checkbox and the error message
+	 * except that the radio is enclosed by the label tag.
+	 * @return string the generated radio button tag
+	 */
+	public function radio($options = array(), $enclosedByLabel = true)
+	{
+		$options = array_merge($this->inputOptions, $options);
+		if ($enclosedByLabel) {
+			$hidden = '';
+			$radio = Html::activeRadio($this->model, $this->attribute, $options);
+			if (($pos = strpos($radio, '><')) !== false) {
+				$hidden = substr($radio, 0, $pos + 1);
+				$radio = substr($radio, $pos + 1);
+			}
+			$label = isset($this->labelOptions['label']) ? $this->labelOptions['label'] : Html::encode($this->model->getAttributeLabel($this->attribute));
+			return $this->begin() . "\n" . $hidden . strtr($this->template, array(
+				'{input}' => Html::label("$radio $label", null, array('class' => 'radio')),
+				'{label}' => '',
+				'{error}' => $this->error(),
+			)) . "\n" . $this->end();
+		} else {
+			return $this->render(Html::activeRadio($this->model, $this->attribute, $options));
+		}
+	}
+
+	/**
+	 * Generates a checkbox tag for the given model attribute.
+	 * This method will generate the "name" tag attribute automatically unless it is explicitly specified in `$options`.
+	 * This method will generate the "checked" tag attribute according to the model attribute value.
+	 * @param array $options the tag options in terms of name-value pairs. The following options are specially handled:
+	 *
+	 * - uncheck: string, the value associated with the uncheck state of the radio button. If not set,
+	 *   it will take the default value '0'. This method will render a hidden input so that if the radio button
+	 *   is not checked and is submitted, the value of this attribute will still be submitted to the server
+	 *   via the hidden input.
+	 *
+	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will
+	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
+	 * @param boolean $enclosedByLabel whether to enclose the checkbox within the label.
+	 * If true, the method will still use [[template]] to layout the checkbox and the error message
+	 * except that the checkbox is enclosed by the label tag.
+	 * @return string the generated checkbox tag
+	 */
+	public function checkbox($options = array(), $enclosedByLabel = true)
+	{
+		$options = array_merge($this->inputOptions, $options);
+		if ($enclosedByLabel) {
+			$hidden = '';
+			$checkbox = Html::activeCheckbox($this->model, $this->attribute, $options);
+			if (($pos = strpos($checkbox, '><')) !== false) {
+				$hidden = substr($checkbox, 0, $pos + 1);
+				$checkbox = substr($checkbox, $pos + 1);
+			}
+			$label = isset($this->labelOptions['label']) ? $this->labelOptions['label'] : Html::encode($this->model->getAttributeLabel($this->attribute));
+			return $this->begin() . "\n" . $hidden . strtr($this->template, array(
+				'{input}' => Html::label("$checkbox $label", null, array('class' => 'checkbox')),
+				'{label}' => '',
+				'{error}' => $this->error(),
+			)) . "\n" . $this->end();
+		} else {
+			return $this->render(Html::activeCheckbox($this->model, $this->attribute, $options));
+		}
+	}
+
+	/**
+	 * Generates a drop-down list for the given model attribute.
+	 * The selection of the drop-down list is taken from the value of the model attribute.
+	 * @param array $items the option data items. The array keys are option values, and the array values
+	 * are the corresponding option labels. The array can also be nested (i.e. some array values are arrays too).
+	 * For each sub-array, an option group will be generated whose label is the key associated with the sub-array.
+	 * If you have a list of data models, you may convert them into the format described above using
+	 * [[\yii\helpers\ArrayHelper::map()]].
+	 *
+	 * Note, the values and labels will be automatically HTML-encoded by this method, and the blank spaces in
+	 * the labels will also be HTML-encoded.
+	 * @param array $options the tag options in terms of name-value pairs. The following options are specially handled:
+	 *
+	 * - prompt: string, a prompt text to be displayed as the first option;
+	 * - options: array, the attributes for the select option tags. The array keys must be valid option values,
+	 *   and the array values are the extra attributes for the corresponding option tags. For example,
+	 *
+	 * ~~~
+	 * array(
+	 *     'value1' => array('disabled' => true),
+	 *     'value2' => array('label' => 'value 2'),
+	 * );
+	 * ~~~
+	 *
+	 * - groups: array, the attributes for the optgroup tags. The structure of this is similar to that of 'options',
+	 *   except that the array keys represent the optgroup labels specified in $items.
+	 *
+	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will
+	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
+	 *
+	 * @return string the generated drop-down list tag
+	 */
+	public function dropDownList($items, $options = array())
+	{
+		$options = array_merge($this->inputOptions, $options);
+		return $this->render(Html::activeDropDownList($this->model, $this->attribute, $items, $options));
+	}
+
+	/**
+	 * Generates a list box.
+	 * The selection of the list box is taken from the value of the model attribute.
+	 * @param array $items the option data items. The array keys are option values, and the array values
+	 * are the corresponding option labels. The array can also be nested (i.e. some array values are arrays too).
+	 * For each sub-array, an option group will be generated whose label is the key associated with the sub-array.
+	 * If you have a list of data models, you may convert them into the format described above using
+	 * [[\yii\helpers\ArrayHelper::map()]].
+	 *
+	 * Note, the values and labels will be automatically HTML-encoded by this method, and the blank spaces in
+	 * the labels will also be HTML-encoded.
+	 * @param array $options the tag options in terms of name-value pairs. The following options are specially handled:
+	 *
+	 * - prompt: string, a prompt text to be displayed as the first option;
+	 * - options: array, the attributes for the select option tags. The array keys must be valid option values,
+	 *   and the array values are the extra attributes for the corresponding option tags. For example,
+	 *
+	 * ~~~
+	 * array(
+	 *     'value1' => array('disabled' => true),
+	 *     'value2' => array('label' => 'value 2'),
+	 * );
+	 * ~~~
+	 *
+	 * - groups: array, the attributes for the optgroup tags. The structure of this is similar to that of 'options',
+	 *   except that the array keys represent the optgroup labels specified in $items.
+	 * - unselect: string, the value that will be submitted when no option is selected.
+	 *   When this attribute is set, a hidden field will be generated so that if no option is selected in multiple
+	 *   mode, we can still obtain the posted unselect value.
+	 *
+	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will
+	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
+	 *
+	 * @return string the generated list box tag
+	 */
+	public function listBox($items, $options = array())
+	{
+		$options = array_merge($this->inputOptions, $options);
+		return $this->render(Html::activeListBox($this->model, $this->attribute, $items, $options));
+	}
+
+	/**
+	 * Generates a list of checkboxes.
+	 * A checkbox list allows multiple selection, like [[listBox()]].
+	 * As a result, the corresponding submitted value is an array.
+	 * The selection of the checkbox list is taken from the value of the model attribute.
+	 * @param array $items the data item used to generate the checkboxes.
+	 * The array keys are the labels, while the array values are the corresponding checkbox values.
+	 * Note that the labels will NOT be HTML-encoded, while the values will.
+	 * @param array $options options (name => config) for the checkbox list. The following options are specially handled:
+	 *
+	 * - unselect: string, the value that should be submitted when none of the checkboxes is selected.
+	 *   By setting this option, a hidden input will be generated.
+	 * - separator: string, the HTML code that separates items.
+	 * - item: callable, a callback that can be used to customize the generation of the HTML code
+	 *   corresponding to a single item in $items. The signature of this callback must be:
+	 *
+	 * ~~~
+	 * function ($index, $label, $name, $checked, $value)
+	 * ~~~
+	 *
+	 * where $index is the zero-based index of the checkbox in the whole list; $label
+	 * is the label for the checkbox; and $name, $value and $checked represent the name,
+	 * value and the checked status of the checkbox input.
+	 * @return string the generated checkbox list
+	 */
+	public function checkboxList($items, $options = array())
+	{
+		return $this->render(
+			'<div id="' . Html::getInputId($this->model, $this->attribute) . '">'
+			. Html::activeCheckboxList($this->model, $this->attribute, $items, $options)
+			. '</div>'
+		);
+	}
+
+	/**
+	 * Generates a list of radio buttons.
+	 * A radio button list is like a checkbox list, except that it only allows single selection.
+	 * The selection of the radio buttons is taken from the value of the model attribute.
+	 * @param array $items the data item used to generate the radio buttons.
+	 * The array keys are the labels, while the array values are the corresponding radio button values.
+	 * Note that the labels will NOT be HTML-encoded, while the values will.
+	 * @param array $options options (name => config) for the radio button list. The following options are specially handled:
+	 *
+	 * - unselect: string, the value that should be submitted when none of the radio buttons is selected.
+	 *   By setting this option, a hidden input will be generated.
+	 * - separator: string, the HTML code that separates items.
+	 * - item: callable, a callback that can be used to customize the generation of the HTML code
+	 *   corresponding to a single item in $items. The signature of this callback must be:
+	 *
+	 * ~~~
+	 * function ($index, $label, $name, $checked, $value)
+	 * ~~~
+	 *
+	 * where $index is the zero-based index of the radio button in the whole list; $label
+	 * is the label for the radio button; and $name, $value and $checked represent the name,
+	 * value and the checked status of the radio button input.
+	 * @return string the generated radio button list
+	 */
+	public function radioList($items, $options = array())
+	{
+		return $this->render(
+			'<div id="' . Html::getInputId($this->model, $this->attribute) . '">'
+			. Html::activeRadioList($this->model, $this->attribute, $items, $options)
+			. '</div>'
+		);
+	}
+}
diff --git a/yii/widgets/ActiveForm.php b/yii/widgets/ActiveForm.php
new file mode 100644
index 0000000..24451b9
--- /dev/null
+++ b/yii/widgets/ActiveForm.php
@@ -0,0 +1,229 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\widgets;
+
+use Yii;
+use yii\base\Widget;
+use yii\base\Model;
+use yii\helpers\Html;
+use yii\helpers\Json;
+
+/**
+ * ActiveForm ...
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class ActiveForm extends Widget
+{
+	/**
+	 * @param array|string $action the form action URL. This parameter will be processed by [[\yii\helpers\Html::url()]].
+	 */
+	public $action = '';
+	/**
+	 * @var string the form submission method. This should be either 'post' or 'get'.
+	 * Defaults to 'post'.
+	 */
+	public $method = 'post';
+	/**
+	 * @var array the HTML attributes (name-value pairs) for the form tag.
+	 * The values will be HTML-encoded using [[Html::encode()]].
+	 * If a value is null, the corresponding attribute will not be rendered.
+	 */
+	public $options = array();
+	/**
+	 * @var array the default configuration used by [[field()]] when creating a new field object.
+	 */
+	public $fieldConfig;
+	/**
+	 * @var string the default CSS class for the error summary container.
+	 * @see errorSummary()
+	 */
+	public $errorSummaryCssClass = 'error-summary';
+	/**
+	 * @var string the CSS class that is added to a field container when the associated attribute is required.
+	 */
+	public $requiredCssClass = 'required';
+	/**
+	 * @var string the CSS class that is added to a field container when the associated attribute has validation error.
+	 */
+	public $errorCssClass = 'error';
+	/**
+	 * @var string the CSS class that is added to a field container when the associated attribute is successfully validated.
+	 */
+	public $successCssClass = 'success';
+	/**
+	 * @var string the CSS class that is added to a field container when the associated attribute is being validated.
+	 */
+	public $validatingCssClass = 'validating';
+	/**
+	 * @var boolean whether to enable client-side data validation.
+	 * If [[ActiveField::enableClientValidation]] is set, its value will take precedence for that input field.
+	 */
+	public $enableClientValidation = true;
+	/**
+	 * @var boolean whether to enable AJAX-based data validation.
+	 * If [[ActiveField::enableAjaxValidation]] is set, its value will take precedence for that input field.
+	 */
+	public $enableAjaxValidation = false;
+	/**
+	 * @var array|string the URL for performing AJAX-based validation. This property will be processed by
+	 * [[Html::url()]]. Please refer to [[Html::url()]] for more details on how to configure this property.
+	 * If this property is not set, it will take the value of the form's action attribute.
+	 */
+	public $validationUrl;
+	/**
+	 * @var boolean whether to perform validation when the form is submitted.
+	 */
+	public $validateOnSubmit = true;
+	/**
+	 * @var boolean whether to perform validation when an input field loses focus and its value is found changed.
+	 * If [[ActiveField::validateOnChange]] is set, its value will take precedence for that input field.
+	 */
+	public $validateOnChange = true;
+	/**
+	 * @var boolean whether to perform validation while the user is typing in an input field.
+	 * If [[ActiveField::validateOnType]] is set, its value will take precedence for that input field.
+	 * @see validationDelay
+	 */
+	public $validateOnType = false;
+	/**
+	 * @var integer number of milliseconds that the validation should be delayed when an input field
+	 * is changed or the user types in the field.
+	 * If [[ActiveField::validationDelay]] is set, its value will take precedence for that input field.
+	 */
+	public $validationDelay = 200;
+	/**
+	 * @var string the name of the GET parameter indicating the validation request is an AJAX request.
+	 */
+	public $ajaxVar = 'ajax';
+	/**
+	 * @var array the client validation options for individual attributes. Each element of the array
+	 * represents the validation options for a particular attribute.
+	 * @internal
+	 */
+	public $attributes = array();
+
+	/**
+	 * Initializes the widget.
+	 * This renders the form open tag.
+	 */
+	public function init()
+	{
+		if (!isset($this->options['id'])) {
+			$this->options['id'] = $this->getId();
+		}
+		if (!isset($this->fieldConfig['class'])) {
+			$this->fieldConfig['class'] = 'yii\widgets\ActiveField';
+		}
+		echo Html::beginForm($this->action, $this->method, $this->options);
+	}
+
+	/**
+	 * Runs the widget.
+	 * This registers the necessary javascript code and renders the form close tag.
+	 */
+	public function run()
+	{
+		if (!empty($this->attributes)) {
+			$id = $this->options['id'];
+			$options = Json::encode($this->getClientOptions());
+			$attributes = Json::encode($this->attributes);
+			$this->view->registerAssetBundle('yii/form');
+			$this->view->registerJs("jQuery('#$id').yiiActiveForm($attributes, $options);");
+		}
+		echo Html::endForm();
+	}
+
+	/**
+	 * Returns the options for the form JS widget.
+	 * @return array the options
+	 */
+	protected function getClientOptions()
+	{
+		$options = array(
+			'errorSummary' => '.' . $this->errorSummaryCssClass,
+			'validateOnSubmit' => $this->validateOnSubmit,
+			'errorCssClass' => $this->errorCssClass,
+			'successCssClass' => $this->successCssClass,
+			'validatingCssClass' => $this->validatingCssClass,
+			'ajaxVar' => $this->ajaxVar,
+		);
+		if ($this->validationUrl !== null) {
+			$options['validationUrl'] = Html::url($this->validationUrl);
+		}
+		return $options;
+	}
+
+	/**
+	 * Generates a summary of the validation errors.
+	 * If there is no validation error, an empty error summary markup will still be generated, but it will be hidden.
+	 * @param Model|Model[] $models the model(s) associated with this form
+	 * @param array $options the tag options in terms of name-value pairs. The following options are specially handled:
+	 *
+	 * - header: string, the header HTML for the error summary. If not set, a default prompt string will be used.
+	 * - footer: string, the footer HTML for the error summary.
+	 *
+	 * The rest of the options will be rendered as the attributes of the container tag. The values will
+	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
+	 * @return string the generated error summary
+	 */
+	public function errorSummary($models, $options = array())
+	{
+		if (!is_array($models)) {
+			$models = array($models);
+		}
+
+		$lines = array();
+		foreach ($models as $model) {
+			/** @var $model Model */
+			foreach ($model->getFirstErrors() as $error) {
+				$lines[] = Html::encode($error);
+			}
+		}
+
+		$header = isset($options['header']) ? $options['header'] : '<p>' . Yii::t('yii|Please fix the following errors:') . '</p>';
+		$footer = isset($options['footer']) ? $options['footer'] : '';
+		unset($options['header'], $options['footer']);
+
+		if (!isset($options['class'])) {
+			$options['class'] = $this->errorSummaryCssClass;
+		} else {
+			$options['class'] .= ' ' . $this->errorSummaryCssClass;
+		}
+
+		if (!empty($lines)) {
+			$content = "<ul><li>" . implode("</li>\n<li>", $lines) . "</li><ul>";
+			return Html::tag('div', $header . $content . $footer, $options);
+		} else {
+			$content = "<ul></ul>";
+			$options['style'] = isset($options['style']) ? rtrim($options['style'], ';') . '; display:none' : 'display:none';
+			return Html::tag('div', $header . $content . $footer, $options);
+		}
+	}
+
+	/**
+	 * Generates a form field.
+	 * A form field is associated with a model and an attribute. It contains a label, an input and an error message
+	 * and use them to interact with end users to collect their inputs for the attribute.
+	 * @param Model $model the data model
+	 * @param string $attribute the attribute name or expression. See [[Html::getAttributeName()]] for the format
+	 * about attribute expression.
+	 * @param array $options the additional configurations for the field object
+	 * @return ActiveField the created ActiveField object
+	 * @see fieldConfig
+	 */
+	public function field($model, $attribute, $options = array())
+	{
+		return Yii::createObject(array_merge($this->fieldConfig, $options, array(
+			'model' => $model,
+			'attribute' => $attribute,
+			'form' => $this,
+		)));
+	}
+}
diff --git a/yii/widgets/Block.php b/yii/widgets/Block.php
new file mode 100644
index 0000000..fdd210f
--- /dev/null
+++ b/yii/widgets/Block.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\widgets;
+
+use yii\base\Widget;
+
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Block extends Widget
+{
+	/**
+	 * @var string the ID of this block.
+	 */
+	public $id;
+	/**
+	 * @var boolean whether to render the block content in place. Defaults to false,
+	 * meaning the captured block content will not be displayed.
+	 */
+	public $renderInPlace = false;
+
+	/**
+	 * Starts recording a block.
+	 */
+	public function init()
+	{
+		ob_start();
+		ob_implicit_flush(false);
+	}
+
+	/**
+	 * Ends recording a block.
+	 * This method stops output buffering and saves the rendering result as a named block in the controller.
+	 */
+	public function run()
+	{
+		$block = ob_get_clean();
+		if ($this->renderInPlace) {
+			echo $block;
+		}
+		$this->view->blocks[$this->id] = $block;
+	}
+}
diff --git a/yii/widgets/Breadcrumbs.php b/yii/widgets/Breadcrumbs.php
new file mode 100644
index 0000000..22d09b3
--- /dev/null
+++ b/yii/widgets/Breadcrumbs.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\widgets;
+
+use Yii;
+use yii\base\Widget;
+use yii\base\InvalidConfigException;
+use yii\helpers\Html;
+
+/**
+ * Breadcrumbs displays a list of links indicating the position of the current page in the whole site hierarchy.
+ *
+ * For example, breadcrumbs like "Home / Sample Post / Edit" means the user is viewing an edit page
+ * for the "Sample Post". He can click on "Sample Post" to view that page, or he can click on "Home"
+ * to return to the homepage.
+ *
+ * To use Breadcrumbs, you need to configure its [[links]] property, which specifiesthe links to be displayed. For example,
+ *
+ * ~~~
+ * $this->widget('yii\widgets\Breadcrumbs', array(
+ *     'links' => array(
+ *         array('label' => 'Sample Post', 'url' => array('post/edit', 'id' => 1)),
+ *         'Edit',
+ *     ),
+ * ));
+ * ~~~
+ *
+ * Because breadcrumbs usually appears in nearly every page of a website, you may consider place it in a layout view.
+ * You can then use a view parameter (e.g. `$this->params['breadcrumbs']`) to configure the links in different
+ * views. In the layout view, you assign this view parameter to the [[links]] property like the following:
+ *
+ * ~~~
+ * $this->widget('yii\widgets\Breadcrumbs', array(
+ *     'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : array(),
+ * ));
+ * ~~~
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Breadcrumbs extends Widget
+{
+	/**
+	 * @var string the name of the breadcrumb container tag.
+	 */
+	public $tag = 'ul';
+	/**
+	 * @var array the HTML attributes for the breadcrumb container tag.
+	 */
+	public $options = array('class' => 'breadcrumb');
+	/**
+	 * @var boolean whether to HTML-encode the link labels.
+	 */
+	public $encodeLabels = true;
+	/**
+	 * @var string the first hyperlink in the breadcrumbs (called home link).
+	 * If this property is not set, it will default to a link pointing to [[\yii\web\Application::homeUrl]]
+	 * with the label 'Home'. If this property is false, the home link will not be rendered.
+	 */
+	public $homeLink;
+	/**
+	 * @var array list of links to appear in the breadcrumbs. If this property is empty,
+	 * the widget will not render anything. Each array element represents a single link in the breadcrumbs
+	 * with the following structure:
+	 *
+	 * ~~~
+	 * array(
+	 *     'label' => 'label of the link',  // required
+	 *     'url' => 'url of the link',      // optional, will be processed by Html::url()
+	 * )
+	 * ~~~
+	 *
+	 * If a link is active, you only need to specify its "label", and instead of writing `array('label' => $label)`,
+	 * you should simply use `$label`.
+	 */
+	public $links = array();
+	/**
+	 * @var string the template used to render each inactive item in the breadcrumbs. The token `{link}`
+	 * will be replaced with the actual HTML link for each inactive item.
+	 */
+	public $itemTemplate = "<li>{link} <span class=\"divider\">/</span></li>\n";
+	/**
+	 * @var string the template used to render each active item in the breadcrumbs. The token `{link}`
+	 * will be replaced with the actual HTML link for each active item.
+	 */
+	public $activeItemTemplate = "<li class=\"active\">{link}</li>\n";
+
+	/**
+	 * Renders the widget.
+	 */
+	public function run()
+	{
+		if (empty($this->links)) {
+			return;
+		}
+		$links = array();
+		if ($this->homeLink === null) {
+			$links[] = $this->renderItem(array(
+				'label' => Yii::t('yii|Home'),
+				'url' => Yii::$app->homeUrl,
+			), $this->itemTemplate);
+		} elseif ($this->homeLink !== false) {
+			$links[] = $this->renderItem($this->homeLink, $this->itemTemplate);
+		}
+		foreach ($this->links as $link) {
+			if (!is_array($link)) {
+				$link = array('label' => $link);
+			}
+			$links[] = $this->renderItem($link, isset($link['url']) ? $this->itemTemplate : $this->activeItemTemplate);
+		}
+		echo Html::tag($this->tag, implode('', $links), $this->options);
+	}
+
+	/**
+	 * Renders a single breadcrumb item.
+	 * @param array $link the link to be rendered. It must contain the "label" element. The "url" element is optional.
+	 * @param string $template the template to be used to rendered the link. The token "{link}" will be replaced by the link.
+	 * @return string the rendering result
+	 * @throws InvalidConfigException if `$link` does not have "label" element.
+	 */
+	protected function renderItem($link, $template)
+	{
+		if (isset($link['label'])) {
+			$label = $this->encodeLabels ? Html::encode($link['label']) : $link['label'];
+		} else {
+			throw new InvalidConfigException('The "label" element is required for each link.');
+		}
+		if (isset($link['url'])) {
+			return strtr($template, array('{link}' => Html::a($label, $link['url'])));
+		} else {
+			return strtr($template, array('{link}' => $label));
+		}
+	}
+}
diff --git a/yii/widgets/Captcha.php b/yii/widgets/Captcha.php
new file mode 100644
index 0000000..918e30c
--- /dev/null
+++ b/yii/widgets/Captcha.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\widgets;
+
+use Yii;
+use yii\base\InvalidConfigException;
+use yii\base\Widget;
+use yii\helpers\Html;
+use yii\helpers\Json;
+use yii\web\CaptchaAction;
+
+/**
+ * Captcha renders a CAPTCHA image element.
+ *
+ * Captcha is used together with [[CaptchaAction]] provide [CAPTCHA](http://en.wikipedia.org/wiki/Captcha)
+ * - a way of preventing Website spamming.
+ *
+ * The image element rendered by Captcha will display a CAPTCHA image generated by
+ * an action whose route is specified by [[captchaAction]]. This action must be an instance of [[CaptchaAction]].
+ *
+ * When the user clicks on the CAPTCHA image, it will cause the CAPTCHA image
+ * to be refreshed with a new CAPTCHA.
+ *
+ * You may use [[\yii\validators\CaptchaValidator]] to validate the user input matches
+ * the current CAPTCHA verification code.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Captcha extends Widget
+{
+	/**
+	 * @var string the route of the action that generates the CAPTCHA images.
+	 * The action represented by this route must be an action of [[CaptchaAction]].
+	 */
+	public $captchaAction = 'site/captcha';
+	/**
+	 * @var array HTML attributes to be applied to the rendered image element.
+	 */
+	public $options = array();
+
+
+	/**
+	 * Renders the widget.
+	 */
+	public function run()
+	{
+		$this->checkRequirements();
+
+		if (!isset($this->options['id'])) {
+			$this->options['id'] = $this->getId();
+		}
+		$id = $this->options['id'];
+		$options = Json::encode($this->getClientOptions());
+		$this->view->registerAssetBundle('yii/captcha');
+		$this->view->registerJs("jQuery('#$id').yiiCaptcha($options);");
+		$url = Yii::$app->getUrlManager()->createUrl($this->captchaAction, array('v' => uniqid()));
+		echo Html::img($url, $this->options);
+	}
+
+	/**
+	 * Returns the options for the captcha JS widget.
+	 * @return array the options
+	 */
+	protected function getClientOptions()
+	{
+		$options = array(
+			'refreshUrl' => Html::url(array($this->captchaAction, CaptchaAction::REFRESH_GET_VAR => 1)),
+			'hashKey' => "yiiCaptcha/{$this->captchaAction}",
+		);
+		return $options;
+	}
+
+	/**
+	 * Checks if there is graphic extension available to generate CAPTCHA images.
+	 * This method will check the existence of ImageMagick and GD extensions.
+	 * @return string the name of the graphic extension, either "imagick" or "gd".
+	 * @throws InvalidConfigException if neither ImageMagick nor GD is installed.
+	 */
+	public static function checkRequirements()
+	{
+		if (extension_loaded('imagick')) {
+			$imagick = new \Imagick();
+			$imagickFormats = $imagick->queryFormats('PNG');
+			if (in_array('PNG', $imagickFormats)) {
+				return 'imagick';
+			}
+		}
+		if (extension_loaded('gd')) {
+			$gdInfo = gd_info();
+			if (!empty($gdInfo['FreeType Support'])) {
+				return 'gd';
+			}
+		}
+		throw new InvalidConfigException('GD with FreeType or ImageMagick PHP extensions are required.');
+	}
+}
diff --git a/yii/widgets/ContentDecorator.php b/yii/widgets/ContentDecorator.php
new file mode 100644
index 0000000..3f63621
--- /dev/null
+++ b/yii/widgets/ContentDecorator.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\widgets;
+
+use yii\base\InvalidConfigException;
+use yii\base\Widget;
+
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class ContentDecorator extends Widget
+{
+	/**
+	 * @var string the view file that will be used to decorate the content enclosed by this widget.
+	 * This can be specified as either the view file path or path alias.
+	 */
+	public $viewFile;
+	/**
+	 * @var array the parameters (name=>value) to be extracted and made available in the decorative view.
+	 */
+	public $params = array();
+
+	/**
+	 * Starts recording a clip.
+	 */
+	public function init()
+	{
+		if ($this->viewFile === null) {
+			throw new InvalidConfigException('ContentDecorator::viewFile must be set.');
+		}
+		ob_start();
+		ob_implicit_flush(false);
+	}
+
+	/**
+	 * Ends recording a clip.
+	 * This method stops output buffering and saves the rendering result as a named clip in the controller.
+	 */
+	public function run()
+	{
+		$params = $this->params;
+		$params['content'] = ob_get_clean();
+		// render under the existing context
+		echo $this->view->renderFile($this->viewFile, $params);
+	}
+}
diff --git a/yii/widgets/FragmentCache.php b/yii/widgets/FragmentCache.php
new file mode 100644
index 0000000..aa24acd
--- /dev/null
+++ b/yii/widgets/FragmentCache.php
@@ -0,0 +1,174 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\widgets;
+
+use Yii;
+use yii\base\Widget;
+use yii\caching\Cache;
+use yii\caching\Dependency;
+
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class FragmentCache extends Widget
+{
+	/**
+	 * @var Cache|string the cache object or the application component ID of the cache object.
+	 * After the FragmentCache object is created, if you want to change this property,
+	 * you should only assign it with a cache object.
+	 */
+	public $cache = 'cache';
+	/**
+	 * @var integer number of seconds that the data can remain valid in cache.
+	 * Use 0 to indicate that the cached data will never expire.
+	 */
+	public $duration = 60;
+	/**
+	 * @var array|Dependency the dependency that the cached content depends on.
+	 * This can be either a [[Dependency]] object or a configuration array for creating the dependency object.
+	 * For example,
+	 *
+	 * ~~~
+	 * array(
+	 *     'class' => 'yii\caching\DbDependency',
+	 *     'sql' => 'SELECT MAX(lastModified) FROM Post',
+	 * )
+	 * ~~~
+	 *
+	 * would make the output cache depends on the last modified time of all posts.
+	 * If any post has its modification time changed, the cached content would be invalidated.
+	 */
+	public $dependency;
+	/**
+	 * @var array list of factors that would cause the variation of the content being cached.
+	 * Each factor is a string representing a variation (e.g. the language, a GET parameter).
+	 * The following variation setting will cause the content to be cached in different versions
+	 * according to the current application language:
+	 *
+	 * ~~~
+	 * array(
+	 *     Yii::$app->language,
+	 * )
+	 */
+	public $variations;
+	/**
+	 * @var boolean whether to enable the fragment cache. You may use this property to turn on and off
+	 * the fragment cache according to specific setting (e.g. enable fragment cache only for GET requests).
+	 */
+	public $enabled = true;
+	/**
+	 * @var array a list of placeholders for embedding dynamic contents. This property
+	 * is used internally to implement the content caching feature. Do not modify it.
+	 */
+	public $dynamicPlaceholders;
+
+	/**
+	 * Initializes the FragmentCache object.
+	 */
+	public function init()
+	{
+		parent::init();
+
+		if (!$this->enabled) {
+			$this->cache = null;
+		} elseif (is_string($this->cache)) {
+			$this->cache = Yii::$app->getComponent($this->cache);
+		}
+
+		if ($this->getCachedContent() === false) {
+			$this->view->cacheStack[] = $this;
+			ob_start();
+			ob_implicit_flush(false);
+		}
+	}
+
+	/**
+	 * Marks the end of content to be cached.
+	 * Content displayed before this method call and after {@link init()}
+	 * will be captured and saved in cache.
+	 * This method does nothing if valid content is already found in cache.
+	 */
+	public function run()
+	{
+		if (($content = $this->getCachedContent()) !== false) {
+			echo $content;
+		} elseif ($this->cache instanceof Cache) {
+			$content = ob_get_clean();
+			array_pop($this->view->cacheStack);
+			if (is_array($this->dependency)) {
+				$this->dependency = Yii::createObject($this->dependency);
+			}
+			$data = array($content, $this->dynamicPlaceholders);
+			$this->cache->set($this->calculateKey(), $data, $this->duration, $this->dependency);
+
+			if (empty($this->view->cacheStack) && !empty($this->dynamicPlaceholders)) {
+				$content = $this->updateDynamicContent($content, $this->dynamicPlaceholders);
+			}
+			echo $content;
+		}
+	}
+
+	/**
+	 * @var string|boolean the cached content. False if the content is not cached.
+	 */
+	private $_content;
+
+	/**
+	 * Returns the cached content if available.
+	 * @return string|boolean the cached content. False is returned if valid content is not found in the cache.
+	 */
+	public function getCachedContent()
+	{
+		if ($this->_content === null) {
+			$this->_content = false;
+			if ($this->cache instanceof Cache) {
+				$key = $this->calculateKey();
+				$data = $this->cache->get($key);
+				if (is_array($data) && count($data) === 2) {
+					list ($content, $placeholders) = $data;
+					if (is_array($placeholders) && count($placeholders) > 0) {
+						if (empty($this->view->cacheStack)) {
+							// outermost cache: replace placeholder with dynamic content
+							$content = $this->updateDynamicContent($content, $placeholders);
+						}
+						foreach ($placeholders as $name => $statements) {
+							$this->view->addDynamicPlaceholder($name, $statements);
+						}
+					}
+					$this->_content = $content;
+				}
+			}
+		}
+		return $this->_content;
+	}
+
+	protected function updateDynamicContent($content, $placeholders)
+	{
+		foreach ($placeholders as $name => $statements) {
+			$placeholders[$name] = $this->view->evaluateDynamicContent($statements);
+		}
+		return strtr($content, $placeholders);
+	}
+
+	/**
+	 * Generates a unique key used for storing the content in cache.
+	 * The key generated depends on both [[id]] and [[variations]].
+	 * @return string a valid cache key
+	 */
+	protected function calculateKey()
+	{
+		$factors = array(__CLASS__, $this->getId());
+		if (is_array($this->variations)) {
+			foreach ($this->variations as $factor) {
+				$factors[] = $factor;
+			}
+		}
+		return $this->cache->buildKey($factors);
+	}
+}
diff --git a/yii/widgets/Menu.php b/yii/widgets/Menu.php
new file mode 100644
index 0000000..b8f69e1
--- /dev/null
+++ b/yii/widgets/Menu.php
@@ -0,0 +1,287 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\widgets;
+
+use Yii;
+use yii\base\Widget;
+use yii\helpers\Html;
+
+/**
+ * Menu displays a multi-level menu using nested HTML lists.
+ *
+ * The main property of Menu is [[items]], which specifies the possible items in the menu.
+ * A menu item can contain sub-items which specify the sub-menu under that menu item.
+ * 
+ * Menu checks the current route and request parameters to toggle certain menu items
+ * with active state.
+ * 
+ * Note that Menu only renders the HTML tags about the menu. It does do any styling.
+ * You are responsible to provide CSS styles to make it look like a real menu.
+ *
+ * The following example shows how to use Menu:
+ * 
+ * ~~~
+ * $this->widget('yii\widgets\Menu', array(
+ *     'items' => array(
+ *         // Important: you need to specify url as 'controller/action',
+ *         // not just as 'controller' even if default acion is used.
+ *         array('label' => 'Home', 'url' => array('site/index')),
+ *         // 'Products' menu item will be selected as long as the route is 'product/index'
+ *         array('label' => 'Products', 'url' => array('product/index'), 'items' => array(
+ *             array('label' => 'New Arrivals', 'url' => array('product/index', 'tag' => 'new')),
+ *             array('label' => 'Most Popular', 'url' => array('product/index', 'tag' => 'popular')),
+ *         )),
+ *         array('label' => 'Login', 'url' => array('site/login'), 'visible' => Yii::app()->user->isGuest),
+ *     ),
+ * ));
+ * ~~~
+ * 
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class Menu extends Widget
+{
+	/**
+	 * @var array list of menu items. Each menu item should be an array of the following structure:
+	 *
+	 * - label: string, optional, specifies the menu item label. When [[encodeLabels]] is true, the label
+	 *   will be HTML-encoded. If the label is not specified, an empty string will be used.
+	 * - url: string or array, optional, specifies the URL of the menu item. It will be processed by [[Html::url]].
+	 *   When this is set, the actual menu item content will be generated using [[linkTemplate]];
+	 *   otherwise, [[labelTemplate]] will be used.
+	 * - visible: boolean, optional, whether this menu item is visible. Defaults to true.
+	 * - items: array, optional, specifies the sub-menu items. Its format is the same as the parent items.
+	 * - active: boolean, optional, whether this menu item is in active state (currently selected).
+	 *   If a menu item is active, its CSS class will be appended with [[activeCssClass]].
+	 *   If this option is not set, the menu item will be set active automatically when the current request
+	 *   is triggered by [[url]]. For more details, please refer to [[isItemActive()]].
+	 * - template: string, optional, the template used to render the content of this menu item.
+	 *   The token `{url}` will be replaced by the URL associated with this menu item,
+	 *   and the token `{label}` will be replaced by the label of the menu item.
+	 *   If this option is not set, [[linkTemplate]] or [[labelTemplate]] will be used instead. 
+	 */
+	public $items = array();
+	/**
+	 * @var string the template used to render the body of a menu which is a link.
+	 * In this template, the token `{url}` will be replaced with the corresponding link URL;
+	 * while `{label}` will be replaced with the link text.
+	 * This property will be overridden by the `template` option set in individual menu items via [[items]].
+	 */
+	public $linkTemplate = '<a href="{url}">{label}</a>';
+	/**
+	 * @var string the template used to render the body of a menu which is NOT a link.
+	 * In this template, the token `{label}` will be replaced with the label of the menu item.
+	 * This property will be overridden by the `template` option set in individual menu items via [[items]].
+	 */
+	public $labelTemplate = '{label}';
+	/**
+	 * @var string the template used to render a list of sub-menus.
+	 * In this template, the token `{items}` will be replaced with the renderer sub-menu items.
+	 */
+	public $submenuTemplate = "\n<ul>\n{items}\n</ul>\n";
+	/**
+	 * @var boolean whether the labels for menu items should be HTML-encoded.
+	 */
+	public $encodeLabels = true;
+	/**
+	 * @var string the CSS class to be appended to the active menu item.
+	 */
+	public $activeCssClass = 'active';
+	/**
+	 * @var boolean whether to automatically activate items according to whether their route setting
+	 * matches the currently requested route.
+	 * @see isItemActive
+	 */
+	public $activateItems = true;
+	/**
+	 * @var boolean whether to activate parent menu items when one of the corresponding child menu items is active.
+	 * The activated parent menu items will also have its CSS classes appended with [[activeCssClass]].
+	 */
+	public $activateParents = false;
+	/**
+	 * @var boolean whether to hide empty menu items. An empty menu item is one whose `url` option is not
+	 * set and which has no visible child menu items.
+	 */
+	public $hideEmptyItems = true;
+	/**
+	 * @var array the HTML attributes for the menu's container tag.
+	 */
+	public $options = array();
+	/**
+	 * @var string the CSS class that will be assigned to the first item in the main menu or each submenu.
+	 * Defaults to null, meaning no such CSS class will be assigned.
+	 */
+	public $firstItemCssClass;
+	/**
+	 * @var string the CSS class that will be assigned to the last item in the main menu or each submenu.
+	 * Defaults to null, meaning no such CSS class will be assigned.
+	 */
+	public $lastItemCssClass;
+	/**
+	 * @var string the route used to determine if a menu item is active or not.
+	 * If not set, it will use the route of the current request. 
+	 * @see params
+	 * @see isItemActive
+	 */
+	public $route;
+	/**
+	 * @var array the parameters used to determine if a menu item is active or not.
+	 * If not set, it will use `$_GET`.
+	 * @see route
+	 * @see isItemActive
+	 */
+	public $params;
+
+
+	/**
+	 * Renders the menu.
+	 */
+	public function run()
+	{
+		if ($this->route === null && Yii::$app->controller !== null) {
+			$this->route = Yii::$app->controller->getRoute();
+		}
+		if ($this->params === null) {
+			$this->params = $_GET;
+		}
+		$items = $this->normalizeItems($this->items, $hasActiveChild);
+		echo Html::tag('ul', $this->renderItems($items), $this->options);
+	}
+
+	/**
+	 * Recursively renders the menu items (without the container tag).
+	 * @param array $items the menu items to be rendered recursively
+	 * @return string the rendering result
+	 */
+	protected function renderItems($items)
+	{
+		$n = count($items);
+		$lines = array();
+		foreach ($items as $i => $item) {
+			$options = isset($item['itemOptions']) ? $item['itemOptions'] : array();
+			$class = array();
+			if ($item['active']) {
+				$class[] = $this->activeCssClass;
+			}
+			if ($i === 0 && $this->firstItemCssClass !== null) {
+				$class[] = $this->firstItemCssClass;
+			}
+			if ($i === $n - 1 && $this->lastItemCssClass !== null) {
+				$class[] = $this->lastItemCssClass;
+			}
+			if (!empty($class)) {
+				if (empty($options['class'])) {
+					$options['class'] = implode(' ', $class);
+				} else {
+					$options['class'] .= ' ' . implode(' ', $class);
+				}
+			}
+
+			$menu = $this->renderItem($item);
+			if (!empty($item['items'])) {
+				$menu .= strtr($this->submenuTemplate, array(
+					'{items}' => $this->renderItems($item['items']),
+				));
+			}
+			$lines[] = Html::tag('li', $menu, $options);
+		}
+		return implode("\n", $lines);
+	}
+
+	/**
+	 * Renders the content of a menu item.
+	 * Note that the container and the sub-menus are not rendered here.
+	 * @param array $item the menu item to be rendered. Please refer to [[items]] to see what data might be in the item.
+	 * @return string the rendering result
+	 */
+	protected function renderItem($item)
+	{
+		if (isset($item['url'])) {
+			$template = isset($item['template']) ? $item['template'] : $this->linkTemplate;
+			return strtr($template, array(
+				'{url}' => Html::url($item['url']),
+				'{label}' => $item['label'],
+			));
+		} else {
+			$template = isset($item['template']) ? $item['template'] : $this->labelTemplate;
+			return strtr($template, array(
+				'{label}' => $item['label'],
+			));
+		}
+	}
+
+	/**
+	 * Normalizes the [[items]] property to remove invisible items and activate certain items.
+	 * @param array $items the items to be normalized.
+	 * @param boolean $active whether there is an active child menu item.
+	 * @return array the normalized menu items
+	 */
+	protected function normalizeItems($items, &$active)
+	{
+		foreach ($items as $i => $item) {
+			if (isset($item['visible']) && !$item['visible']) {
+				unset($items[$i]);
+				continue;
+			}
+			if (!isset($item['label'])) {
+				$item['label'] = '';
+			}
+			if ($this->encodeLabels) {
+				$items[$i]['label'] = Html::encode($item['label']);
+			}
+			$hasActiveChild = false;
+			if (isset($item['items'])) {
+				$items[$i]['items'] = $this->normalizeItems($item['items'], $route, $hasActiveChild);
+				if (empty($items[$i]['items']) && $this->hideEmptyItems) {
+					unset($items[$i]['items']);
+					if (!isset($item['url'])) {
+						unset($items[$i]);
+						continue;
+					}
+				}
+			}
+			if (!isset($item['active'])) {
+				if ($this->activateParents && $hasActiveChild || $this->activateItems && $this->isItemActive($item)) {
+					$active = $items[$i]['active'] = true;
+				} else {
+					$items[$i]['active'] = false;
+				}
+			} elseif ($item['active']) {
+				$active = true;
+			}
+		}
+		return array_values($items);
+	}
+
+	/**
+	 * Checks whether a menu item is active.
+	 * This is done by checking if [[route]] and [[params]] match that specified in the `url` option of the menu item.
+	 * When the `url` option of a menu item is specified in terms of an array, its first element is treated
+	 * as the route for the item and the rest of the elements are the associated parameters.
+	 * Only when its route and parameters match [[route]] and [[params]], respectively, will a menu item
+	 * be considered active.
+	 * @param array $item the menu item to be checked
+	 * @return boolean whether the menu item is active
+	 */
+	protected function isItemActive($item)
+	{
+		if (isset($item['url']) && is_array($item['url']) && trim($item['url'][0], '/') === $this->route) {
+			unset($item['url']['#']);
+			if (count($item['url']) > 1) {
+				foreach (array_splice($item['url'], 1) as $name => $value) {
+					if (!isset($this->params[$name]) || $this->params[$name] != $value) {
+						return false;
+					}
+				}
+			}
+			return true;
+		}
+		return false;
+	}
+
+}
diff --git a/yii/yiic b/yii/yiic
new file mode 100755
index 0000000..d35d262
--- /dev/null
+++ b/yii/yiic
@@ -0,0 +1,13 @@
+#!/usr/bin/env php
+<?php
+/**
+ * Yii command line script for Unix/Linux.
+ *
+ * This is the bootstrap script for running yiic on Unix/Linux.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+require_once(__DIR__ . '/yiic.php');
diff --git a/yii/yiic.bat b/yii/yiic.bat
new file mode 100644
index 0000000..c63fc81
--- /dev/null
+++ b/yii/yiic.bat
@@ -0,0 +1,22 @@
+@echo off
+
+rem -------------------------------------------------------------
+rem  Yii command line script for Windows.
+rem
+rem  This is the bootstrap script for running yiic on Windows.
+rem
+rem  @author Qiang Xue <qiang.xue@gmail.com>
+rem  @link http://www.yiiframework.com/
+rem  @copyright Copyright &copy; 2012 Yii Software LLC
+rem  @license http://www.yiiframework.com/license/
+rem -------------------------------------------------------------
+
+@setlocal
+
+set YII_PATH=%~dp0
+
+if "%PHP_COMMAND%" == "" set PHP_COMMAND=php.exe
+
+"%PHP_COMMAND%" "%YII_PATH%yiic" %*
+
+@endlocal
\ No newline at end of file
diff --git a/yii/yiic.php b/yii/yiic.php
new file mode 100644
index 0000000..7cd0c40
--- /dev/null
+++ b/yii/yiic.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Yii console bootstrap file.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+defined('YII_DEBUG') or define('YII_DEBUG', true);
+
+// fcgi doesn't have STDIN defined by default
+defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
+
+require(__DIR__ . '/Yii.php');
+
+$application = new yii\console\Application(array(
+	'id' => 'yiic',
+	'basePath' => __DIR__ . '/console',
+	'controllerPath' => '@yii/console/controllers',
+));
+$application->run();

From 8332e8c60f3b448d4adbdcc70ebe189a1139a9f9 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 9 May 2013 20:12:40 +0400
Subject: [PATCH 121/152] Updated framework paths in composer.json

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index c6b616a..e9c3927 100644
--- a/composer.json
+++ b/composer.json
@@ -64,10 +64,10 @@
 		"source": "https://github.com/yiisoft/yii2"
 	},
 	"config": {
-		"vendor-dir": "framework/vendor"
+		"vendor-dir": "yii/vendor"
 	},
 	"bin": [
-		"framework/yiic"
+		"yii/yiic"
 	],
 	"require": {
 		"php": ">=5.3.0",

From 5da62fab3acdb11f857067a9b6b9b1ddd1a56385 Mon Sep 17 00:00:00 2001
From: Antonio Ramirez <amigo.cobos@gmail.com>
Date: Thu, 9 May 2013 18:23:10 +0200
Subject: [PATCH 122/152] #196 refactored method name

---
 framework/helpers/base/ArrayHelper.php           | 8 ++++----
 tests/unit/framework/helpers/ArrayHelperTest.php | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/framework/helpers/base/ArrayHelper.php b/framework/helpers/base/ArrayHelper.php
index 4802651..e482883 100644
--- a/framework/helpers/base/ArrayHelper.php
+++ b/framework/helpers/base/ArrayHelper.php
@@ -95,7 +95,7 @@ class ArrayHelper
 	 * ~~~
 	 * // $array = array('type'=>'A', 'options'=>array(1,2));
 	 * // working with array
-	 * $type = \yii\helpers\ArrayHelper::popValue($array, 'type');
+	 * $type = \yii\helpers\ArrayHelper::remove($array, 'type');
 	 * // $array content
 	 * // $array = array('options'=>array(1,2));
 	 * ~~~
@@ -105,10 +105,10 @@ class ArrayHelper
 	 * @param mixed $default the default value to be returned if the specified key does not exist
 	 * @return mixed|null the value of the element if found, default value otherwise
 	 */
-	public static function popValue(&$array, $key, $default = null)
+	public static function remove(&$array, $key, $default = null)
 	{
-		if (is_array($array)) {
-			$value = static::getValue($array, $key, $default);
+		if (is_array($array) && (isset($array[$key]) || array_key_exists($key, $array))) {
+			$value = $array[$key];
 			unset($array[$key]);
 			return $value;
 		}
diff --git a/tests/unit/framework/helpers/ArrayHelperTest.php b/tests/unit/framework/helpers/ArrayHelperTest.php
index 897fcf7..8c83278 100644
--- a/tests/unit/framework/helpers/ArrayHelperTest.php
+++ b/tests/unit/framework/helpers/ArrayHelperTest.php
@@ -12,10 +12,10 @@ class ArrayHelperTest extends \yii\test\TestCase
 
 	}
 
-	public function testPopvalue()
+	public function testRemove()
 	{
 		$array = array('name' => 'b', 'age' => 3);
-		$name = ArrayHelper::popValue($array, 'name');
+		$name = ArrayHelper::remove($array, 'name');
 
 		$this->assertEquals($name, 'b');
 		$this->assertEquals($array, array('age' => 3));

From d712605a71b3f09792646ce362ca4e6ff299d34f Mon Sep 17 00:00:00 2001
From: Rusinov Maxim <rusmaxim@gmail.com>
Date: Thu, 9 May 2013 23:12:18 +0600
Subject: [PATCH 123/152] Added and resolved Sqlite tests #15.

---
 .travis.yml                                        |   1 +
 framework/db/sqlite/Schema.php                     |   2 +-
 tests/unit/DatabaseTestCase.php                    |  50 +++
 tests/unit/data/config.php                         |  18 +-
 tests/unit/data/mysql.sql                          |   6 +-
 tests/unit/data/sqlite.sql                         | 350 ++++++---------------
 tests/unit/framework/caching/DbCacheTest.php       |   3 +-
 tests/unit/framework/db/ActiveRecordTest.php       |   3 +-
 tests/unit/framework/db/CommandTest.php            |   2 +-
 tests/unit/framework/db/ConnectionTest.php         |  11 +-
 tests/unit/framework/db/QueryTest.php              |   2 +-
 .../framework/db/sqlite/SqliteActiveRecordTest.php |  12 +
 .../unit/framework/db/sqlite/SqliteCommandTest.php |  21 ++
 .../framework/db/sqlite/SqliteConnectionTest.php   |  47 +++
 tests/unit/framework/db/sqlite/SqliteQueryTest.php |  20 ++
 15 files changed, 264 insertions(+), 284 deletions(-)
 create mode 100644 tests/unit/DatabaseTestCase.php
 create mode 100644 tests/unit/framework/db/sqlite/SqliteActiveRecordTest.php
 create mode 100644 tests/unit/framework/db/sqlite/SqliteCommandTest.php
 create mode 100644 tests/unit/framework/db/sqlite/SqliteConnectionTest.php
 create mode 100644 tests/unit/framework/db/sqlite/SqliteQueryTest.php

diff --git a/.travis.yml b/.travis.yml
index e4b8278..776ea53 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ php:
 
 env:
   - DB=mysql
+  - DB=sqlite
 
 before_script:
   - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS yiitest;'; fi"
diff --git a/framework/db/sqlite/Schema.php b/framework/db/sqlite/Schema.php
index 45f8392..d4fb245 100644
--- a/framework/db/sqlite/Schema.php
+++ b/framework/db/sqlite/Schema.php
@@ -169,7 +169,7 @@ class Schema extends \yii\db\Schema
 				}
 			}
 		}
-		$column->phpType = $this->getColumnPhpType($this->type);
+		$column->phpType = $this->getColumnPhpType($column);
 
 		$value = $info['dflt_value'];
 		if ($column->type === 'string') {
diff --git a/tests/unit/DatabaseTestCase.php b/tests/unit/DatabaseTestCase.php
new file mode 100644
index 0000000..d6f1223
--- /dev/null
+++ b/tests/unit/DatabaseTestCase.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace yiiunit;
+
+class DatabaseTestCase extends TestCase
+{
+    protected $database;
+    protected $driverName = 'mysql';
+    protected $db;
+
+    protected function setUp()
+    {
+        $databases = $this->getParam('databases');
+        $this->database = $databases[$this->driverName];
+        $pdo_database = 'pdo_'.$this->driverName;
+
+        if (!extension_loaded('pdo') || !extension_loaded($pdo_database)) {
+            $this->markTestSkipped('pdo and pdo_'.$pdo_database.' extension are required.');
+        }
+    }
+
+    /**
+     * @param bool $reset whether to clean up the test database
+     * @param bool $open whether to open and populate test database
+     * @return \yii\db\Connection
+     */
+    public function getConnection($reset = true, $open = true)
+    {
+        if (!$reset && $this->db) {
+            return $this->db;
+        }
+        $db = new \yii\db\Connection;
+        $db->dsn = $this->database['dsn'];
+        if (isset($this->database['username'])) {
+            $db->username = $this->database['username'];
+            $db->password = $this->database['password'];
+        }
+        if ($open) {
+            $db->open();
+            $lines = explode(';', file_get_contents($this->database['fixture']));
+            foreach ($lines as $line) {
+                if (trim($line) !== '') {
+                    $db->pdo->exec($line);
+                }
+            }
+        }
+        $this->db = $db;
+        return $db;
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/data/config.php b/tests/unit/data/config.php
index 238a7cc..c980c57 100644
--- a/tests/unit/data/config.php
+++ b/tests/unit/data/config.php
@@ -1,10 +1,16 @@
 <?php
 
 return array(
-	'mysql' => array(
-		'dsn' => 'mysql:host=127.0.0.1;dbname=yiitest',
-		'username' => 'travis',
-		'password' => '',
-		'fixture' => __DIR__ . '/mysql.sql',
-	),
+    'databases' => array(
+        'mysql' => array(
+            'dsn' => 'mysql:host=127.0.0.1;dbname=yiitest',
+            'username' => 'travis',
+            'password' => '',
+            'fixture' => __DIR__ . '/mysql.sql',
+        ),
+        'sqlite' => array(
+            'dsn' => 'sqlite::memory:',
+            'fixture' => __DIR__ . '/sqlite.sql',
+        ),
+    )
 );
diff --git a/tests/unit/data/mysql.sql b/tests/unit/data/mysql.sql
index 8223f59..1bb5558 100644
--- a/tests/unit/data/mysql.sql
+++ b/tests/unit/data/mysql.sql
@@ -1,10 +1,6 @@
 /**
  * This is the database schema for testing MySQL support of Yii DAO and Active Record.
- * The following database setup is required to perform then relevant tests:
- * Database name: yiitest
- * username: test
- * password: test
- * charset: utf8
+ * The database setup in config.php is required to perform then relevant tests:
  */
 
 DROP TABLE IF EXISTS tbl_order_item CASCADE;
diff --git a/tests/unit/data/sqlite.sql b/tests/unit/data/sqlite.sql
index affeca9..f75bfa6 100644
--- a/tests/unit/data/sqlite.sql
+++ b/tests/unit/data/sqlite.sql
@@ -1,262 +1,88 @@
-CREATE TABLE users
-(
-	id INTEGER NOT NULL PRIMARY KEY,
-	username VARCHAR(128) NOT NULL,
-	password VARCHAR(128) NOT NULL,
-	email VARCHAR(128) NOT NULL
-);
-
-INSERT INTO users(id,username,password,email) VALUES (1,'user1','pass1','email1');
-INSERT INTO users(id,username,password,email) VALUES (2,'user2','pass2','email2');
-INSERT INTO users(id,username,password,email) VALUES (3,'user3','pass3','email3');
-INSERT INTO users(id,username,password,email) VALUES (4,'user4','pass4','email4');
-
-CREATE TABLE groups
-(
-	id INTEGER NOT NULL PRIMARY KEY,
-	name VARCHAR(128) NOT NULL
-);
-
-INSERT INTO groups(id,name) VALUES (1,'group1');
-INSERT INTO groups(id,name) VALUES (2,'group2');
-INSERT INTO groups(id,name) VALUES (3,'group3');
-INSERT INTO groups(id,name) VALUES (4,'group4');
-INSERT INTO groups(id,name) VALUES (5,'group5');
-INSERT INTO groups(id,name) VALUES (6,'group6');
-
-CREATE TABLE groups_descriptions
-(
-	group_id INTEGER NOT NULL PRIMARY KEY,
-	name VARCHAR(128) NOT NULL
-);
-
-INSERT INTO groups_descriptions(group_id,name) VALUES (1,'room1');
-INSERT INTO groups_descriptions(group_id,name) VALUES (2,'room2');
-INSERT INTO groups_descriptions(group_id,name) VALUES (3,'room3');
-INSERT INTO groups_descriptions(group_id,name) VALUES (4,'room4');
-
-CREATE TABLE roles
-(
-	user_id INTEGER NOT NULL,
-	group_id INTEGER NOT NULL,
-	name VARCHAR(128) NOT NULL,
-	PRIMARY KEY(user_id,group_id)
-);
-
-INSERT INTO roles(user_id,group_id,name) VALUES (1,1,'dev');
-INSERT INTO roles(user_id,group_id,name) VALUES (1,2,'user');
-INSERT INTO roles(user_id,group_id,name) VALUES (2,1,'dev');
-INSERT INTO roles(user_id,group_id,name) VALUES (2,3,'user');
-
-CREATE TABLE mentorships
-(
-	teacher_id INTEGER NOT NULL,
-	student_id INTEGER NOT NULL,
-	progress VARCHAR(128) NOT NULL,
-	PRIMARY KEY(teacher_id,student_id)
-);
-
-INSERT INTO mentorships(teacher_id,student_id,progress) VALUES (1,3,'good');
-INSERT INTO mentorships(teacher_id,student_id,progress) VALUES (2,4,'average');
-
-CREATE TABLE profiles
-(
-	id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	first_name VARCHAR(128) NOT NULL,
-	last_name VARCHAR(128) NOT NULL,
-	user_id INTEGER NOT NULL,
-	CONSTRAINT FK_profile_user FOREIGN KEY (user_id)
-		REFERENCES users (id) ON DELETE CASCADE ON UPDATE RESTRICT
-);
-
-INSERT INTO profiles (first_name, last_name, user_id) VALUES ('first 1','last 1',1);
-INSERT INTO profiles (first_name, last_name, user_id) VALUES ('first 2','last 2',2);
-
-CREATE TABLE posts
-(
-	id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	title VARCHAR(128) NOT NULL,
-	create_time TIMESTAMP NOT NULL,
-	author_id INTEGER NOT NULL,
-	content TEXT,
-	CONSTRAINT FK_post_author FOREIGN KEY (author_id)
-		REFERENCES users (id) ON DELETE CASCADE ON UPDATE RESTRICT
-);
-
-INSERT INTO posts (title, create_time, author_id, content) VALUES ('post 1',100000,1,'content 1');
-INSERT INTO posts (title, create_time, author_id, content) VALUES ('post 2',100001,2,'content 2');
-INSERT INTO posts (title, create_time, author_id, content) VALUES ('post 3',100002,2,'content 3');
-INSERT INTO posts (title, create_time, author_id, content) VALUES ('post 4',100003,2,'content 4');
-INSERT INTO posts (title, create_time, author_id, content) VALUES ('post 5',100004,3,'content 5');
-
-
-CREATE TABLE posts_nofk
-(
-	id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	title VARCHAR(128) NOT NULL,
-	create_time TIMESTAMP NOT NULL,
-	author_id INTEGER NOT NULL,
-	content TEXT
-);
-
-INSERT INTO posts_nofk (title, create_time, author_id, content) VALUES ('post 1',100000,1,'content 1');
-INSERT INTO posts_nofk (title, create_time, author_id, content) VALUES ('post 2',100001,2,'content 2');
-INSERT INTO posts_nofk (title, create_time, author_id, content) VALUES ('post 3',100002,2,'content 3');
-INSERT INTO posts_nofk (title, create_time, author_id, content) VALUES ('post 4',100003,2,'content 4');
-INSERT INTO posts_nofk (title, create_time, author_id, content) VALUES ('post 5',100004,3,'content 5');
-
-
-CREATE TABLE comments
-(
-	id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	content TEXT NOT NULL,
-	post_id INTEGER NOT NULL,
-	author_id INTEGER NOT NULL,
-	CONSTRAINT FK_post_comment FOREIGN KEY (post_id)
-		REFERENCES posts (id) ON DELETE CASCADE ON UPDATE RESTRICT,
-	CONSTRAINT FK_user_comment FOREIGN KEY (author_id)
-		REFERENCES users (id) ON DELETE CASCADE ON UPDATE RESTRICT
-);
-
-INSERT INTO comments (content, post_id, author_id) VALUES ('comment 1',1, 2);
-INSERT INTO comments (content, post_id, author_id) VALUES ('comment 2',1, 2);
-INSERT INTO comments (content, post_id, author_id) VALUES ('comment 3',1, 2);
-INSERT INTO comments (content, post_id, author_id) VALUES ('comment 4',2, 2);
-INSERT INTO comments (content, post_id, author_id) VALUES ('comment 5',2, 2);
-INSERT INTO comments (content, post_id, author_id) VALUES ('comment 6',3, 2);
-INSERT INTO comments (content, post_id, author_id) VALUES ('comment 7',3, 2);
-INSERT INTO comments (content, post_id, author_id) VALUES ('comment 8',3, 2);
-INSERT INTO comments (content, post_id, author_id) VALUES ('comment 9',3, 2);
-INSERT INTO comments (content, post_id, author_id) VALUES ('comment 10',5, 3);
-
-CREATE TABLE categories
-(
-	id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	name VARCHAR(128) NOT NULL,
-	parent_id INTEGER,
-	CONSTRAINT FK_category_category FOREIGN KEY (parent_id)
-		REFERENCES categories (id) ON DELETE CASCADE ON UPDATE RESTRICT
-);
-
-INSERT INTO categories (name, parent_id) VALUES ('cat 1',NULL);
-INSERT INTO categories (name, parent_id) VALUES ('cat 2',NULL);
-INSERT INTO categories (name, parent_id) VALUES ('cat 3',NULL);
-INSERT INTO categories (name, parent_id) VALUES ('cat 4',1);
-INSERT INTO categories (name, parent_id) VALUES ('cat 5',1);
-INSERT INTO categories (name, parent_id) VALUES ('cat 6',5);
-INSERT INTO categories (name, parent_id) VALUES ('cat 7',5);
-
-CREATE TABLE post_category
-(
-	category_id INTEGER NOT NULL,
-	post_id INTEGER NOT NULL,
-	PRIMARY KEY (category_id, post_id),
-	CONSTRAINT FK_post_category_post FOREIGN KEY (post_id)
-		REFERENCES posts (id) ON DELETE CASCADE ON UPDATE RESTRICT,
-	CONSTRAINT FK_post_category_category FOREIGN KEY (category_id)
-		REFERENCES categories (id) ON DELETE CASCADE ON UPDATE RESTRICT
-);
-
-INSERT INTO post_category (category_id, post_id) VALUES (1,1);
-INSERT INTO post_category (category_id, post_id) VALUES (2,1);
-INSERT INTO post_category (category_id, post_id) VALUES (3,1);
-INSERT INTO post_category (category_id, post_id) VALUES (4,2);
-INSERT INTO post_category (category_id, post_id) VALUES (1,2);
-INSERT INTO post_category (category_id, post_id) VALUES (1,3);
-
-CREATE TABLE orders
-(
-	key1 INTEGER NOT NULL,
-	key2 INTEGER NOT NULL,
-	name VARCHAR(128),
-	PRIMARY KEY (key1, key2)
-);
-
-INSERT INTO orders (key1,key2,name) VALUES (1,2,'order 12');
-INSERT INTO orders (key1,key2,name) VALUES (1,3,'order 13');
-INSERT INTO orders (key1,key2,name) VALUES (2,1,'order 21');
-INSERT INTO orders (key1,key2,name) VALUES (2,2,'order 22');
-
-CREATE TABLE items
-(
-	id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	name VARCHAR(128),
-	col1 INTEGER NOT NULL,
-	col2 INTEGER NOT NULL,
-	CONSTRAINT FK_order_item FOREIGN KEY (col1,col2)
-		REFERENCES orders (key1,key2) ON DELETE CASCADE ON UPDATE RESTRICT
-);
-
-INSERT INTO items (name,col1,col2) VALUES ('item 1',1,2);
-INSERT INTO items (name,col1,col2) VALUES ('item 2',1,2);
-INSERT INTO items (name,col1,col2) VALUES ('item 3',1,3);
-INSERT INTO items (name,col1,col2) VALUES ('item 4',2,2);
-INSERT INTO items (name,col1,col2) VALUES ('item 5',2,2);
-
-CREATE TABLE types
-(
-	int_col INT NOT NULL,
-	int_col2 INTEGER DEFAULT 1,
-	char_col CHAR(100) NOT NULL,
-	char_col2 VARCHAR(100) DEFAULT 'something',
-	char_col3 TEXT,
-	float_col REAL(4,3) NOT NULL,
-	float_col2 DOUBLE DEFAULT 1.23,
-	blob_col BLOB,
-	numeric_col NUMERIC(5,2) DEFAULT 33.22,
-	time TIMESTAMP DEFAULT 123,
-	bool_col BOOL NOT NULL,
-	bool_col2 BOOLEAN DEFAULT 1,
-	null_col INTEGER DEFAULT NULL
-);
-
-CREATE TABLE Content
-(
-	id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	class VARCHAR(128),
-	parentID INTEGER NOT NULL,
-	ownerID INTEGER NOT NULL,
-	title VARCHAR(100),
-	CONSTRAINT FK_content_user FOREIGN KEY (ownerID)
-		REFERENCES users (id) ON DELETE CASCADE ON UPDATE RESTRICT
-	CONSTRAINT FK_content_parent FOREIGN KEY (parentID)
-		REFERENCES Content (id) ON DELETE CASCADE ON UPDATE RESTRICT
-);
-
-INSERT INTO Content (class,parentID,ownerID,title) VALUES ('Article',-1,1,'article 1');
-INSERT INTO Content (class,parentID,ownerID,title) VALUES ('Article',-1,2,'article 2');
-INSERT INTO Content (class,parentID,ownerID,title) VALUES ('Comment',1,1,'comment 1');
-INSERT INTO Content (class,parentID,ownerID,title) VALUES ('Article',-1,2,'article 3');
-INSERT INTO Content (class,parentID,ownerID,title) VALUES ('Comment',4,2,'comment 2');
-INSERT INTO Content (class,parentID,ownerID,title) VALUES ('Comment',4,1,'comment 3');
-
-CREATE TABLE Article
-(
-	id INTEGER NOT NULL PRIMARY KEY,
-	authorID INTEGER NOT NULL,
-	body TEXT,
-	CONSTRAINT FK_article_content FOREIGN KEY (id)
-		REFERENCES Content (id) ON DELETE CASCADE ON UPDATE RESTRICT
-	CONSTRAINT FK_article_author FOREIGN KEY (authorID)
-		REFERENCES users (id) ON DELETE CASCADE ON UPDATE RESTRICT
-);
-
-INSERT INTO Article (id,authorID,body) VALUES (1,1,'content for article 1');
-INSERT INTO Article (id,authorID,body) VALUES (2,2,'content for article 2');
-INSERT INTO Article (id,authorID,body) VALUES (4,1,'content for article 3');
-
-CREATE TABLE Comment
-(
-	id INTEGER NOT NULL PRIMARY KEY,
-	authorID INTEGER NOT NULL,
-	body TEXT,
-	CONSTRAINT FK_comment_content FOREIGN KEY (id)
-		REFERENCES Content (id) ON DELETE CASCADE ON UPDATE RESTRICT
-	CONSTRAINT FK_article_author FOREIGN KEY (authorID)
-		REFERENCES users (id) ON DELETE CASCADE ON UPDATE RESTRICT
-);
-
-INSERT INTO Comment (id,authorID,body) VALUES (3,1,'content for comment 1');
-INSERT INTO Comment (id,authorID,body) VALUES (5,1,'content for comment 2');
-INSERT INTO Comment (id,authorID,body) VALUES (6,1,'content for comment 3');
-
+/**
+ * This is the database schema for testing Sqlite support of Yii DAO and Active Record.
+ * The database setup in config.php is required to perform then relevant tests:
+ */
+
+DROP TABLE IF EXISTS tbl_order_item;
+DROP TABLE IF EXISTS tbl_item;
+DROP TABLE IF EXISTS tbl_order;
+DROP TABLE IF EXISTS tbl_category;
+DROP TABLE IF EXISTS tbl_customer;
+DROP TABLE IF EXISTS tbl_type;
+
+CREATE TABLE tbl_customer (
+  id INTEGER NOT NULL,
+  email varchar(128) NOT NULL,
+  name varchar(128) NOT NULL,
+  address text,
+  status INTEGER DEFAULT 0,
+  PRIMARY KEY (id)
+);
+
+CREATE TABLE tbl_category (
+  id INTEGER NOT NULL,
+  name varchar(128) NOT NULL,
+  PRIMARY KEY (id)
+);
+
+CREATE TABLE tbl_item (
+  id INTEGER NOT NULL,
+  name varchar(128) NOT NULL,
+  category_id INTEGER NOT NULL,
+  PRIMARY KEY (id)
+);
+
+CREATE TABLE tbl_order (
+  id INTEGER NOT NULL,
+  customer_id INTEGER NOT NULL,
+  create_time INTEGER NOT NULL,
+  total decimal(10,0) NOT NULL,
+  PRIMARY KEY (id)
+);
+
+CREATE TABLE tbl_order_item (
+  order_id INTEGER NOT NULL,
+  item_id INTEGER NOT NULL,
+  quantity INTEGER NOT NULL,
+  subtotal decimal(10,0) NOT NULL,
+  PRIMARY KEY (order_id, item_id)
+);
+
+CREATE TABLE tbl_type (
+  int_col INTEGER NOT NULL,
+  int_col2 INTEGER DEFAULT '1',
+  char_col char(100) NOT NULL,
+  char_col2 varchar(100) DEFAULT 'something',
+  char_col3 text,
+  float_col double(4,3) NOT NULL,
+  float_col2 double DEFAULT '1.23',
+  blob_col blob,
+  numeric_col decimal(5,2) DEFAULT '33.22',
+  time timestamp NOT NULL DEFAULT '2002-01-01 00:00:00',
+  bool_col tinyint(1) NOT NULL,
+  bool_col2 tinyint(1) DEFAULT '1'
+);
+
+INSERT INTO tbl_customer (email, name, address, status) VALUES ('user1@example.com', 'user1', 'address1', 1);
+INSERT INTO tbl_customer (email, name, address, status) VALUES ('user2@example.com', 'user2', 'address2', 1);
+INSERT INTO tbl_customer (email, name, address, status) VALUES ('user3@example.com', 'user3', 'address3', 2);
+
+INSERT INTO tbl_category (name) VALUES ('Books');
+INSERT INTO tbl_category (name) VALUES ('Movies');
+
+INSERT INTO tbl_item (name, category_id) VALUES ('Agile Web Application Development with Yii1.1 and PHP5', 1);
+INSERT INTO tbl_item (name, category_id) VALUES ('Yii 1.1 Application Development Cookbook', 1);
+INSERT INTO tbl_item (name, category_id) VALUES ('Ice Age', 2);
+INSERT INTO tbl_item (name, category_id) VALUES ('Toy Story', 2);
+INSERT INTO tbl_item (name, category_id) VALUES ('Cars', 2);
+
+INSERT INTO tbl_order (customer_id, create_time, total) VALUES (1, 1325282384, 110.0);
+INSERT INTO tbl_order (customer_id, create_time, total) VALUES (2, 1325334482, 33.0);
+INSERT INTO tbl_order (customer_id, create_time, total) VALUES (2, 1325502201, 40.0);
+
+INSERT INTO tbl_order_item (order_id, item_id, quantity, subtotal) VALUES (1, 1, 1, 30.0);
+INSERT INTO tbl_order_item (order_id, item_id, quantity, subtotal) VALUES (1, 2, 2, 40.0);
+INSERT INTO tbl_order_item (order_id, item_id, quantity, subtotal) VALUES (2, 4, 1, 10.0);
+INSERT INTO tbl_order_item (order_id, item_id, quantity, subtotal) VALUES (2, 5, 1, 15.0);
+INSERT INTO tbl_order_item (order_id, item_id, quantity, subtotal) VALUES (2, 3, 1, 8.0);
+INSERT INTO tbl_order_item (order_id, item_id, quantity, subtotal) VALUES (3, 2, 1, 40.0);
\ No newline at end of file
diff --git a/tests/unit/framework/caching/DbCacheTest.php b/tests/unit/framework/caching/DbCacheTest.php
index a41667c..253240d 100644
--- a/tests/unit/framework/caching/DbCacheTest.php
+++ b/tests/unit/framework/caching/DbCacheTest.php
@@ -35,7 +35,8 @@ class DbCacheTest extends CacheTest
 	function getConnection($reset = true)
 	{
 		if($this->_connection === null) {
-			$params = $this->getParam('mysql');
+			$databases = $this->getParam('databases');
+            $params = $databases['mysql'];
 			$db = new \yii\db\Connection;
 			$db->dsn = $params['dsn'];
 			$db->username = $params['username'];
diff --git a/tests/unit/framework/db/ActiveRecordTest.php b/tests/unit/framework/db/ActiveRecordTest.php
index f0ea968..e337a5d 100644
--- a/tests/unit/framework/db/ActiveRecordTest.php
+++ b/tests/unit/framework/db/ActiveRecordTest.php
@@ -10,10 +10,11 @@ use yiiunit\data\ar\OrderItem;
 use yiiunit\data\ar\Order;
 use yiiunit\data\ar\Item;
 
-class ActiveRecordTest extends \yiiunit\MysqlTestCase
+class ActiveRecordTest extends \yiiunit\DatabaseTestCase
 {
 	public function setUp()
 	{
+        parent::setUp();
 		ActiveRecord::$db = $this->getConnection();
 	}
 
diff --git a/tests/unit/framework/db/CommandTest.php b/tests/unit/framework/db/CommandTest.php
index 2576e78..0d9652b 100644
--- a/tests/unit/framework/db/CommandTest.php
+++ b/tests/unit/framework/db/CommandTest.php
@@ -7,7 +7,7 @@ use yii\db\Command;
 use yii\db\Query;
 use yii\db\DataReader;
 
-class CommandTest extends \yiiunit\MysqlTestCase
+class CommandTest extends \yiiunit\DatabaseTestCase
 {
 	function testConstruct()
 	{
diff --git a/tests/unit/framework/db/ConnectionTest.php b/tests/unit/framework/db/ConnectionTest.php
index 256c5a9..c837b95 100644
--- a/tests/unit/framework/db/ConnectionTest.php
+++ b/tests/unit/framework/db/ConnectionTest.php
@@ -4,12 +4,12 @@ namespace yiiunit\framework\db;
 
 use yii\db\Connection;
 
-class ConnectionTest extends \yiiunit\MysqlTestCase
+class ConnectionTest extends \yiiunit\DatabaseTestCase
 {
 	function testConstruct()
 	{
 		$connection = $this->getConnection(false);
-		$params = $this->getParam('mysql');
+		$params = $this->database;
 
 		$this->assertEquals($params['dsn'], $connection->dsn);
 		$this->assertEquals($params['username'], $connection->username);
@@ -18,7 +18,7 @@ class ConnectionTest extends \yiiunit\MysqlTestCase
 
 	function testOpenClose()
 	{
-		$connection = $this->getConnection(false);
+		$connection = $this->getConnection(false, false);
 
 		$this->assertFalse($connection->isActive);
 		$this->assertEquals(null, $connection->pdo);
@@ -39,9 +39,8 @@ class ConnectionTest extends \yiiunit\MysqlTestCase
 
 	function testGetDriverName()
 	{
-		$connection = $this->getConnection(false);
-		$this->assertEquals('mysql', $connection->driverName);
-		$this->assertFalse($connection->isActive);
+		$connection = $this->getConnection(false, false);
+		$this->assertEquals($this->driverName, $connection->driverName);
 	}
 
 	function testQuoteValue()
diff --git a/tests/unit/framework/db/QueryTest.php b/tests/unit/framework/db/QueryTest.php
index 1c730cd..398d0d9 100644
--- a/tests/unit/framework/db/QueryTest.php
+++ b/tests/unit/framework/db/QueryTest.php
@@ -7,7 +7,7 @@ use yii\db\Command;
 use yii\db\Query;
 use yii\db\DataReader;
 
-class QueryTest extends \yiiunit\MysqlTestCase
+class QueryTest extends \yiiunit\DatabaseTestCase
 {
 	function testSelect()
 	{
diff --git a/tests/unit/framework/db/sqlite/SqliteActiveRecordTest.php b/tests/unit/framework/db/sqlite/SqliteActiveRecordTest.php
new file mode 100644
index 0000000..bc6387a
--- /dev/null
+++ b/tests/unit/framework/db/sqlite/SqliteActiveRecordTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace yiiunit\framework\db\sqlite;
+
+class SqliteActiveRecordTest extends \yiiunit\framework\db\ActiveRecordTest
+{
+    public function setUp()
+    {
+        $this->driverName = 'sqlite';
+        parent::setUp();
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/framework/db/sqlite/SqliteCommandTest.php b/tests/unit/framework/db/sqlite/SqliteCommandTest.php
new file mode 100644
index 0000000..21e9dd9
--- /dev/null
+++ b/tests/unit/framework/db/sqlite/SqliteCommandTest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace yiiunit\framework\db\sqlite;
+
+class SqliteCommandTest extends \yiiunit\framework\db\CommandTest
+{
+    public function setUp()
+    {
+        $this->driverName = 'sqlite';
+        parent::setUp();
+    }
+
+    function testAutoQuoting()
+    {
+        $db = $this->getConnection(false);
+
+        $sql = 'SELECT [[id]], [[t.name]] FROM {{tbl_customer}} t';
+        $command = $db->createCommand($sql);
+        $this->assertEquals("SELECT \"id\", 't'.\"name\" FROM 'tbl_customer' t", $command->sql);
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/framework/db/sqlite/SqliteConnectionTest.php b/tests/unit/framework/db/sqlite/SqliteConnectionTest.php
new file mode 100644
index 0000000..eeb5aae
--- /dev/null
+++ b/tests/unit/framework/db/sqlite/SqliteConnectionTest.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace yiiunit\framework\db\sqlite;
+
+class SqliteConnectionTest extends \yiiunit\framework\db\ConnectionTest
+{
+    public function setUp()
+    {
+        $this->driverName = 'sqlite';
+        parent::setUp();
+    }
+
+    function testConstruct()
+    {
+        $connection = $this->getConnection(false);
+        $params = $this->database;
+
+        $this->assertEquals($params['dsn'], $connection->dsn);
+    }
+
+    function testQuoteValue()
+    {
+        $connection = $this->getConnection(false);
+        $this->assertEquals(123, $connection->quoteValue(123));
+        $this->assertEquals("'string'", $connection->quoteValue('string'));
+        $this->assertEquals("'It''s interesting'", $connection->quoteValue("It's interesting"));
+    }
+
+    function testQuoteTableName()
+    {
+        $connection = $this->getConnection(false);
+        $this->assertEquals("'table'", $connection->quoteTableName('table'));
+        $this->assertEquals("'schema'.'table'", $connection->quoteTableName('schema.table'));
+        $this->assertEquals('{{table}}', $connection->quoteTableName('{{table}}'));
+        $this->assertEquals('(table)', $connection->quoteTableName('(table)'));
+    }
+
+    function testQuoteColumnName()
+    {
+        $connection = $this->getConnection(false);
+        $this->assertEquals('"column"', $connection->quoteColumnName('column'));
+        $this->assertEquals("'table'.\"column\"", $connection->quoteColumnName('table.column'));
+        $this->assertEquals('[[column]]', $connection->quoteColumnName('[[column]]'));
+        $this->assertEquals('{{column}}', $connection->quoteColumnName('{{column}}'));
+        $this->assertEquals('(column)', $connection->quoteColumnName('(column)'));
+    }
+}
diff --git a/tests/unit/framework/db/sqlite/SqliteQueryTest.php b/tests/unit/framework/db/sqlite/SqliteQueryTest.php
new file mode 100644
index 0000000..0b5e8f7
--- /dev/null
+++ b/tests/unit/framework/db/sqlite/SqliteQueryTest.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Created by JetBrains PhpStorm.
+ * User: RusMaxim
+ * Date: 09.05.13
+ * Time: 21:41
+ * To change this template use File | Settings | File Templates.
+ */
+
+namespace yiiunit\framework\db\sqlite;
+
+
+class SqliteQueryTest extends \yiiunit\framework\db\QueryTest
+{
+    public function setUp()
+    {
+        $this->driverName = 'sqlite';
+        parent::setUp();
+    }
+}
\ No newline at end of file

From db61885ebd88077dd34b265690ee0c0fae4021d8 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Thu, 9 May 2013 13:17:11 -0400
Subject: [PATCH 124/152] Fixes issue #201.

---
 yii/base/Controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yii/base/Controller.php b/yii/base/Controller.php
index 9572636..3b16a93 100644
--- a/yii/base/Controller.php
+++ b/yii/base/Controller.php
@@ -203,7 +203,7 @@ class Controller extends Component
 	public function forward($route, $params = array())
 	{
 		$status = $this->run($route, $params);
-		exit($status);
+		Yii::$app->end($status);
 	}
 
 	/**

From 452be102c61817fd5fcd4f531f17efb672424d82 Mon Sep 17 00:00:00 2001
From: Rusinov Maxim <rusmaxim@gmail.com>
Date: Thu, 9 May 2013 23:27:19 +0600
Subject: [PATCH 125/152] Added newline at end files.

---
 tests/unit/DatabaseTestCase.php                           | 2 +-
 tests/unit/framework/db/sqlite/SqliteActiveRecordTest.php | 2 +-
 tests/unit/framework/db/sqlite/SqliteCommandTest.php      | 2 +-
 tests/unit/framework/db/sqlite/SqliteQueryTest.php        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/unit/DatabaseTestCase.php b/tests/unit/DatabaseTestCase.php
index d6f1223..b39c2e5 100644
--- a/tests/unit/DatabaseTestCase.php
+++ b/tests/unit/DatabaseTestCase.php
@@ -47,4 +47,4 @@ class DatabaseTestCase extends TestCase
         $this->db = $db;
         return $db;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/unit/framework/db/sqlite/SqliteActiveRecordTest.php b/tests/unit/framework/db/sqlite/SqliteActiveRecordTest.php
index bc6387a..539e879 100644
--- a/tests/unit/framework/db/sqlite/SqliteActiveRecordTest.php
+++ b/tests/unit/framework/db/sqlite/SqliteActiveRecordTest.php
@@ -9,4 +9,4 @@ class SqliteActiveRecordTest extends \yiiunit\framework\db\ActiveRecordTest
         $this->driverName = 'sqlite';
         parent::setUp();
     }
-}
\ No newline at end of file
+}
diff --git a/tests/unit/framework/db/sqlite/SqliteCommandTest.php b/tests/unit/framework/db/sqlite/SqliteCommandTest.php
index 21e9dd9..4110cd3 100644
--- a/tests/unit/framework/db/sqlite/SqliteCommandTest.php
+++ b/tests/unit/framework/db/sqlite/SqliteCommandTest.php
@@ -18,4 +18,4 @@ class SqliteCommandTest extends \yiiunit\framework\db\CommandTest
         $command = $db->createCommand($sql);
         $this->assertEquals("SELECT \"id\", 't'.\"name\" FROM 'tbl_customer' t", $command->sql);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/unit/framework/db/sqlite/SqliteQueryTest.php b/tests/unit/framework/db/sqlite/SqliteQueryTest.php
index 0b5e8f7..f00e59e 100644
--- a/tests/unit/framework/db/sqlite/SqliteQueryTest.php
+++ b/tests/unit/framework/db/sqlite/SqliteQueryTest.php
@@ -17,4 +17,4 @@ class SqliteQueryTest extends \yiiunit\framework\db\QueryTest
         $this->driverName = 'sqlite';
         parent::setUp();
     }
-}
\ No newline at end of file
+}

From 238684d6af0b500b2d0a4e35cd49ba591669374c Mon Sep 17 00:00:00 2001
From: Rusinov Maxim <rusmaxim@gmail.com>
Date: Thu, 9 May 2013 23:53:15 +0600
Subject: [PATCH 126/152] Travis anyway do sqlite tests. No needed setting ENV.

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 776ea53..e4b8278 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,6 @@ php:
 
 env:
   - DB=mysql
-  - DB=sqlite
 
 before_script:
   - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS yiitest;'; fi"

From 850ff06560268420a7c14cd1104420fc9bf74477 Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Thu, 9 May 2013 22:17:12 +0400
Subject: [PATCH 127/152] DbManager added + other classes comments fixes

---
 framework/rbac/Assignment.php |   8 +-
 framework/rbac/DbManager.php  | 574 ++++++++++++++++++++++++++++++++++++++++++
 framework/rbac/IManager.php   | 173 +++++++++++++
 framework/rbac/Item.php       |   2 +-
 framework/rbac/Manager.php    |   6 +-
 framework/rbac/PhpManager.php |  24 +-
 6 files changed, 772 insertions(+), 15 deletions(-)
 create mode 100644 framework/rbac/DbManager.php
 create mode 100644 framework/rbac/IManager.php

diff --git a/framework/rbac/Assignment.php b/framework/rbac/Assignment.php
index c2a9f56..576017e 100644
--- a/framework/rbac/Assignment.php
+++ b/framework/rbac/Assignment.php
@@ -19,24 +19,24 @@ use yii\base\Object;
 class Assignment extends Object
 {
 	private $_auth;
-	private $_itemName;
 	private $_userId;
+	private $_itemName;
 	private $_bizRule;
 	private $_data;
 
 	/**
 	 * Constructor.
 	 * @param IManager $auth the authorization manager
-	 * @param string $itemName authorization item name
 	 * @param mixed $userId user ID (see [[User::id]])
+	 * @param string $itemName authorization item name
 	 * @param string $bizRule the business rule associated with this assignment
 	 * @param mixed $data additional data for this assignment
 	 */
-	public function __construct($auth, $itemName, $userId, $bizRule = null, $data = null)
+	public function __construct($auth, $userId, $itemName, $bizRule = null, $data = null)
 	{
 		$this->_auth = $auth;
-		$this->_itemName = $itemName;
 		$this->_userId = $userId;
+		$this->_itemName = $itemName;
 		$this->_bizRule = $bizRule;
 		$this->_data = $data;
 	}
diff --git a/framework/rbac/DbManager.php b/framework/rbac/DbManager.php
new file mode 100644
index 0000000..5f64694
--- /dev/null
+++ b/framework/rbac/DbManager.php
@@ -0,0 +1,574 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\rbac;
+
+use Yii;
+use yii\db\Connection;
+use yii\db\Query;
+use yii\base\Exception;
+use yii\base\InvalidConfigException;
+
+/**
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Alexander Kochetov <creocoder@gmail.com>
+ * @since 2.0
+ */
+class DbManager extends Manager
+{
+	/**
+	 * @var Connection|string the DB connection object or the application component ID of the DB connection.
+	 * After the DbManager object is created, if you want to change this property, you should only assign it
+	 * with a DB connection object.
+	 */
+	public $db = 'db';
+	/**
+	 * @var string the name of the table storing authorization items. Defaults to 'tbl_auth_item'.
+	 */
+	public $itemTable = 'tbl_auth_item';
+	/**
+	 * @var string the name of the table storing authorization item hierarchy. Defaults to 'tbl_auth_item_child'.
+	 */
+	public $itemChildTable = 'tbl_auth_item_child';
+	/**
+	 * @var string the name of the table storing authorization item assignments. Defaults to 'tbl_auth_assignment'.
+	 */
+	public $assignmentTable = 'tbl_auth_assignment';
+
+	private $_usingSqlite;
+
+	/**
+	 * Initializes the application component.
+	 * This method overrides the parent implementation by establishing the database connection.
+	 */
+	public function init()
+	{
+		if (is_string($this->db)) {
+			$this->db = Yii::$app->getComponent($this->db);
+		}
+		if (!$this->db instanceof Connection) {
+			throw new InvalidConfigException("DbManager::db must be either a DB connection instance or the application component ID of a DB connection.");
+		}
+		$this->_usingSqlite = !strncmp($this->db->getDriverName(), 'sqlite', 6);
+		parent::init();
+	}
+
+	/**
+	 * Performs access check for the specified user.
+	 * @param mixed $userId the user ID. This should can be either an integer and a string representing
+	 * @param string $itemName the name of the operation that need access check
+	 * the unique identifier of a user. See [[User::id]].
+	 * @param array $params name-value pairs that would be passed to biz rules associated
+	 * with the tasks and roles assigned to the user. A param with name 'userId' is added to this array,
+	 * which holds the value of `$userId`.
+	 * @return boolean whether the operations can be performed by the user.
+	 */
+	public function checkAccess($userId, $itemName, $params = array())
+	{
+		$assignments = $this->getAssignments($userId);
+		return $this->checkAccessRecursive($userId, $itemName, $params, $assignments);
+	}
+
+	/**
+	 * Performs access check for the specified user.
+	 * This method is internally called by [[checkAccess()]].
+	 * @param mixed $userId the user ID. This should can be either an integer and a string representing
+	 * the unique identifier of a user. See [[User::id]].
+	 * @param string $itemName the name of the operation that need access check
+	 * @param array $params name-value pairs that would be passed to biz rules associated
+	 * with the tasks and roles assigned to the user. A param with name 'userId' is added to this array,
+	 * which holds the value of `$userId`.
+	 * @param Assignment[] $assignments the assignments to the specified user
+	 * @return boolean whether the operations can be performed by the user.
+	 */
+	protected function checkAccessRecursive($userId, $itemName, $params, $assignments)
+	{
+		if (($item = $this->getItem($itemName)) === null) {
+			return false;
+		}
+		Yii::trace('Checking permission: ' . $item->getName(), __METHOD__);
+		if (!isset($params['userId'])) {
+			$params['userId'] = $userId;
+		}
+		if ($this->executeBizRule($item->getBizRule(), $params, $item->getData())) {
+			if (in_array($itemName, $this->defaultRoles)) {
+				return true;
+			}
+			if (isset($assignments[$itemName])) {
+				$assignment = $assignments[$itemName];
+				if ($this->executeBizRule($assignment->getBizRule(), $params, $assignment->getData())) {
+					return true;
+				}
+			}
+			$query = new Query;
+			$parents = $query->select(array('parent'))
+				->from($this->itemChildTable)
+				->where('child=:name', array(':name' => $itemName))
+				->createCommand($this->db)
+				->queryColumn();
+			foreach ($parents as $parent) {
+				if ($this->checkAccessRecursive($userId, $parent, $params, $assignments)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Adds an item as a child of another item.
+	 * @param string $itemName the parent item name
+	 * @param string $childName the child item name
+	 * @return boolean whether the item is added successfully
+	 * @throws Exception if either parent or child doesn't exist or if a loop has been detected.
+	 */
+	public function addItemChild($itemName, $childName)
+	{
+		if ($itemName === $childName) {
+			throw new Exception("Cannot add '$itemName' as a child of itself.");
+		}
+		$query = new Query;
+		$rows = $query->from($this->itemTable)
+			->where('name=:name1 OR name=:name2', array(
+				':name1' => $itemName,
+				':name2' => $childName
+			))
+			->createCommand($this->db)
+			->queryAll();
+		if (count($rows) == 2) {
+			if ($rows[0]['name'] === $itemName) {
+				$parentType = $rows[0]['type'];
+				$childType = $rows[1]['type'];
+			} else {
+				$childType = $rows[0]['type'];
+				$parentType = $rows[1]['type'];
+			}
+			$this->checkItemChildType($parentType, $childType);
+			if ($this->detectLoop($itemName, $childName)) {
+				throw new Exception("Cannot add '$childName' as a child of '$itemName'. A loop has been detected.");
+			}
+			$this->db->createCommand()
+				->insert($this->itemChildTable, array(
+					'parent' => $itemName,
+					'child' => $childName,
+				));
+			return true;
+		} else {
+			throw new Exception("Either '$itemName' or '$childName' does not exist.");
+		}
+	}
+
+	/**
+	 * Removes a child from its parent.
+	 * Note, the child item is not deleted. Only the parent-child relationship is removed.
+	 * @param string $itemName the parent item name
+	 * @param string $childName the child item name
+	 * @return boolean whether the removal is successful
+	 */
+	public function removeItemChild($itemName, $childName)
+	{
+		return $this->db->createCommand()
+			->delete($this->itemChildTable, 'parent=:parent AND child=:child', array(
+				':parent' => $itemName,
+				':child' => $childName
+			)) > 0;
+	}
+
+	/**
+	 * Returns a value indicating whether a child exists within a parent.
+	 * @param string $itemName the parent item name
+	 * @param string $childName the child item name
+	 * @return boolean whether the child exists
+	 */
+	public function hasItemChild($itemName, $childName)
+	{
+		$query = new Query;
+		return $query->select(array('parent'))
+			->from($this->itemChildTable)
+			->where('parent=:parent AND child=:child', array(
+				':parent' => $itemName,
+				':child' => $childName))
+			->createCommand($this->db)
+			->queryScalar() !== false;
+	}
+
+	/**
+	 * Returns the children of the specified item.
+	 * @param mixed $names the parent item name. This can be either a string or an array.
+	 * The latter represents a list of item names.
+	 * @return Item[] all child items of the parent
+	 */
+	public function getItemChildren($names)
+	{
+		if (is_string($names)) {
+			$condition = 'parent=' . $this->db->quoteValue($names);
+		} elseif (is_array($names) && !empty($names)) {
+			foreach ($names as &$name) {
+				$name = $this->db->quoteValue($name);
+			}
+			$condition = 'parent IN (' . implode(', ', $names) . ')';
+		}
+		$query = new Query;
+		$rows = $query->select(array('name', 'type', 'description', 'bizrule', 'data'))
+			->from(array(
+				$this->itemTable,
+				$this->itemChildTable
+			))
+			->where($condition . ' AND name=child')
+			->createCommand($this->db)
+			->queryAll();
+		$children = array();
+		foreach ($rows as $row) {
+			if (($data = @unserialize($row['data'])) === false) {
+				$data = null;
+			}
+			$children[$row['name']] = new Item($this, $row['name'], $row['type'], $row['description'], $row['bizrule'], $data);
+		}
+		return $children;
+	}
+
+	/**
+	 * Assigns an authorization item to a user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @param string $bizRule the business rule to be executed when [[checkAccess()]] is called
+	 * for this particular authorization item.
+	 * @param mixed $data additional data associated with this assignment
+	 * @return Assignment the authorization assignment information.
+	 * @throws Exception if the item does not exist or if the item has already been assigned to the user
+	 */
+	public function assign($userId, $itemName, $bizRule = null, $data = null)
+	{
+		if ($this->usingSqlite() && $this->getItem($itemName) === null) {
+			throw new Exception("The item '$itemName' does not exist.");
+		}
+		$this->db->createCommand()
+			->insert($this->assignmentTable, array(
+				'userid' => $userId,
+				'itemname' => $itemName,
+				'bizrule' => $bizRule,
+				'data' => serialize($data)
+			));
+		return new Assignment($this, $userId, $itemName, $bizRule, $data);
+	}
+
+	/**
+	 * Revokes an authorization assignment from a user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @return boolean whether removal is successful
+	 */
+	public function revoke($userId, $itemName)
+	{
+		return $this->db->createCommand()
+			->delete($this->assignmentTable, 'itemname=:itemname AND userid=:userid', array(
+				':userid' => $userId,
+				':itemname' => $itemName
+			)) > 0;
+	}
+
+	/**
+	 * Returns a value indicating whether the item has been assigned to the user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @return boolean whether the item has been assigned to the user.
+	 */
+	public function isAssigned($itemName, $userId)
+	{
+		$query = new Query;
+		return $query->select(array('itemname'))
+			->from($this->assignmentTable)
+			->where('itemname=:itemname AND userid=:userid', array(
+				':userid' => $userId,
+				':itemname' => $itemName
+			))
+			->createCommand($this->db)
+			->queryScalar() !== false;
+	}
+
+	/**
+	 * Returns the item assignment information.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @return Assignment the item assignment information. Null is returned if
+	 * the item is not assigned to the user.
+	 */
+	public function getAssignment($userId, $itemName)
+	{
+		$query = new Query;
+		$row = $query->from($this->assignmentTable)
+			->where('itemname=:itemname AND userid=:userid', array(
+				':userid' => $userId,
+				':itemname' => $itemName
+			))
+			->createCommand($this->db)
+			->queryRow();
+		if ($row !== false) {
+			if (($data = @unserialize($row['data'])) === false) {
+				$data = null;
+			}
+			return new Assignment($this, $row['userid'], $row['itemname'], $row['bizrule'], $data);
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * Returns the item assignments for the specified user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @return Assignment[] the item assignment information for the user. An empty array will be
+	 * returned if there is no item assigned to the user.
+	 */
+	public function getAssignments($userId)
+	{
+		$query = new Query;
+		$rows = $query->from($this->assignmentTable)
+			->where('userid=:userid', array(':userid' => $userId))
+			->createCommand($this->db)
+			->queryAll();
+		$assignments = array();
+		foreach ($rows as $row) {
+			if (($data = @unserialize($row['data'])) === false) {
+				$data = null;
+			}
+			$assignments[$row['itemname']] = new Assignment($this, $row['userid'], $row['itemname'], $row['bizrule'], $data);
+		}
+		return $assignments;
+	}
+
+	/**
+	 * Saves the changes to an authorization assignment.
+	 * @param Assignment $assignment the assignment that has been changed.
+	 */
+	public function saveAssignment($assignment)
+	{
+		$this->db->createCommand()
+			->update($this->assignmentTable, array(
+				'bizrule' => $assignment->getBizRule(),
+				'data' => serialize($assignment->getData()),
+			), 'itemname=:itemname AND userid=:userid', array(
+				'userid' => $assignment->getUserId(),
+				'itemname' => $assignment->getItemName()
+			));
+	}
+
+	/**
+	 * Returns the authorization items of the specific type and user.
+	 * @param mixed $userId the user ID. Defaults to null, meaning returning all items even if
+	 * they are not assigned to a user.
+	 * @param integer $type the item type (0: operation, 1: task, 2: role). Defaults to null,
+	 * meaning returning all items regardless of their type.
+	 * @return Item[] the authorization items of the specific type.
+	 */
+	public function getItems($userId = null, $type = null)
+	{
+		$query = new Query;
+		if ($userId === null && $type === null) {
+			$command = $query->from($this->itemTable)
+				->createCommand($this->db);
+		} elseif ($userId === null) {
+			$command = $query->from($this->itemTable)
+				->where('type=:type', array(':type' => $type))
+				->createCommand($this->db);
+		} elseif ($type === null) {
+			$command = $query->select(array('name', 'type', 'description', 't1.bizrule', 't1.data'))
+				->from(array(
+					$this->itemTable . ' t1',
+					$this->assignmentTable . ' t2'
+				))
+				->where('name=itemname AND userid=:userid', array(':userid' => $userId))
+				->createCommand($this->db);
+		} else {
+			$command = $query->select('name', 'type', 'description', 't1.bizrule', 't1.data')
+				->from(array(
+					$this->itemTable . ' t1',
+					$this->assignmentTable . ' t2'
+				))
+				->where('name=itemname AND type=:type AND userid=:userid', array(
+					':userid' => $userId,
+					':type' => $type
+				))
+				->createCommand($this->db);
+		}
+		$items = array();
+		foreach ($command->queryAll() as $row) {
+			if (($data = @unserialize($row['data'])) === false) {
+				$data = null;
+			}
+			$items[$row['name']] = new Item($this, $row['name'], $row['type'], $row['description'], $row['bizrule'], $data);
+		}
+		return $items;
+	}
+
+	/**
+	 * Creates an authorization item.
+	 * An authorization item represents an action permission (e.g. creating a post).
+	 * It has three types: operation, task and role.
+	 * Authorization items form a hierarchy. Higher level items inheirt permissions representing
+	 * by lower level items.
+	 * @param string $name the item name. This must be a unique identifier.
+	 * @param integer $type the item type (0: operation, 1: task, 2: role).
+	 * @param string $description description of the item
+	 * @param string $bizRule business rule associated with the item. This is a piece of
+	 * PHP code that will be executed when [[checkAccess()]] is called for the item.
+	 * @param mixed $data additional data associated with the item.
+	 * @return Item the authorization item
+	 * @throws Exception if an item with the same name already exists
+	 */
+	public function createItem($name, $type, $description = '', $bizRule = null, $data = null)
+	{
+		$this->db->createCommand()
+			->insert($this->itemTable, array(
+				'name' => $name,
+				'type' => $type,
+				'description' => $description,
+				'bizrule' => $bizRule,
+				'data' => serialize($data)
+			));
+		return new Item($this, $name, $type, $description, $bizRule, $data);
+	}
+
+	/**
+	 * Removes the specified authorization item.
+	 * @param string $name the name of the item to be removed
+	 * @return boolean whether the item exists in the storage and has been removed
+	 */
+	public function removeItem($name)
+	{
+		if ($this->usingSqlite()) {
+			$this->db->createCommand()
+				->delete($this->itemChildTable, 'parent=:name1 OR child=:name2', array(
+					':name1' => $name,
+					':name2' => $name
+				));
+			$this->db->createCommand()
+				->delete($this->assignmentTable, 'itemname=:name', array(
+					':name' => $name,
+				));
+		}
+
+		return $this->db->createCommand()
+			->delete($this->itemTable, 'name=:name', array(
+				':name' => $name
+			)) > 0;
+	}
+
+	/**
+	 * Returns the authorization item with the specified name.
+	 * @param string $name the name of the item
+	 * @return Item the authorization item. Null if the item cannot be found.
+	 */
+	public function getItem($name)
+	{
+		$query = new Query;
+		$row = $query->from($this->itemTable)
+			->where('name=:name', array(':name' => $name))
+			->createCommand($this->db)
+			->queryRow();
+
+		if ($row !== false) {
+			if (($data = @unserialize($row['data'])) === false) {
+				$data = null;
+			}
+			return new Item($this, $row['name'], $row['type'], $row['description'], $row['bizrule'], $data);
+		} else
+			return null;
+	}
+
+	/**
+	 * Saves an authorization item to persistent storage.
+	 * @param Item $item the item to be saved.
+	 * @param string $oldName the old item name. If null, it means the item name is not changed.
+	 */
+	public function saveItem($item, $oldName = null)
+	{
+		if ($this->usingSqlite() && $oldName !== null && $item->getName() !== $oldName) {
+			$this->db->createCommand()
+				->update($this->itemChildTable, array(
+					'parent' => $item->getName(),
+				), 'parent=:whereName', array(
+					':whereName' => $oldName,
+				));
+			$this->db->createCommand()
+				->update($this->itemChildTable, array(
+					'child' => $item->getName(),
+				), 'child=:whereName', array(
+					':whereName' => $oldName,
+				));
+			$this->db->createCommand()
+				->update($this->assignmentTable, array(
+					'itemname' => $item->getName(),
+				), 'itemname=:whereName', array(
+					':whereName' => $oldName,
+				));
+		}
+
+		$this->db->createCommand()
+			->update($this->itemTable, array(
+				'name' => $item->getName(),
+				'type' => $item->getType(),
+				'description' => $item->getDescription(),
+				'bizrule' => $item->getBizRule(),
+				'data' => serialize($item->getData()),
+			), 'name=:whereName', array(
+				':whereName' => $oldName === null ? $item->getName() : $oldName,
+			));
+	}
+
+	/**
+	 * Saves the authorization data to persistent storage.
+	 */
+	public function save()
+	{
+	}
+
+	/**
+	 * Removes all authorization data.
+	 */
+	public function clearAll()
+	{
+		$this->clearAssignments();
+		$this->db->createCommand()->delete($this->itemChildTable);
+		$this->db->createCommand()->delete($this->itemTable);
+	}
+
+	/**
+	 * Removes all authorization assignments.
+	 */
+	public function clearAssignments()
+	{
+		$this->db->createCommand()->delete($this->assignmentTable);
+	}
+
+	/**
+	 * Checks whether there is a loop in the authorization item hierarchy.
+	 * @param string $itemName parent item name
+	 * @param string $childName the name of the child item that is to be added to the hierarchy
+	 * @return boolean whether a loop exists
+	 */
+	protected function detectLoop($itemName, $childName)
+	{
+		if ($childName === $itemName) {
+			return true;
+		}
+		foreach ($this->getItemChildren($childName) as $child) {
+			if ($this->detectLoop($itemName, $child->getName())) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * @return boolean whether the database is a SQLite database
+	 */
+	protected function usingSqlite()
+	{
+		return $this->_usingSqlite;
+	}
+}
diff --git a/framework/rbac/IManager.php b/framework/rbac/IManager.php
new file mode 100644
index 0000000..6eeb661
--- /dev/null
+++ b/framework/rbac/IManager.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\rbac;
+
+/**
+ * IManager interface is implemented by an auth manager application component.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Alexander Kochetov <creocoder@gmail.com>
+ * @since 2.0
+ */
+interface IManager
+{
+	/**
+	 * Performs access check for the specified user.
+	 * @param mixed $userId the user ID. This should be either an integer or a string representing
+	 * the unique identifier of a user. See [[User::id]].
+	 * @param string $itemName the name of the operation that we are checking access to
+	 * @param array $params name-value pairs that would be passed to biz rules associated
+	 * with the tasks and roles assigned to the user.
+	 * @return boolean whether the operations can be performed by the user.
+	 */
+	public function checkAccess($userId, $itemName, $params = array());
+
+	/**
+	 * Creates an authorization item.
+	 * An authorization item represents an action permission (e.g. creating a post).
+	 * It has three types: operation, task and role.
+	 * Authorization items form a hierarchy. Higher level items inheirt permissions representing
+	 * by lower level items.
+	 * @param string $name the item name. This must be a unique identifier.
+	 * @param integer $type the item type (0: operation, 1: task, 2: role).
+	 * @param string $description description of the item
+	 * @param string $bizRule business rule associated with the item. This is a piece of
+	 * PHP code that will be executed when [[checkAccess()]] is called for the item.
+	 * @param mixed $data additional data associated with the item.
+	 * @throws \yii\base\Exception if an item with the same name already exists
+	 * @return Item the authorization item
+	 */
+	public function createItem($name, $type, $description = '', $bizRule = null, $data = null);
+	/**
+	 * Removes the specified authorization item.
+	 * @param string $name the name of the item to be removed
+	 * @return boolean whether the item exists in the storage and has been removed
+	 */
+	public function removeItem($name);
+	/**
+	 * Returns the authorization items of the specific type and user.
+	 * @param mixed $userId the user ID. Defaults to null, meaning returning all items even if
+	 * they are not assigned to a user.
+	 * @param integer $type the item type (0: operation, 1: task, 2: role). Defaults to null,
+	 * meaning returning all items regardless of their type.
+	 * @return Item[] the authorization items of the specific type.
+	 */
+	public function getItems($userId = null, $type = null);
+	/**
+	 * Returns the authorization item with the specified name.
+	 * @param string $name the name of the item
+	 * @return Item the authorization item. Null if the item cannot be found.
+	 */
+	public function getItem($name);
+	/**
+	 * Saves an authorization item to persistent storage.
+	 * @param Item $item the item to be saved.
+	 * @param string $oldName the old item name. If null, it means the item name is not changed.
+	 */
+	public function saveItem($item, $oldName = null);
+
+	/**
+	 * Adds an item as a child of another item.
+	 * @param string $itemName the parent item name
+	 * @param string $childName the child item name
+	 * @throws \yii\base\Exception if either parent or child doesn't exist or if a loop has been detected.
+	 */
+	public function addItemChild($itemName, $childName);
+	/**
+	 * Removes a child from its parent.
+	 * Note, the child item is not deleted. Only the parent-child relationship is removed.
+	 * @param string $itemName the parent item name
+	 * @param string $childName the child item name
+	 * @return boolean whether the removal is successful
+	 */
+	public function removeItemChild($itemName, $childName);
+	/**
+	 * Returns a value indicating whether a child exists within a parent.
+	 * @param string $itemName the parent item name
+	 * @param string $childName the child item name
+	 * @return boolean whether the child exists
+	 */
+	public function hasItemChild($itemName, $childName);
+	/**
+	 * Returns the children of the specified item.
+	 * @param mixed $itemName the parent item name. This can be either a string or an array.
+	 * The latter represents a list of item names.
+	 * @return Item[] all child items of the parent
+	 */
+	public function getItemChildren($itemName);
+
+	/**
+	 * Assigns an authorization item to a user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @param string $bizRule the business rule to be executed when [[checkAccess()]] is called
+	 * for this particular authorization item.
+	 * @param mixed $data additional data associated with this assignment
+	 * @return Assignment the authorization assignment information.
+	 * @throws \yii\base\Exception if the item does not exist or if the item has already been assigned to the user
+	 */
+	public function assign($userId, $itemName, $bizRule = null, $data = null);
+	/**
+	 * Revokes an authorization assignment from a user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @return boolean whether removal is successful
+	 */
+	public function revoke($userId, $itemName);
+	/**
+	 * Returns a value indicating whether the item has been assigned to the user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @return boolean whether the item has been assigned to the user.
+	 */
+	public function isAssigned($userId, $itemName);
+	/**
+	 * Returns the item assignment information.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @return Assignment the item assignment information. Null is returned if
+	 * the item is not assigned to the user.
+	 */
+	public function getAssignment($userId, $itemName);
+	/**
+	 * Returns the item assignments for the specified user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @return Item[] the item assignment information for the user. An empty array will be
+	 * returned if there is no item assigned to the user.
+	 */
+	public function getAssignments($userId);
+	/**
+	 * Saves the changes to an authorization assignment.
+	 * @param Assignment $assignment the assignment that has been changed.
+	 */
+	public function saveAssignment($assignment);
+	/**
+	 * Removes all authorization data.
+	 */
+	public function clearAll();
+	/**
+	 * Removes all authorization assignments.
+	 */
+	public function clearAssignments();
+	/**
+	 * Saves authorization data into persistent storage.
+	 * If any change is made to the authorization data, please make
+	 * sure you call this method to save the changed data into persistent storage.
+	 */
+	public function save();
+	/**
+	 * Executes a business rule.
+	 * A business rule is a piece of PHP code that will be executed when [[checkAccess()]] is called.
+	 * @param string $bizRule the business rule to be executed.
+	 * @param array $params additional parameters to be passed to the business rule when being executed.
+	 * @param mixed $data additional data that is associated with the corresponding authorization item or assignment
+	 * @return boolean whether the execution returns a true value.
+	 * If the business rule is empty, it will also return true.
+	 */
+	public function executeBizRule($bizRule, $params, $data);
+}
diff --git a/framework/rbac/Item.php b/framework/rbac/Item.php
index ba78e60..d09196f 100644
--- a/framework/rbac/Item.php
+++ b/framework/rbac/Item.php
@@ -202,7 +202,7 @@ class Item extends Object
 
 	/**
 	 * Returns the children of this item.
-	 * @return array all child items of this item.
+	 * @return Item[] all child items of this item.
 	 * @see IManager::getItemChildren
 	 */
 	public function getChildren()
diff --git a/framework/rbac/Manager.php b/framework/rbac/Manager.php
index 2f77e10..4846546 100644
--- a/framework/rbac/Manager.php
+++ b/framework/rbac/Manager.php
@@ -83,7 +83,7 @@ abstract class Manager extends Component implements IManager
 	 * This is a shortcut method to [[IManager::getItems()]].
 	 * @param mixed $userId the user ID. If not null, only the roles directly assigned to the user
 	 * will be returned. Otherwise, all roles will be returned.
-	 * @return array roles (name=>AuthItem)
+	 * @return Item[] roles (name=>AuthItem)
 	 */
 	public function getRoles($userId = null)
 	{
@@ -95,7 +95,7 @@ abstract class Manager extends Component implements IManager
 	 * This is a shortcut method to [[IManager::getItems()]].
 	 * @param mixed $userId the user ID. If not null, only the tasks directly assigned to the user
 	 * will be returned. Otherwise, all tasks will be returned.
-	 * @return array tasks (name=>AuthItem)
+	 * @return Item[] tasks (name=>AuthItem)
 	 */
 	public function getTasks($userId = null)
 	{
@@ -107,7 +107,7 @@ abstract class Manager extends Component implements IManager
 	 * This is a shortcut method to [[IManager::getItems()]].
 	 * @param mixed $userId the user ID. If not null, only the operations directly assigned to the user
 	 * will be returned. Otherwise, all operations will be returned.
-	 * @return array operations (name=>AuthItem)
+	 * @return Item[] operations (name=>AuthItem)
 	 */
 	public function getOperations($userId = null)
 	{
diff --git a/framework/rbac/PhpManager.php b/framework/rbac/PhpManager.php
index 08f5c83..3f471c6 100644
--- a/framework/rbac/PhpManager.php
+++ b/framework/rbac/PhpManager.php
@@ -52,8 +52,8 @@ class PhpManager extends Manager
 	 * @param string $itemName the name of the operation that need access check
 	 * the unique identifier of a user. See [[User::id]].
 	 * @param array $params name-value pairs that would be passed to biz rules associated
-	 * with the tasks and roles assigned to the user.
-	 * Since version 1.1.11 a param with name 'userId' is added to this array, which holds the value of <code>$userId</code>.
+	 * with the tasks and roles assigned to the user. A param with name 'userId' is added to
+	 * this array, which holds the value of `$userId`.
 	 * @return boolean whether the operations can be performed by the user.
 	 */
 	public function checkAccess($userId, $itemName, $params = array())
@@ -61,6 +61,7 @@ class PhpManager extends Manager
 		if (!isset($this->_items[$itemName])) {
 			return false;
 		}
+		/** @var $item Item */
 		$item = $this->_items[$itemName];
 		Yii::trace('Checking permission: ' . $item->getName(), __METHOD__);
 		if (!isset($params['userId'])) {
@@ -71,6 +72,7 @@ class PhpManager extends Manager
 				return true;
 			}
 			if (isset($this->_assignments[$userId][$itemName])) {
+				/** @var $assignment Assignment */
 				$assignment = $this->_assignments[$userId][$itemName];
 				if ($this->executeBizRule($assignment->getBizRule(), $params, $assignment->getData())) {
 					return true;
@@ -97,7 +99,9 @@ class PhpManager extends Manager
 		if (!isset($this->_items[$childName], $this->_items[$itemName])) {
 			throw new Exception("Either '$itemName' or '$childName' does not exist.");
 		}
+		/** @var $child Item */
 		$child = $this->_items[$childName];
+		/** @var $item Item */
 		$item = $this->_items[$itemName];
 		$this->checkItemChildType($item->getType(), $child->getType());
 		if ($this->detectLoop($itemName, $childName)) {
@@ -142,7 +146,7 @@ class PhpManager extends Manager
 	 * Returns the children of the specified item.
 	 * @param mixed $names the parent item name. This can be either a string or an array.
 	 * The latter represents a list of item names.
-	 * @return array all child items of the parent
+	 * @return Item[] all child items of the parent
 	 */
 	public function getItemChildren($names)
 	{
@@ -176,7 +180,7 @@ class PhpManager extends Manager
 		} elseif (isset($this->_assignments[$userId][$itemName])) {
 			throw new Exception("Authorization item '$itemName' has already been assigned to user '$userId'.");
 		} else {
-			return $this->_assignments[$userId][$itemName] = new Assignment($this, $itemName, $userId, $bizRule, $data);
+			return $this->_assignments[$userId][$itemName] = new Assignment($this, $userId, $itemName, $bizRule, $data);
 		}
 	}
 
@@ -222,7 +226,7 @@ class PhpManager extends Manager
 	/**
 	 * Returns the item assignments for the specified user.
 	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @return array the item assignment information for the user. An empty array will be
+	 * @return Assignment[] the item assignment information for the user. An empty array will be
 	 * returned if there is no item assigned to the user.
 	 */
 	public function getAssignments($userId)
@@ -236,22 +240,24 @@ class PhpManager extends Manager
 	 * they are not assigned to a user.
 	 * @param integer $type the item type (0: operation, 1: task, 2: role). Defaults to null,
 	 * meaning returning all items regardless of their type.
-	 * @return array the authorization items of the specific type.
+	 * @return Item[] the authorization items of the specific type.
 	 */
 	public function getItems($userId = null, $type = null)
 	{
-		if ($type === null && $userId === null) {
+		if ($userId === null && $type === null) {
 			return $this->_items;
 		}
 		$items = array();
 		if ($userId === null) {
 			foreach ($this->_items as $name => $item) {
+				/** @var $item Item */
 				if ($item->getType() == $type) {
 					$items[$name] = $item;
 				}
 			}
 		} elseif (isset($this->_assignments[$userId])) {
 			foreach ($this->_assignments[$userId] as $assignment) {
+				/** @var $assignment Assignment */
 				$name = $assignment->getItemName();
 				if (isset($this->_items[$name]) && ($type === null || $this->_items[$name]->getType() == $type)) {
 					$items[$name] = $this->_items[$name];
@@ -368,6 +374,7 @@ class PhpManager extends Manager
 	{
 		$items = array();
 		foreach ($this->_items as $name => $item) {
+			/** @var $item Item */
 			$items[$name] = array(
 				'type' => $item->getType(),
 				'description' => $item->getDescription(),
@@ -376,6 +383,7 @@ class PhpManager extends Manager
 			);
 			if (isset($this->_children[$name])) {
 				foreach ($this->_children[$name] as $child) {
+					/** @var $child Item */
 					$items[$name]['children'][] = $child->getName();
 				}
 			}
@@ -383,6 +391,7 @@ class PhpManager extends Manager
 
 		foreach ($this->_assignments as $userId => $assignments) {
 			foreach ($assignments as $name => $assignment) {
+				/** @var $assignment Assignment */
 				if (isset($items[$name])) {
 					$items[$name]['assignments'][$userId] = array(
 						'bizRule' => $assignment->getBizRule(),
@@ -457,6 +466,7 @@ class PhpManager extends Manager
 			return false;
 		}
 		foreach ($this->_children[$childName] as $child) {
+			/** @var $child Item */
 			if ($this->detectLoop($itemName, $child->getName())) {
 				return true;
 			}

From c9fe510ebbe14266519b8feb1e5b687075372dad Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Fri, 10 May 2013 09:52:21 +0400
Subject: [PATCH 128/152] Comment fixes + class descriptions added

---
 framework/rbac/Assignment.php |  9 +++++++++
 framework/rbac/DbManager.php  | 12 ++++++++++--
 framework/rbac/IManager.php   |  2 ++
 framework/rbac/Item.php       | 14 ++++++++++++++
 framework/rbac/Manager.php    | 24 ++++++++++++++++++++++++
 framework/rbac/PhpManager.php | 13 ++++++++++++-
 6 files changed, 71 insertions(+), 3 deletions(-)

diff --git a/framework/rbac/Assignment.php b/framework/rbac/Assignment.php
index 576017e..e5d6157 100644
--- a/framework/rbac/Assignment.php
+++ b/framework/rbac/Assignment.php
@@ -11,6 +11,15 @@ use Yii;
 use yii\base\Object;
 
 /**
+ * Assignment represents an assignment of a role to a user.
+ * It includes additional assignment information such as [[bizRule]] and [[data]].
+ * Do not create a Assignment instance using the 'new' operator.
+ * Instead, call [[IManager::assign]].
+ *
+ * @property mixed $userId User ID (see [[User::id]]).
+ * @property string $itemName The authorization item name.
+ * @property string $bizRule The business rule associated with this assignment.
+ * @property mixed $data Additional data for this assignment.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @author Alexander Kochetov <creocoder@gmail.com>
diff --git a/framework/rbac/DbManager.php b/framework/rbac/DbManager.php
index 5f64694..d3c584c 100644
--- a/framework/rbac/DbManager.php
+++ b/framework/rbac/DbManager.php
@@ -14,6 +14,14 @@ use yii\base\Exception;
 use yii\base\InvalidConfigException;
 
 /**
+ * DbManager represents an authorization manager that stores authorization information in database.
+ *
+ * The database connection is specified by [[db]]. And the database schema
+ * should be as described in "framework/rbac/*.sql". You may change the names of
+ * the three tables used to store the authorization data by setting [[itemTable]],
+ * [[itemChildTable]] and [[assignmentTable]].
+ *
+ * @property array $authItems The authorization items of the specific type.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @author Alexander Kochetov <creocoder@gmail.com>
@@ -60,9 +68,9 @@ class DbManager extends Manager
 
 	/**
 	 * Performs access check for the specified user.
-	 * @param mixed $userId the user ID. This should can be either an integer and a string representing
-	 * @param string $itemName the name of the operation that need access check
+	 * @param mixed $userId the user ID. This should can be either an integer or a string representing
 	 * the unique identifier of a user. See [[User::id]].
+	 * @param string $itemName the name of the operation that need access check
 	 * @param array $params name-value pairs that would be passed to biz rules associated
 	 * with the tasks and roles assigned to the user. A param with name 'userId' is added to this array,
 	 * which holds the value of `$userId`.
diff --git a/framework/rbac/IManager.php b/framework/rbac/IManager.php
index 6eeb661..0e9eea0 100644
--- a/framework/rbac/IManager.php
+++ b/framework/rbac/IManager.php
@@ -10,6 +10,8 @@ namespace yii\rbac;
 /**
  * IManager interface is implemented by an auth manager application component.
  *
+ * An auth manager is mainly responsible for providing role-based access control (RBAC) service.
+ *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @author Alexander Kochetov <creocoder@gmail.com>
  * @since 2.0
diff --git a/framework/rbac/Item.php b/framework/rbac/Item.php
index d09196f..1297e41 100644
--- a/framework/rbac/Item.php
+++ b/framework/rbac/Item.php
@@ -11,6 +11,20 @@ use Yii;
 use yii\base\Object;
 
 /**
+ * Item represents an authorization item.
+ * An authorization item can be an operation, a task or a role.
+ * They form an authorization hierarchy. Items on higher levels of the hierarchy
+ * inherit the permissions represented by items on lower levels.
+ * A user may be assigned one or several authorization items (called [[Assignment]] assignments).
+ * He can perform an operation only when it is among his assigned items.
+ *
+ * @property IManager $authManager The authorization manager.
+ * @property integer $type The authorization item type. This could be 0 (operation), 1 (task) or 2 (role).
+ * @property string $name The item name.
+ * @property string $description The item description.
+ * @property string $bizRule The business rule associated with this item.
+ * @property mixed $data The additional data associated with this item.
+ * @property array $children All child items of this item.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @author Alexander Kochetov <creocoder@gmail.com>
diff --git a/framework/rbac/Manager.php b/framework/rbac/Manager.php
index 4846546..6d0b74d 100644
--- a/framework/rbac/Manager.php
+++ b/framework/rbac/Manager.php
@@ -12,6 +12,30 @@ use yii\base\Component;
 use yii\base\Exception;
 
 /**
+ * Manager is the base class for authorization manager classes.
+ *
+ * Manager extends [[Component]] and implements some methods
+ * that are common among authorization manager classes.
+ *
+ * Manager together with its concrete child classes implement the Role-Based
+ * Access Control (RBAC).
+ *
+ * The main idea is that permissions are organized as a hierarchy of
+ * [[Item]] authorization items. Items on higer level inherit the permissions
+ * represented by items on lower level. And roles are simply top-level authorization items
+ * that may be assigned to individual users. A user is said to have a permission
+ * to do something if the corresponding authorization item is inherited by one of his roles.
+ *
+ * Using authorization manager consists of two aspects. First, the authorization hierarchy
+ * and assignments have to be established. Manager and its child classes
+ * provides APIs to accomplish this task. Developers may need to develop some GUI
+ * so that it is more intuitive to end-users. Second, developers call [[IManager::checkAccess()]]
+ * at appropriate places in the application code to check if the current user
+ * has the needed permission for an operation.
+ *
+ * @property array $roles Roles (name=>Item).
+ * @property array $tasks Tasks (name=>Item).
+ * @property array $operations Operations (name=>Item).
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @author Alexander Kochetov <creocoder@gmail.com>
diff --git a/framework/rbac/PhpManager.php b/framework/rbac/PhpManager.php
index 3f471c6..baacb36 100644
--- a/framework/rbac/PhpManager.php
+++ b/framework/rbac/PhpManager.php
@@ -11,6 +11,17 @@ use Yii;
 use yii\base\Exception;
 
 /**
+ * PhpManager represents an authorization manager that stores authorization
+ * information in terms of a PHP script file.
+ *
+ * The authorization data will be saved to and loaded from a file
+ * specified by [[authFile]], which defaults to 'protected/data/rbac.php'.
+ *
+ * PhpManager is mainly suitable for authorization data that is not too big
+ * (for example, the authorization data for a personal blog system).
+ * Use [[DbManager]] for more complex authorization data.
+ *
+ * @property array $authItems The authorization items of the specific type.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @author Alexander Kochetov <creocoder@gmail.com>
@@ -20,7 +31,7 @@ class PhpManager extends Manager
 {
 	/**
 	 * @var string the path of the PHP script that contains the authorization data.
-	 * If not set, it will be using 'protected/data/auth.php' as the data file.
+	 * If not set, it will be using 'protected/data/rbac.php' as the data file.
 	 * Make sure this file is writable by the Web server process if the authorization
 	 * needs to be changed.
 	 * @see loadFromFile

From 132391065ca3a148ffa777985ac72886bf9e6ab6 Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Fri, 10 May 2013 09:59:18 +0400
Subject: [PATCH 129/152] Comment fixes

---
 framework/rbac/DbManager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/rbac/DbManager.php b/framework/rbac/DbManager.php
index d3c584c..81a0edd 100644
--- a/framework/rbac/DbManager.php
+++ b/framework/rbac/DbManager.php
@@ -85,7 +85,7 @@ class DbManager extends Manager
 	/**
 	 * Performs access check for the specified user.
 	 * This method is internally called by [[checkAccess()]].
-	 * @param mixed $userId the user ID. This should can be either an integer and a string representing
+	 * @param mixed $userId the user ID. This should can be either an integer or a string representing
 	 * the unique identifier of a user. See [[User::id]].
 	 * @param string $itemName the name of the operation that need access check
 	 * @param array $params name-value pairs that would be passed to biz rules associated

From 56757cdd94dca5fe357f02373f7f9b8ace130120 Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Fri, 10 May 2013 10:02:36 +0400
Subject: [PATCH 130/152] PhpManager::saveToFile() LOCK_EX added

---
 framework/rbac/PhpManager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/rbac/PhpManager.php b/framework/rbac/PhpManager.php
index baacb36..60eb193 100644
--- a/framework/rbac/PhpManager.php
+++ b/framework/rbac/PhpManager.php
@@ -508,6 +508,6 @@ class PhpManager extends Manager
 	 */
 	protected function saveToFile($data, $file)
 	{
-		file_put_contents($file, "<?php\nreturn " . var_export($data, true) . ";\n");
+		file_put_contents($file, "<?php\nreturn " . var_export($data, true) . ";\n", LOCK_EX);
 	}
 }

From ded8c22b56ff5f99d6f34044aa3825d29827ead4 Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Fri, 10 May 2013 10:15:19 +0400
Subject: [PATCH 131/152] Exception types corrected

---
 framework/rbac/DbManager.php  |  6 ++++--
 framework/rbac/Manager.php    |  6 +++---
 framework/rbac/PhpManager.php | 19 +++++++++++--------
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/framework/rbac/DbManager.php b/framework/rbac/DbManager.php
index 81a0edd..286c0b5 100644
--- a/framework/rbac/DbManager.php
+++ b/framework/rbac/DbManager.php
@@ -12,6 +12,7 @@ use yii\db\Connection;
 use yii\db\Query;
 use yii\base\Exception;
 use yii\base\InvalidConfigException;
+use yii\base\InvalidCallException;
 
 /**
  * DbManager represents an authorization manager that stores authorization information in database.
@@ -133,7 +134,8 @@ class DbManager extends Manager
 	 * @param string $itemName the parent item name
 	 * @param string $childName the child item name
 	 * @return boolean whether the item is added successfully
-	 * @throws Exception if either parent or child doesn't exist or if a loop has been detected.
+	 * @throws Exception if either parent or child doesn't exist.
+	 * @throws InvalidCallException if a loop has been detected.
 	 */
 	public function addItemChild($itemName, $childName)
 	{
@@ -158,7 +160,7 @@ class DbManager extends Manager
 			}
 			$this->checkItemChildType($parentType, $childType);
 			if ($this->detectLoop($itemName, $childName)) {
-				throw new Exception("Cannot add '$childName' as a child of '$itemName'. A loop has been detected.");
+				throw new InvalidCallException("Cannot add '$childName' as a child of '$itemName'. A loop has been detected.");
 			}
 			$this->db->createCommand()
 				->insert($this->itemChildTable, array(
diff --git a/framework/rbac/Manager.php b/framework/rbac/Manager.php
index 6d0b74d..ce36e60 100644
--- a/framework/rbac/Manager.php
+++ b/framework/rbac/Manager.php
@@ -9,7 +9,7 @@ namespace yii\rbac;
 
 use Yii;
 use yii\base\Component;
-use yii\base\Exception;
+use yii\base\InvalidParamException;
 
 /**
  * Manager is the base class for authorization manager classes.
@@ -155,13 +155,13 @@ abstract class Manager extends Component implements IManager
 	 * Checks the item types to make sure a child can be added to a parent.
 	 * @param integer $parentType parent item type
 	 * @param integer $childType child item type
-	 * @throws Exception if the item cannot be added as a child due to its incompatible type.
+	 * @throws InvalidParamException if the item cannot be added as a child due to its incompatible type.
 	 */
 	protected function checkItemChildType($parentType, $childType)
 	{
 		static $types = array('operation', 'task', 'role');
 		if ($parentType < $childType) {
-			throw new Exception("Cannot add an item of type '$types[$childType]' to an item of type '$types[$parentType]'.");
+			throw new InvalidParamException("Cannot add an item of type '$types[$childType]' to an item of type '$types[$parentType]'.");
 		}
 	}
 }
diff --git a/framework/rbac/PhpManager.php b/framework/rbac/PhpManager.php
index 60eb193..8a4dbec 100644
--- a/framework/rbac/PhpManager.php
+++ b/framework/rbac/PhpManager.php
@@ -9,6 +9,8 @@ namespace yii\rbac;
 
 use Yii;
 use yii\base\Exception;
+use yii\base\InvalidCallException;
+use yii\base\InvalidParamException;
 
 /**
  * PhpManager represents an authorization manager that stores authorization
@@ -103,7 +105,8 @@ class PhpManager extends Manager
 	 * @param string $itemName the parent item name
 	 * @param string $childName the child item name
 	 * @return boolean whether the item is added successfully
-	 * @throws Exception if either parent or child doesn't exist or if a loop has been detected.
+	 * @throws Exception if either parent or child doesn't exist.
+	 * @throws InvalidCallException if item already has a child with $itemName or if a loop has been detected.
 	 */
 	public function addItemChild($itemName, $childName)
 	{
@@ -116,10 +119,10 @@ class PhpManager extends Manager
 		$item = $this->_items[$itemName];
 		$this->checkItemChildType($item->getType(), $child->getType());
 		if ($this->detectLoop($itemName, $childName)) {
-			throw new Exception("Cannot add '$childName' as a child of '$itemName'. A loop has been detected.");
+			throw new InvalidCallException("Cannot add '$childName' as a child of '$itemName'. A loop has been detected.");
 		}
 		if (isset($this->_children[$itemName][$childName])) {
-			throw new Exception("The item '$itemName' already has a child '$childName'.");
+			throw new InvalidCallException("The item '$itemName' already has a child '$childName'.");
 		}
 		$this->_children[$itemName][$childName] = $this->_items[$childName];
 		return true;
@@ -182,14 +185,14 @@ class PhpManager extends Manager
 	 * for this particular authorization item.
 	 * @param mixed $data additional data associated with this assignment
 	 * @return Assignment the authorization assignment information.
-	 * @throws Exception if the item does not exist or if the item has already been assigned to the user
+	 * @throws InvalidParamException if the item does not exist or if the item has already been assigned to the user
 	 */
 	public function assign($userId, $itemName, $bizRule = null, $data = null)
 	{
 		if (!isset($this->_items[$itemName])) {
-			throw new Exception("Unknown authorization item '$itemName'.");
+			throw new InvalidParamException("Unknown authorization item '$itemName'.");
 		} elseif (isset($this->_assignments[$userId][$itemName])) {
-			throw new Exception("Authorization item '$itemName' has already been assigned to user '$userId'.");
+			throw new InvalidParamException("Authorization item '$itemName' has already been assigned to user '$userId'.");
 		} else {
 			return $this->_assignments[$userId][$itemName] = new Assignment($this, $userId, $itemName, $bizRule, $data);
 		}
@@ -336,14 +339,14 @@ class PhpManager extends Manager
 	 * Saves an authorization item to persistent storage.
 	 * @param Item $item the item to be saved.
 	 * @param string $oldName the old item name. If null, it means the item name is not changed.
-	 * @throws Exception if an item with the same name already taken
+	 * @throws InvalidParamException if an item with the same name already taken
 	 */
 	public function saveItem($item, $oldName = null)
 	{
 		if ($oldName !== null && ($newName = $item->getName()) !== $oldName) // name changed
 		{
 			if (isset($this->_items[$newName])) {
-				throw new Exception("Unable to change the item name. The name '$newName' is already used by another item.");
+				throw new InvalidParamException("Unable to change the item name. The name '$newName' is already used by another item.");
 			}
 			if (isset($this->_items[$oldName]) && $this->_items[$oldName] === $item) {
 				unset($this->_items[$oldName]);

From a03d1164adbe2a0a5a81958918e0bc2fe731ab2f Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Fri, 10 May 2013 10:47:08 +0400
Subject: [PATCH 132/152] New condition hash format used where its possible

---
 framework/rbac/DbManager.php | 93 +++++++++++++++++++-------------------------
 1 file changed, 41 insertions(+), 52 deletions(-)

diff --git a/framework/rbac/DbManager.php b/framework/rbac/DbManager.php
index 286c0b5..ea6e8ac 100644
--- a/framework/rbac/DbManager.php
+++ b/framework/rbac/DbManager.php
@@ -117,7 +117,7 @@ class DbManager extends Manager
 			$query = new Query;
 			$parents = $query->select(array('parent'))
 				->from($this->itemChildTable)
-				->where('child=:name', array(':name' => $itemName))
+				->where(array('child' => $itemName))
 				->createCommand($this->db)
 				->queryColumn();
 			foreach ($parents as $parent) {
@@ -144,7 +144,7 @@ class DbManager extends Manager
 		}
 		$query = new Query;
 		$rows = $query->from($this->itemTable)
-			->where('name=:name1 OR name=:name2', array(
+			->where(array('or', 'name=:name1', 'name=:name2'), array(
 				':name1' => $itemName,
 				':name2' => $childName
 			))
@@ -183,9 +183,9 @@ class DbManager extends Manager
 	public function removeItemChild($itemName, $childName)
 	{
 		return $this->db->createCommand()
-			->delete($this->itemChildTable, 'parent=:parent AND child=:child', array(
-				':parent' => $itemName,
-				':child' => $childName
+			->delete($this->itemChildTable, array(
+				'parent' => $itemName,
+				'child' => $childName
 			)) > 0;
 	}
 
@@ -200,9 +200,10 @@ class DbManager extends Manager
 		$query = new Query;
 		return $query->select(array('parent'))
 			->from($this->itemChildTable)
-			->where('parent=:parent AND child=:child', array(
-				':parent' => $itemName,
-				':child' => $childName))
+			->where(array(
+				'parent' => $itemName,
+				'child' => $childName
+			))
 			->createCommand($this->db)
 			->queryScalar() !== false;
 	}
@@ -215,21 +216,14 @@ class DbManager extends Manager
 	 */
 	public function getItemChildren($names)
 	{
-		if (is_string($names)) {
-			$condition = 'parent=' . $this->db->quoteValue($names);
-		} elseif (is_array($names) && !empty($names)) {
-			foreach ($names as &$name) {
-				$name = $this->db->quoteValue($name);
-			}
-			$condition = 'parent IN (' . implode(', ', $names) . ')';
-		}
 		$query = new Query;
 		$rows = $query->select(array('name', 'type', 'description', 'bizrule', 'data'))
 			->from(array(
 				$this->itemTable,
 				$this->itemChildTable
 			))
-			->where($condition . ' AND name=child')
+			->where(array('parent'=>$names))
+			->andWhere('name=child')
 			->createCommand($this->db)
 			->queryAll();
 		$children = array();
@@ -276,9 +270,9 @@ class DbManager extends Manager
 	public function revoke($userId, $itemName)
 	{
 		return $this->db->createCommand()
-			->delete($this->assignmentTable, 'itemname=:itemname AND userid=:userid', array(
-				':userid' => $userId,
-				':itemname' => $itemName
+			->delete($this->assignmentTable, array(
+				'userid' => $userId,
+				'itemname' => $itemName
 			)) > 0;
 	}
 
@@ -293,9 +287,9 @@ class DbManager extends Manager
 		$query = new Query;
 		return $query->select(array('itemname'))
 			->from($this->assignmentTable)
-			->where('itemname=:itemname AND userid=:userid', array(
-				':userid' => $userId,
-				':itemname' => $itemName
+			->where(array(
+				'userid' => $userId,
+				'itemname' => $itemName
 			))
 			->createCommand($this->db)
 			->queryScalar() !== false;
@@ -312,9 +306,9 @@ class DbManager extends Manager
 	{
 		$query = new Query;
 		$row = $query->from($this->assignmentTable)
-			->where('itemname=:itemname AND userid=:userid', array(
-				':userid' => $userId,
-				':itemname' => $itemName
+			->where(array(
+				'userid' => $userId,
+				'itemname' => $itemName
 			))
 			->createCommand($this->db)
 			->queryRow();
@@ -338,7 +332,7 @@ class DbManager extends Manager
 	{
 		$query = new Query;
 		$rows = $query->from($this->assignmentTable)
-			->where('userid=:userid', array(':userid' => $userId))
+			->where(array('userid' => $userId))
 			->createCommand($this->db)
 			->queryAll();
 		$assignments = array();
@@ -361,7 +355,7 @@ class DbManager extends Manager
 			->update($this->assignmentTable, array(
 				'bizrule' => $assignment->getBizRule(),
 				'data' => serialize($assignment->getData()),
-			), 'itemname=:itemname AND userid=:userid', array(
+			), array(
 				'userid' => $assignment->getUserId(),
 				'itemname' => $assignment->getItemName()
 			));
@@ -383,7 +377,7 @@ class DbManager extends Manager
 				->createCommand($this->db);
 		} elseif ($userId === null) {
 			$command = $query->from($this->itemTable)
-				->where('type=:type', array(':type' => $type))
+				->where(array('type' => $type))
 				->createCommand($this->db);
 		} elseif ($type === null) {
 			$command = $query->select(array('name', 'type', 'description', 't1.bizrule', 't1.data'))
@@ -391,7 +385,8 @@ class DbManager extends Manager
 					$this->itemTable . ' t1',
 					$this->assignmentTable . ' t2'
 				))
-				->where('name=itemname AND userid=:userid', array(':userid' => $userId))
+				->where(array('userid' => $userId))
+				->andWhere('name=itemname')
 				->createCommand($this->db);
 		} else {
 			$command = $query->select('name', 'type', 'description', 't1.bizrule', 't1.data')
@@ -399,10 +394,11 @@ class DbManager extends Manager
 					$this->itemTable . ' t1',
 					$this->assignmentTable . ' t2'
 				))
-				->where('name=itemname AND type=:type AND userid=:userid', array(
-					':userid' => $userId,
-					':type' => $type
+				->where(array(
+					'userid' => $userId,
+					'type' => $type
 				))
+				->andWhere('name=itemname')
 				->createCommand($this->db);
 		}
 		$items = array();
@@ -452,20 +448,13 @@ class DbManager extends Manager
 	{
 		if ($this->usingSqlite()) {
 			$this->db->createCommand()
-				->delete($this->itemChildTable, 'parent=:name1 OR child=:name2', array(
+				->delete($this->itemChildTable, array('or', 'parent=:name1', 'child=:name2'), array(
 					':name1' => $name,
 					':name2' => $name
 				));
-			$this->db->createCommand()
-				->delete($this->assignmentTable, 'itemname=:name', array(
-					':name' => $name,
-				));
+			$this->db->createCommand()->delete($this->assignmentTable, array('itemname' => $name));
 		}
-
-		return $this->db->createCommand()
-			->delete($this->itemTable, 'name=:name', array(
-				':name' => $name
-			)) > 0;
+		return $this->db->createCommand()->delete($this->itemTable, array('name' => $name)) > 0;
 	}
 
 	/**
@@ -477,7 +466,7 @@ class DbManager extends Manager
 	{
 		$query = new Query;
 		$row = $query->from($this->itemTable)
-			->where('name=:name', array(':name' => $name))
+			->where(array('name' => $name))
 			->createCommand($this->db)
 			->queryRow();
 
@@ -501,20 +490,20 @@ class DbManager extends Manager
 			$this->db->createCommand()
 				->update($this->itemChildTable, array(
 					'parent' => $item->getName(),
-				), 'parent=:whereName', array(
-					':whereName' => $oldName,
+				), array(
+					'parent' => $oldName,
 				));
 			$this->db->createCommand()
 				->update($this->itemChildTable, array(
 					'child' => $item->getName(),
-				), 'child=:whereName', array(
-					':whereName' => $oldName,
+				), array(
+					'child' => $oldName,
 				));
 			$this->db->createCommand()
 				->update($this->assignmentTable, array(
 					'itemname' => $item->getName(),
-				), 'itemname=:whereName', array(
-					':whereName' => $oldName,
+				), array(
+					'itemname' => $oldName,
 				));
 		}
 
@@ -525,8 +514,8 @@ class DbManager extends Manager
 				'description' => $item->getDescription(),
 				'bizrule' => $item->getBizRule(),
 				'data' => serialize($item->getData()),
-			), 'name=:whereName', array(
-				':whereName' => $oldName === null ? $item->getName() : $oldName,
+			), array(
+				'name' => $oldName === null ? $item->getName() : $oldName,
 			));
 	}
 

From 3fe23f83c75bc106e17885297de4be6cae3d61d2 Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Fri, 10 May 2013 13:50:17 +0400
Subject: [PATCH 133/152] Remove IManager interface

---
 framework/rbac/Assignment.php |   4 +-
 framework/rbac/IManager.php   | 175 ------------------------------------------
 framework/rbac/Item.php       |  24 +++---
 framework/rbac/Manager.php    | 163 ++++++++++++++++++++++++++++++++++++---
 4 files changed, 168 insertions(+), 198 deletions(-)
 delete mode 100644 framework/rbac/IManager.php

diff --git a/framework/rbac/Assignment.php b/framework/rbac/Assignment.php
index e5d6157..5b6a607 100644
--- a/framework/rbac/Assignment.php
+++ b/framework/rbac/Assignment.php
@@ -14,7 +14,7 @@ use yii\base\Object;
  * Assignment represents an assignment of a role to a user.
  * It includes additional assignment information such as [[bizRule]] and [[data]].
  * Do not create a Assignment instance using the 'new' operator.
- * Instead, call [[IManager::assign]].
+ * Instead, call [[Manager::assign()]].
  *
  * @property mixed $userId User ID (see [[User::id]]).
  * @property string $itemName The authorization item name.
@@ -35,7 +35,7 @@ class Assignment extends Object
 
 	/**
 	 * Constructor.
-	 * @param IManager $auth the authorization manager
+	 * @param Manager $auth the authorization manager
 	 * @param mixed $userId user ID (see [[User::id]])
 	 * @param string $itemName authorization item name
 	 * @param string $bizRule the business rule associated with this assignment
diff --git a/framework/rbac/IManager.php b/framework/rbac/IManager.php
deleted file mode 100644
index 0e9eea0..0000000
--- a/framework/rbac/IManager.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\rbac;
-
-/**
- * IManager interface is implemented by an auth manager application component.
- *
- * An auth manager is mainly responsible for providing role-based access control (RBAC) service.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @author Alexander Kochetov <creocoder@gmail.com>
- * @since 2.0
- */
-interface IManager
-{
-	/**
-	 * Performs access check for the specified user.
-	 * @param mixed $userId the user ID. This should be either an integer or a string representing
-	 * the unique identifier of a user. See [[User::id]].
-	 * @param string $itemName the name of the operation that we are checking access to
-	 * @param array $params name-value pairs that would be passed to biz rules associated
-	 * with the tasks and roles assigned to the user.
-	 * @return boolean whether the operations can be performed by the user.
-	 */
-	public function checkAccess($userId, $itemName, $params = array());
-
-	/**
-	 * Creates an authorization item.
-	 * An authorization item represents an action permission (e.g. creating a post).
-	 * It has three types: operation, task and role.
-	 * Authorization items form a hierarchy. Higher level items inheirt permissions representing
-	 * by lower level items.
-	 * @param string $name the item name. This must be a unique identifier.
-	 * @param integer $type the item type (0: operation, 1: task, 2: role).
-	 * @param string $description description of the item
-	 * @param string $bizRule business rule associated with the item. This is a piece of
-	 * PHP code that will be executed when [[checkAccess()]] is called for the item.
-	 * @param mixed $data additional data associated with the item.
-	 * @throws \yii\base\Exception if an item with the same name already exists
-	 * @return Item the authorization item
-	 */
-	public function createItem($name, $type, $description = '', $bizRule = null, $data = null);
-	/**
-	 * Removes the specified authorization item.
-	 * @param string $name the name of the item to be removed
-	 * @return boolean whether the item exists in the storage and has been removed
-	 */
-	public function removeItem($name);
-	/**
-	 * Returns the authorization items of the specific type and user.
-	 * @param mixed $userId the user ID. Defaults to null, meaning returning all items even if
-	 * they are not assigned to a user.
-	 * @param integer $type the item type (0: operation, 1: task, 2: role). Defaults to null,
-	 * meaning returning all items regardless of their type.
-	 * @return Item[] the authorization items of the specific type.
-	 */
-	public function getItems($userId = null, $type = null);
-	/**
-	 * Returns the authorization item with the specified name.
-	 * @param string $name the name of the item
-	 * @return Item the authorization item. Null if the item cannot be found.
-	 */
-	public function getItem($name);
-	/**
-	 * Saves an authorization item to persistent storage.
-	 * @param Item $item the item to be saved.
-	 * @param string $oldName the old item name. If null, it means the item name is not changed.
-	 */
-	public function saveItem($item, $oldName = null);
-
-	/**
-	 * Adds an item as a child of another item.
-	 * @param string $itemName the parent item name
-	 * @param string $childName the child item name
-	 * @throws \yii\base\Exception if either parent or child doesn't exist or if a loop has been detected.
-	 */
-	public function addItemChild($itemName, $childName);
-	/**
-	 * Removes a child from its parent.
-	 * Note, the child item is not deleted. Only the parent-child relationship is removed.
-	 * @param string $itemName the parent item name
-	 * @param string $childName the child item name
-	 * @return boolean whether the removal is successful
-	 */
-	public function removeItemChild($itemName, $childName);
-	/**
-	 * Returns a value indicating whether a child exists within a parent.
-	 * @param string $itemName the parent item name
-	 * @param string $childName the child item name
-	 * @return boolean whether the child exists
-	 */
-	public function hasItemChild($itemName, $childName);
-	/**
-	 * Returns the children of the specified item.
-	 * @param mixed $itemName the parent item name. This can be either a string or an array.
-	 * The latter represents a list of item names.
-	 * @return Item[] all child items of the parent
-	 */
-	public function getItemChildren($itemName);
-
-	/**
-	 * Assigns an authorization item to a user.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @param string $itemName the item name
-	 * @param string $bizRule the business rule to be executed when [[checkAccess()]] is called
-	 * for this particular authorization item.
-	 * @param mixed $data additional data associated with this assignment
-	 * @return Assignment the authorization assignment information.
-	 * @throws \yii\base\Exception if the item does not exist or if the item has already been assigned to the user
-	 */
-	public function assign($userId, $itemName, $bizRule = null, $data = null);
-	/**
-	 * Revokes an authorization assignment from a user.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @param string $itemName the item name
-	 * @return boolean whether removal is successful
-	 */
-	public function revoke($userId, $itemName);
-	/**
-	 * Returns a value indicating whether the item has been assigned to the user.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @param string $itemName the item name
-	 * @return boolean whether the item has been assigned to the user.
-	 */
-	public function isAssigned($userId, $itemName);
-	/**
-	 * Returns the item assignment information.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @param string $itemName the item name
-	 * @return Assignment the item assignment information. Null is returned if
-	 * the item is not assigned to the user.
-	 */
-	public function getAssignment($userId, $itemName);
-	/**
-	 * Returns the item assignments for the specified user.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @return Item[] the item assignment information for the user. An empty array will be
-	 * returned if there is no item assigned to the user.
-	 */
-	public function getAssignments($userId);
-	/**
-	 * Saves the changes to an authorization assignment.
-	 * @param Assignment $assignment the assignment that has been changed.
-	 */
-	public function saveAssignment($assignment);
-	/**
-	 * Removes all authorization data.
-	 */
-	public function clearAll();
-	/**
-	 * Removes all authorization assignments.
-	 */
-	public function clearAssignments();
-	/**
-	 * Saves authorization data into persistent storage.
-	 * If any change is made to the authorization data, please make
-	 * sure you call this method to save the changed data into persistent storage.
-	 */
-	public function save();
-	/**
-	 * Executes a business rule.
-	 * A business rule is a piece of PHP code that will be executed when [[checkAccess()]] is called.
-	 * @param string $bizRule the business rule to be executed.
-	 * @param array $params additional parameters to be passed to the business rule when being executed.
-	 * @param mixed $data additional data that is associated with the corresponding authorization item or assignment
-	 * @return boolean whether the execution returns a true value.
-	 * If the business rule is empty, it will also return true.
-	 */
-	public function executeBizRule($bizRule, $params, $data);
-}
diff --git a/framework/rbac/Item.php b/framework/rbac/Item.php
index 1297e41..ef56a53 100644
--- a/framework/rbac/Item.php
+++ b/framework/rbac/Item.php
@@ -18,7 +18,7 @@ use yii\base\Object;
  * A user may be assigned one or several authorization items (called [[Assignment]] assignments).
  * He can perform an operation only when it is among his assigned items.
  *
- * @property IManager $authManager The authorization manager.
+ * @property Manager $authManager The authorization manager.
  * @property integer $type The authorization item type. This could be 0 (operation), 1 (task) or 2 (role).
  * @property string $name The item name.
  * @property string $description The item description.
@@ -45,7 +45,7 @@ class Item extends Object
 
 	/**
 	 * Constructor.
-	 * @param IManager $auth authorization manager
+	 * @param Manager $auth authorization manager
 	 * @param string $name authorization item name
 	 * @param integer $type authorization item type. This can be 0 (operation), 1 (task) or 2 (role).
 	 * @param string $description the description
@@ -65,7 +65,7 @@ class Item extends Object
 	/**
 	 * Checks to see if the specified item is within the hierarchy starting from this item.
 	 * This method is expected to be internally used by the actual implementations
-	 * of the [[IManager::checkAccess()]].
+	 * of the [[Manager::checkAccess()]].
 	 * @param string $itemName the name of the item to be checked
 	 * @param array $params the parameters to be passed to business rule evaluation
 	 * @return boolean whether the specified item is within the hierarchy starting from this item.
@@ -87,7 +87,7 @@ class Item extends Object
 	}
 
 	/**
-	 * @return IManager the authorization manager
+	 * @return Manager the authorization manager
 	 */
 	public function getManager()
 	{
@@ -184,7 +184,7 @@ class Item extends Object
 	 * @param string $name the name of the child item
 	 * @return boolean whether the item is added successfully
 	 * @throws \yii\base\Exception if either parent or child doesn't exist or if a loop has been detected.
-	 * @see IManager::addItemChild
+	 * @see Manager::addItemChild
 	 */
 	public function addChild($name)
 	{
@@ -196,7 +196,7 @@ class Item extends Object
 	 * Note, the child item is not deleted. Only the parent-child relationship is removed.
 	 * @param string $name the child item name
 	 * @return boolean whether the removal is successful
-	 * @see IManager::removeItemChild
+	 * @see Manager::removeItemChild
 	 */
 	public function removeChild($name)
 	{
@@ -207,7 +207,7 @@ class Item extends Object
 	 * Returns a value indicating whether a child exists
 	 * @param string $name the child item name
 	 * @return boolean whether the child exists
-	 * @see IManager::hasItemChild
+	 * @see Manager::hasItemChild
 	 */
 	public function hasChild($name)
 	{
@@ -217,7 +217,7 @@ class Item extends Object
 	/**
 	 * Returns the children of this item.
 	 * @return Item[] all child items of this item.
-	 * @see IManager::getItemChildren
+	 * @see Manager::getItemChildren
 	 */
 	public function getChildren()
 	{
@@ -232,7 +232,7 @@ class Item extends Object
 	 * @param mixed $data additional data associated with this assignment
 	 * @return Assignment the authorization assignment information.
 	 * @throws \yii\base\Exception if the item has already been assigned to the user
-	 * @see IManager::assign
+	 * @see Manager::assign
 	 */
 	public function assign($userId, $bizRule = null, $data = null)
 	{
@@ -243,7 +243,7 @@ class Item extends Object
 	 * Revokes an authorization assignment from a user.
 	 * @param mixed $userId the user ID (see [[User::id]])
 	 * @return boolean whether removal is successful
-	 * @see IManager::revoke
+	 * @see Manager::revoke
 	 */
 	public function revoke($userId)
 	{
@@ -254,7 +254,7 @@ class Item extends Object
 	 * Returns a value indicating whether this item has been assigned to the user.
 	 * @param mixed $userId the user ID (see [[User::id]])
 	 * @return boolean whether the item has been assigned to the user.
-	 * @see IManager::isAssigned
+	 * @see Manager::isAssigned
 	 */
 	public function isAssigned($userId)
 	{
@@ -266,7 +266,7 @@ class Item extends Object
 	 * @param mixed $userId the user ID (see [[User::id]])
 	 * @return Assignment the item assignment information. Null is returned if
 	 * this item is not assigned to the user.
-	 * @see IManager::getAssignment
+	 * @see Manager::getAssignment
 	 */
 	public function getAssignment($userId)
 	{
diff --git a/framework/rbac/Manager.php b/framework/rbac/Manager.php
index ce36e60..5c3c4f6 100644
--- a/framework/rbac/Manager.php
+++ b/framework/rbac/Manager.php
@@ -29,7 +29,7 @@ use yii\base\InvalidParamException;
  * Using authorization manager consists of two aspects. First, the authorization hierarchy
  * and assignments have to be established. Manager and its child classes
  * provides APIs to accomplish this task. Developers may need to develop some GUI
- * so that it is more intuitive to end-users. Second, developers call [[IManager::checkAccess()]]
+ * so that it is more intuitive to end-users. Second, developers call [[Manager::checkAccess()]]
  * at appropriate places in the application code to check if the current user
  * has the needed permission for an operation.
  *
@@ -41,7 +41,7 @@ use yii\base\InvalidParamException;
  * @author Alexander Kochetov <creocoder@gmail.com>
  * @since 2.0
  */
-abstract class Manager extends Component implements IManager
+abstract class Manager extends Component
 {
 	/**
 	 * @var boolean Enable error reporting for bizRules.
@@ -62,7 +62,7 @@ abstract class Manager extends Component implements IManager
 
 	/**
 	 * Creates a role.
-	 * This is a shortcut method to [[IManager::createItem()]].
+	 * This is a shortcut method to [[Manager::createItem()]].
 	 * @param string $name the item name
 	 * @param string $description the item description.
 	 * @param string $bizRule the business rule associated with this item
@@ -76,7 +76,7 @@ abstract class Manager extends Component implements IManager
 
 	/**
 	 * Creates a task.
-	 * This is a shortcut method to [[IManager::createItem()]].
+	 * This is a shortcut method to [[Manager::createItem()]].
 	 * @param string $name the item name
 	 * @param string $description the item description.
 	 * @param string $bizRule the business rule associated with this item
@@ -90,7 +90,7 @@ abstract class Manager extends Component implements IManager
 
 	/**
 	 * Creates an operation.
-	 * This is a shortcut method to [[IManager::createItem()]].
+	 * This is a shortcut method to [[Manager::createItem()]].
 	 * @param string $name the item name
 	 * @param string $description the item description.
 	 * @param string $bizRule the business rule associated with this item
@@ -104,7 +104,7 @@ abstract class Manager extends Component implements IManager
 
 	/**
 	 * Returns roles.
-	 * This is a shortcut method to [[IManager::getItems()]].
+	 * This is a shortcut method to [[Manager::getItems()]].
 	 * @param mixed $userId the user ID. If not null, only the roles directly assigned to the user
 	 * will be returned. Otherwise, all roles will be returned.
 	 * @return Item[] roles (name=>AuthItem)
@@ -116,7 +116,7 @@ abstract class Manager extends Component implements IManager
 
 	/**
 	 * Returns tasks.
-	 * This is a shortcut method to [[IManager::getItems()]].
+	 * This is a shortcut method to [[Manager::getItems()]].
 	 * @param mixed $userId the user ID. If not null, only the tasks directly assigned to the user
 	 * will be returned. Otherwise, all tasks will be returned.
 	 * @return Item[] tasks (name=>AuthItem)
@@ -128,7 +128,7 @@ abstract class Manager extends Component implements IManager
 
 	/**
 	 * Returns operations.
-	 * This is a shortcut method to [[IManager::getItems()]].
+	 * This is a shortcut method to [[Manager::getItems()]].
 	 * @param mixed $userId the user ID. If not null, only the operations directly assigned to the user
 	 * will be returned. Otherwise, all operations will be returned.
 	 * @return Item[] operations (name=>AuthItem)
@@ -141,7 +141,7 @@ abstract class Manager extends Component implements IManager
 	/**
 	 * Executes the specified business rule.
 	 * @param string $bizRule the business rule to be executed.
-	 * @param array $params parameters passed to [[IManager::checkAccess()]].
+	 * @param array $params parameters passed to [[Manager::checkAccess()]].
 	 * @param mixed $data additional data associated with the authorization item or assignment.
 	 * @return boolean whether the business rule returns true.
 	 * If the business rule is empty, it will still return true.
@@ -164,4 +164,149 @@ abstract class Manager extends Component implements IManager
 			throw new InvalidParamException("Cannot add an item of type '$types[$childType]' to an item of type '$types[$parentType]'.");
 		}
 	}
+
+	/**
+	 * Performs access check for the specified user.
+	 * @param mixed $userId the user ID. This should be either an integer or a string representing
+	 * the unique identifier of a user. See [[User::id]].
+	 * @param string $itemName the name of the operation that we are checking access to
+	 * @param array $params name-value pairs that would be passed to biz rules associated
+	 * with the tasks and roles assigned to the user.
+	 * @return boolean whether the operations can be performed by the user.
+	 */
+	abstract public function checkAccess($userId, $itemName, $params = array());
+
+	/**
+	 * Creates an authorization item.
+	 * An authorization item represents an action permission (e.g. creating a post).
+	 * It has three types: operation, task and role.
+	 * Authorization items form a hierarchy. Higher level items inheirt permissions representing
+	 * by lower level items.
+	 * @param string $name the item name. This must be a unique identifier.
+	 * @param integer $type the item type (0: operation, 1: task, 2: role).
+	 * @param string $description description of the item
+	 * @param string $bizRule business rule associated with the item. This is a piece of
+	 * PHP code that will be executed when [[checkAccess()]] is called for the item.
+	 * @param mixed $data additional data associated with the item.
+	 * @throws \yii\base\Exception if an item with the same name already exists
+	 * @return Item the authorization item
+	 */
+	abstract public function createItem($name, $type, $description = '', $bizRule = null, $data = null);
+	/**
+	 * Removes the specified authorization item.
+	 * @param string $name the name of the item to be removed
+	 * @return boolean whether the item exists in the storage and has been removed
+	 */
+	abstract public function removeItem($name);
+	/**
+	 * Returns the authorization items of the specific type and user.
+	 * @param mixed $userId the user ID. Defaults to null, meaning returning all items even if
+	 * they are not assigned to a user.
+	 * @param integer $type the item type (0: operation, 1: task, 2: role). Defaults to null,
+	 * meaning returning all items regardless of their type.
+	 * @return Item[] the authorization items of the specific type.
+	 */
+	abstract public function getItems($userId = null, $type = null);
+	/**
+	 * Returns the authorization item with the specified name.
+	 * @param string $name the name of the item
+	 * @return Item the authorization item. Null if the item cannot be found.
+	 */
+	abstract public function getItem($name);
+	/**
+	 * Saves an authorization item to persistent storage.
+	 * @param Item $item the item to be saved.
+	 * @param string $oldName the old item name. If null, it means the item name is not changed.
+	 */
+	abstract public function saveItem($item, $oldName = null);
+
+	/**
+	 * Adds an item as a child of another item.
+	 * @param string $itemName the parent item name
+	 * @param string $childName the child item name
+	 * @throws \yii\base\Exception if either parent or child doesn't exist or if a loop has been detected.
+	 */
+	abstract public function addItemChild($itemName, $childName);
+	/**
+	 * Removes a child from its parent.
+	 * Note, the child item is not deleted. Only the parent-child relationship is removed.
+	 * @param string $itemName the parent item name
+	 * @param string $childName the child item name
+	 * @return boolean whether the removal is successful
+	 */
+	abstract public function removeItemChild($itemName, $childName);
+	/**
+	 * Returns a value indicating whether a child exists within a parent.
+	 * @param string $itemName the parent item name
+	 * @param string $childName the child item name
+	 * @return boolean whether the child exists
+	 */
+	abstract public function hasItemChild($itemName, $childName);
+	/**
+	 * Returns the children of the specified item.
+	 * @param mixed $itemName the parent item name. This can be either a string or an array.
+	 * The latter represents a list of item names.
+	 * @return Item[] all child items of the parent
+	 */
+	abstract public function getItemChildren($itemName);
+
+	/**
+	 * Assigns an authorization item to a user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @param string $bizRule the business rule to be executed when [[checkAccess()]] is called
+	 * for this particular authorization item.
+	 * @param mixed $data additional data associated with this assignment
+	 * @return Assignment the authorization assignment information.
+	 * @throws \yii\base\Exception if the item does not exist or if the item has already been assigned to the user
+	 */
+	abstract public function assign($userId, $itemName, $bizRule = null, $data = null);
+	/**
+	 * Revokes an authorization assignment from a user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @return boolean whether removal is successful
+	 */
+	abstract public function revoke($userId, $itemName);
+	/**
+	 * Returns a value indicating whether the item has been assigned to the user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @return boolean whether the item has been assigned to the user.
+	 */
+	abstract public function isAssigned($userId, $itemName);
+	/**
+	 * Returns the item assignment information.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @return Assignment the item assignment information. Null is returned if
+	 * the item is not assigned to the user.
+	 */
+	abstract public function getAssignment($userId, $itemName);
+	/**
+	 * Returns the item assignments for the specified user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @return Item[] the item assignment information for the user. An empty array will be
+	 * returned if there is no item assigned to the user.
+	 */
+	abstract public function getAssignments($userId);
+	/**
+	 * Saves the changes to an authorization assignment.
+	 * @param Assignment $assignment the assignment that has been changed.
+	 */
+	abstract public function saveAssignment($assignment);
+	/**
+	 * Removes all authorization data.
+	 */
+	abstract public function clearAll();
+	/**
+	 * Removes all authorization assignments.
+	 */
+	abstract public function clearAssignments();
+	/**
+	 * Saves authorization data into persistent storage.
+	 * If any change is made to the authorization data, please make
+	 * sure you call this method to save the changed data into persistent storage.
+	 */
+	abstract public function save();
 }

From 0d90541084a0e9e0135c98a05946326126d0a053 Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Fri, 10 May 2013 14:59:11 +0400
Subject: [PATCH 134/152] Moved from framework to yii

---
 framework/rbac/Assignment.php | 106 --------
 framework/rbac/DbManager.php  | 573 ------------------------------------------
 framework/rbac/Item.php       | 275 --------------------
 framework/rbac/Manager.php    | 312 -----------------------
 framework/rbac/PhpManager.php | 516 -------------------------------------
 yii/rbac/Assignment.php       | 106 ++++++++
 yii/rbac/DbManager.php        | 573 ++++++++++++++++++++++++++++++++++++++++++
 yii/rbac/Item.php             | 275 ++++++++++++++++++++
 yii/rbac/Manager.php          | 312 +++++++++++++++++++++++
 yii/rbac/PhpManager.php       | 516 +++++++++++++++++++++++++++++++++++++
 10 files changed, 1782 insertions(+), 1782 deletions(-)
 delete mode 100644 framework/rbac/Assignment.php
 delete mode 100644 framework/rbac/DbManager.php
 delete mode 100644 framework/rbac/Item.php
 delete mode 100644 framework/rbac/Manager.php
 delete mode 100644 framework/rbac/PhpManager.php
 create mode 100644 yii/rbac/Assignment.php
 create mode 100644 yii/rbac/DbManager.php
 create mode 100644 yii/rbac/Item.php
 create mode 100644 yii/rbac/Manager.php
 create mode 100644 yii/rbac/PhpManager.php

diff --git a/framework/rbac/Assignment.php b/framework/rbac/Assignment.php
deleted file mode 100644
index 5b6a607..0000000
--- a/framework/rbac/Assignment.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\rbac;
-
-use Yii;
-use yii\base\Object;
-
-/**
- * Assignment represents an assignment of a role to a user.
- * It includes additional assignment information such as [[bizRule]] and [[data]].
- * Do not create a Assignment instance using the 'new' operator.
- * Instead, call [[Manager::assign()]].
- *
- * @property mixed $userId User ID (see [[User::id]]).
- * @property string $itemName The authorization item name.
- * @property string $bizRule The business rule associated with this assignment.
- * @property mixed $data Additional data for this assignment.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @author Alexander Kochetov <creocoder@gmail.com>
- * @since 2.0
- */
-class Assignment extends Object
-{
-	private $_auth;
-	private $_userId;
-	private $_itemName;
-	private $_bizRule;
-	private $_data;
-
-	/**
-	 * Constructor.
-	 * @param Manager $auth the authorization manager
-	 * @param mixed $userId user ID (see [[User::id]])
-	 * @param string $itemName authorization item name
-	 * @param string $bizRule the business rule associated with this assignment
-	 * @param mixed $data additional data for this assignment
-	 */
-	public function __construct($auth, $userId, $itemName, $bizRule = null, $data = null)
-	{
-		$this->_auth = $auth;
-		$this->_userId = $userId;
-		$this->_itemName = $itemName;
-		$this->_bizRule = $bizRule;
-		$this->_data = $data;
-	}
-
-	/**
-	 * @return mixed user ID (see [[User::id]])
-	 */
-	public function getUserId()
-	{
-		return $this->_userId;
-	}
-
-	/**
-	 * @return string the authorization item name
-	 */
-	public function getItemName()
-	{
-		return $this->_itemName;
-	}
-
-	/**
-	 * @return string the business rule associated with this assignment
-	 */
-	public function getBizRule()
-	{
-		return $this->_bizRule;
-	}
-
-	/**
-	 * @param string $value the business rule associated with this assignment
-	 */
-	public function setBizRule($value)
-	{
-		if ($this->_bizRule !== $value) {
-			$this->_bizRule = $value;
-			$this->_auth->saveAssignment($this);
-		}
-	}
-
-	/**
-	 * @return mixed additional data for this assignment
-	 */
-	public function getData()
-	{
-		return $this->_data;
-	}
-
-	/**
-	 * @param mixed $value additional data for this assignment
-	 */
-	public function setData($value)
-	{
-		if ($this->_data !== $value) {
-			$this->_data = $value;
-			$this->_auth->saveAssignment($this);
-		}
-	}
-}
diff --git a/framework/rbac/DbManager.php b/framework/rbac/DbManager.php
deleted file mode 100644
index ea6e8ac..0000000
--- a/framework/rbac/DbManager.php
+++ /dev/null
@@ -1,573 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\rbac;
-
-use Yii;
-use yii\db\Connection;
-use yii\db\Query;
-use yii\base\Exception;
-use yii\base\InvalidConfigException;
-use yii\base\InvalidCallException;
-
-/**
- * DbManager represents an authorization manager that stores authorization information in database.
- *
- * The database connection is specified by [[db]]. And the database schema
- * should be as described in "framework/rbac/*.sql". You may change the names of
- * the three tables used to store the authorization data by setting [[itemTable]],
- * [[itemChildTable]] and [[assignmentTable]].
- *
- * @property array $authItems The authorization items of the specific type.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @author Alexander Kochetov <creocoder@gmail.com>
- * @since 2.0
- */
-class DbManager extends Manager
-{
-	/**
-	 * @var Connection|string the DB connection object or the application component ID of the DB connection.
-	 * After the DbManager object is created, if you want to change this property, you should only assign it
-	 * with a DB connection object.
-	 */
-	public $db = 'db';
-	/**
-	 * @var string the name of the table storing authorization items. Defaults to 'tbl_auth_item'.
-	 */
-	public $itemTable = 'tbl_auth_item';
-	/**
-	 * @var string the name of the table storing authorization item hierarchy. Defaults to 'tbl_auth_item_child'.
-	 */
-	public $itemChildTable = 'tbl_auth_item_child';
-	/**
-	 * @var string the name of the table storing authorization item assignments. Defaults to 'tbl_auth_assignment'.
-	 */
-	public $assignmentTable = 'tbl_auth_assignment';
-
-	private $_usingSqlite;
-
-	/**
-	 * Initializes the application component.
-	 * This method overrides the parent implementation by establishing the database connection.
-	 */
-	public function init()
-	{
-		if (is_string($this->db)) {
-			$this->db = Yii::$app->getComponent($this->db);
-		}
-		if (!$this->db instanceof Connection) {
-			throw new InvalidConfigException("DbManager::db must be either a DB connection instance or the application component ID of a DB connection.");
-		}
-		$this->_usingSqlite = !strncmp($this->db->getDriverName(), 'sqlite', 6);
-		parent::init();
-	}
-
-	/**
-	 * Performs access check for the specified user.
-	 * @param mixed $userId the user ID. This should can be either an integer or a string representing
-	 * the unique identifier of a user. See [[User::id]].
-	 * @param string $itemName the name of the operation that need access check
-	 * @param array $params name-value pairs that would be passed to biz rules associated
-	 * with the tasks and roles assigned to the user. A param with name 'userId' is added to this array,
-	 * which holds the value of `$userId`.
-	 * @return boolean whether the operations can be performed by the user.
-	 */
-	public function checkAccess($userId, $itemName, $params = array())
-	{
-		$assignments = $this->getAssignments($userId);
-		return $this->checkAccessRecursive($userId, $itemName, $params, $assignments);
-	}
-
-	/**
-	 * Performs access check for the specified user.
-	 * This method is internally called by [[checkAccess()]].
-	 * @param mixed $userId the user ID. This should can be either an integer or a string representing
-	 * the unique identifier of a user. See [[User::id]].
-	 * @param string $itemName the name of the operation that need access check
-	 * @param array $params name-value pairs that would be passed to biz rules associated
-	 * with the tasks and roles assigned to the user. A param with name 'userId' is added to this array,
-	 * which holds the value of `$userId`.
-	 * @param Assignment[] $assignments the assignments to the specified user
-	 * @return boolean whether the operations can be performed by the user.
-	 */
-	protected function checkAccessRecursive($userId, $itemName, $params, $assignments)
-	{
-		if (($item = $this->getItem($itemName)) === null) {
-			return false;
-		}
-		Yii::trace('Checking permission: ' . $item->getName(), __METHOD__);
-		if (!isset($params['userId'])) {
-			$params['userId'] = $userId;
-		}
-		if ($this->executeBizRule($item->getBizRule(), $params, $item->getData())) {
-			if (in_array($itemName, $this->defaultRoles)) {
-				return true;
-			}
-			if (isset($assignments[$itemName])) {
-				$assignment = $assignments[$itemName];
-				if ($this->executeBizRule($assignment->getBizRule(), $params, $assignment->getData())) {
-					return true;
-				}
-			}
-			$query = new Query;
-			$parents = $query->select(array('parent'))
-				->from($this->itemChildTable)
-				->where(array('child' => $itemName))
-				->createCommand($this->db)
-				->queryColumn();
-			foreach ($parents as $parent) {
-				if ($this->checkAccessRecursive($userId, $parent, $params, $assignments)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Adds an item as a child of another item.
-	 * @param string $itemName the parent item name
-	 * @param string $childName the child item name
-	 * @return boolean whether the item is added successfully
-	 * @throws Exception if either parent or child doesn't exist.
-	 * @throws InvalidCallException if a loop has been detected.
-	 */
-	public function addItemChild($itemName, $childName)
-	{
-		if ($itemName === $childName) {
-			throw new Exception("Cannot add '$itemName' as a child of itself.");
-		}
-		$query = new Query;
-		$rows = $query->from($this->itemTable)
-			->where(array('or', 'name=:name1', 'name=:name2'), array(
-				':name1' => $itemName,
-				':name2' => $childName
-			))
-			->createCommand($this->db)
-			->queryAll();
-		if (count($rows) == 2) {
-			if ($rows[0]['name'] === $itemName) {
-				$parentType = $rows[0]['type'];
-				$childType = $rows[1]['type'];
-			} else {
-				$childType = $rows[0]['type'];
-				$parentType = $rows[1]['type'];
-			}
-			$this->checkItemChildType($parentType, $childType);
-			if ($this->detectLoop($itemName, $childName)) {
-				throw new InvalidCallException("Cannot add '$childName' as a child of '$itemName'. A loop has been detected.");
-			}
-			$this->db->createCommand()
-				->insert($this->itemChildTable, array(
-					'parent' => $itemName,
-					'child' => $childName,
-				));
-			return true;
-		} else {
-			throw new Exception("Either '$itemName' or '$childName' does not exist.");
-		}
-	}
-
-	/**
-	 * Removes a child from its parent.
-	 * Note, the child item is not deleted. Only the parent-child relationship is removed.
-	 * @param string $itemName the parent item name
-	 * @param string $childName the child item name
-	 * @return boolean whether the removal is successful
-	 */
-	public function removeItemChild($itemName, $childName)
-	{
-		return $this->db->createCommand()
-			->delete($this->itemChildTable, array(
-				'parent' => $itemName,
-				'child' => $childName
-			)) > 0;
-	}
-
-	/**
-	 * Returns a value indicating whether a child exists within a parent.
-	 * @param string $itemName the parent item name
-	 * @param string $childName the child item name
-	 * @return boolean whether the child exists
-	 */
-	public function hasItemChild($itemName, $childName)
-	{
-		$query = new Query;
-		return $query->select(array('parent'))
-			->from($this->itemChildTable)
-			->where(array(
-				'parent' => $itemName,
-				'child' => $childName
-			))
-			->createCommand($this->db)
-			->queryScalar() !== false;
-	}
-
-	/**
-	 * Returns the children of the specified item.
-	 * @param mixed $names the parent item name. This can be either a string or an array.
-	 * The latter represents a list of item names.
-	 * @return Item[] all child items of the parent
-	 */
-	public function getItemChildren($names)
-	{
-		$query = new Query;
-		$rows = $query->select(array('name', 'type', 'description', 'bizrule', 'data'))
-			->from(array(
-				$this->itemTable,
-				$this->itemChildTable
-			))
-			->where(array('parent'=>$names))
-			->andWhere('name=child')
-			->createCommand($this->db)
-			->queryAll();
-		$children = array();
-		foreach ($rows as $row) {
-			if (($data = @unserialize($row['data'])) === false) {
-				$data = null;
-			}
-			$children[$row['name']] = new Item($this, $row['name'], $row['type'], $row['description'], $row['bizrule'], $data);
-		}
-		return $children;
-	}
-
-	/**
-	 * Assigns an authorization item to a user.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @param string $itemName the item name
-	 * @param string $bizRule the business rule to be executed when [[checkAccess()]] is called
-	 * for this particular authorization item.
-	 * @param mixed $data additional data associated with this assignment
-	 * @return Assignment the authorization assignment information.
-	 * @throws Exception if the item does not exist or if the item has already been assigned to the user
-	 */
-	public function assign($userId, $itemName, $bizRule = null, $data = null)
-	{
-		if ($this->usingSqlite() && $this->getItem($itemName) === null) {
-			throw new Exception("The item '$itemName' does not exist.");
-		}
-		$this->db->createCommand()
-			->insert($this->assignmentTable, array(
-				'userid' => $userId,
-				'itemname' => $itemName,
-				'bizrule' => $bizRule,
-				'data' => serialize($data)
-			));
-		return new Assignment($this, $userId, $itemName, $bizRule, $data);
-	}
-
-	/**
-	 * Revokes an authorization assignment from a user.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @param string $itemName the item name
-	 * @return boolean whether removal is successful
-	 */
-	public function revoke($userId, $itemName)
-	{
-		return $this->db->createCommand()
-			->delete($this->assignmentTable, array(
-				'userid' => $userId,
-				'itemname' => $itemName
-			)) > 0;
-	}
-
-	/**
-	 * Returns a value indicating whether the item has been assigned to the user.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @param string $itemName the item name
-	 * @return boolean whether the item has been assigned to the user.
-	 */
-	public function isAssigned($itemName, $userId)
-	{
-		$query = new Query;
-		return $query->select(array('itemname'))
-			->from($this->assignmentTable)
-			->where(array(
-				'userid' => $userId,
-				'itemname' => $itemName
-			))
-			->createCommand($this->db)
-			->queryScalar() !== false;
-	}
-
-	/**
-	 * Returns the item assignment information.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @param string $itemName the item name
-	 * @return Assignment the item assignment information. Null is returned if
-	 * the item is not assigned to the user.
-	 */
-	public function getAssignment($userId, $itemName)
-	{
-		$query = new Query;
-		$row = $query->from($this->assignmentTable)
-			->where(array(
-				'userid' => $userId,
-				'itemname' => $itemName
-			))
-			->createCommand($this->db)
-			->queryRow();
-		if ($row !== false) {
-			if (($data = @unserialize($row['data'])) === false) {
-				$data = null;
-			}
-			return new Assignment($this, $row['userid'], $row['itemname'], $row['bizrule'], $data);
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Returns the item assignments for the specified user.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @return Assignment[] the item assignment information for the user. An empty array will be
-	 * returned if there is no item assigned to the user.
-	 */
-	public function getAssignments($userId)
-	{
-		$query = new Query;
-		$rows = $query->from($this->assignmentTable)
-			->where(array('userid' => $userId))
-			->createCommand($this->db)
-			->queryAll();
-		$assignments = array();
-		foreach ($rows as $row) {
-			if (($data = @unserialize($row['data'])) === false) {
-				$data = null;
-			}
-			$assignments[$row['itemname']] = new Assignment($this, $row['userid'], $row['itemname'], $row['bizrule'], $data);
-		}
-		return $assignments;
-	}
-
-	/**
-	 * Saves the changes to an authorization assignment.
-	 * @param Assignment $assignment the assignment that has been changed.
-	 */
-	public function saveAssignment($assignment)
-	{
-		$this->db->createCommand()
-			->update($this->assignmentTable, array(
-				'bizrule' => $assignment->getBizRule(),
-				'data' => serialize($assignment->getData()),
-			), array(
-				'userid' => $assignment->getUserId(),
-				'itemname' => $assignment->getItemName()
-			));
-	}
-
-	/**
-	 * Returns the authorization items of the specific type and user.
-	 * @param mixed $userId the user ID. Defaults to null, meaning returning all items even if
-	 * they are not assigned to a user.
-	 * @param integer $type the item type (0: operation, 1: task, 2: role). Defaults to null,
-	 * meaning returning all items regardless of their type.
-	 * @return Item[] the authorization items of the specific type.
-	 */
-	public function getItems($userId = null, $type = null)
-	{
-		$query = new Query;
-		if ($userId === null && $type === null) {
-			$command = $query->from($this->itemTable)
-				->createCommand($this->db);
-		} elseif ($userId === null) {
-			$command = $query->from($this->itemTable)
-				->where(array('type' => $type))
-				->createCommand($this->db);
-		} elseif ($type === null) {
-			$command = $query->select(array('name', 'type', 'description', 't1.bizrule', 't1.data'))
-				->from(array(
-					$this->itemTable . ' t1',
-					$this->assignmentTable . ' t2'
-				))
-				->where(array('userid' => $userId))
-				->andWhere('name=itemname')
-				->createCommand($this->db);
-		} else {
-			$command = $query->select('name', 'type', 'description', 't1.bizrule', 't1.data')
-				->from(array(
-					$this->itemTable . ' t1',
-					$this->assignmentTable . ' t2'
-				))
-				->where(array(
-					'userid' => $userId,
-					'type' => $type
-				))
-				->andWhere('name=itemname')
-				->createCommand($this->db);
-		}
-		$items = array();
-		foreach ($command->queryAll() as $row) {
-			if (($data = @unserialize($row['data'])) === false) {
-				$data = null;
-			}
-			$items[$row['name']] = new Item($this, $row['name'], $row['type'], $row['description'], $row['bizrule'], $data);
-		}
-		return $items;
-	}
-
-	/**
-	 * Creates an authorization item.
-	 * An authorization item represents an action permission (e.g. creating a post).
-	 * It has three types: operation, task and role.
-	 * Authorization items form a hierarchy. Higher level items inheirt permissions representing
-	 * by lower level items.
-	 * @param string $name the item name. This must be a unique identifier.
-	 * @param integer $type the item type (0: operation, 1: task, 2: role).
-	 * @param string $description description of the item
-	 * @param string $bizRule business rule associated with the item. This is a piece of
-	 * PHP code that will be executed when [[checkAccess()]] is called for the item.
-	 * @param mixed $data additional data associated with the item.
-	 * @return Item the authorization item
-	 * @throws Exception if an item with the same name already exists
-	 */
-	public function createItem($name, $type, $description = '', $bizRule = null, $data = null)
-	{
-		$this->db->createCommand()
-			->insert($this->itemTable, array(
-				'name' => $name,
-				'type' => $type,
-				'description' => $description,
-				'bizrule' => $bizRule,
-				'data' => serialize($data)
-			));
-		return new Item($this, $name, $type, $description, $bizRule, $data);
-	}
-
-	/**
-	 * Removes the specified authorization item.
-	 * @param string $name the name of the item to be removed
-	 * @return boolean whether the item exists in the storage and has been removed
-	 */
-	public function removeItem($name)
-	{
-		if ($this->usingSqlite()) {
-			$this->db->createCommand()
-				->delete($this->itemChildTable, array('or', 'parent=:name1', 'child=:name2'), array(
-					':name1' => $name,
-					':name2' => $name
-				));
-			$this->db->createCommand()->delete($this->assignmentTable, array('itemname' => $name));
-		}
-		return $this->db->createCommand()->delete($this->itemTable, array('name' => $name)) > 0;
-	}
-
-	/**
-	 * Returns the authorization item with the specified name.
-	 * @param string $name the name of the item
-	 * @return Item the authorization item. Null if the item cannot be found.
-	 */
-	public function getItem($name)
-	{
-		$query = new Query;
-		$row = $query->from($this->itemTable)
-			->where(array('name' => $name))
-			->createCommand($this->db)
-			->queryRow();
-
-		if ($row !== false) {
-			if (($data = @unserialize($row['data'])) === false) {
-				$data = null;
-			}
-			return new Item($this, $row['name'], $row['type'], $row['description'], $row['bizrule'], $data);
-		} else
-			return null;
-	}
-
-	/**
-	 * Saves an authorization item to persistent storage.
-	 * @param Item $item the item to be saved.
-	 * @param string $oldName the old item name. If null, it means the item name is not changed.
-	 */
-	public function saveItem($item, $oldName = null)
-	{
-		if ($this->usingSqlite() && $oldName !== null && $item->getName() !== $oldName) {
-			$this->db->createCommand()
-				->update($this->itemChildTable, array(
-					'parent' => $item->getName(),
-				), array(
-					'parent' => $oldName,
-				));
-			$this->db->createCommand()
-				->update($this->itemChildTable, array(
-					'child' => $item->getName(),
-				), array(
-					'child' => $oldName,
-				));
-			$this->db->createCommand()
-				->update($this->assignmentTable, array(
-					'itemname' => $item->getName(),
-				), array(
-					'itemname' => $oldName,
-				));
-		}
-
-		$this->db->createCommand()
-			->update($this->itemTable, array(
-				'name' => $item->getName(),
-				'type' => $item->getType(),
-				'description' => $item->getDescription(),
-				'bizrule' => $item->getBizRule(),
-				'data' => serialize($item->getData()),
-			), array(
-				'name' => $oldName === null ? $item->getName() : $oldName,
-			));
-	}
-
-	/**
-	 * Saves the authorization data to persistent storage.
-	 */
-	public function save()
-	{
-	}
-
-	/**
-	 * Removes all authorization data.
-	 */
-	public function clearAll()
-	{
-		$this->clearAssignments();
-		$this->db->createCommand()->delete($this->itemChildTable);
-		$this->db->createCommand()->delete($this->itemTable);
-	}
-
-	/**
-	 * Removes all authorization assignments.
-	 */
-	public function clearAssignments()
-	{
-		$this->db->createCommand()->delete($this->assignmentTable);
-	}
-
-	/**
-	 * Checks whether there is a loop in the authorization item hierarchy.
-	 * @param string $itemName parent item name
-	 * @param string $childName the name of the child item that is to be added to the hierarchy
-	 * @return boolean whether a loop exists
-	 */
-	protected function detectLoop($itemName, $childName)
-	{
-		if ($childName === $itemName) {
-			return true;
-		}
-		foreach ($this->getItemChildren($childName) as $child) {
-			if ($this->detectLoop($itemName, $child->getName())) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @return boolean whether the database is a SQLite database
-	 */
-	protected function usingSqlite()
-	{
-		return $this->_usingSqlite;
-	}
-}
diff --git a/framework/rbac/Item.php b/framework/rbac/Item.php
deleted file mode 100644
index ef56a53..0000000
--- a/framework/rbac/Item.php
+++ /dev/null
@@ -1,275 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\rbac;
-
-use Yii;
-use yii\base\Object;
-
-/**
- * Item represents an authorization item.
- * An authorization item can be an operation, a task or a role.
- * They form an authorization hierarchy. Items on higher levels of the hierarchy
- * inherit the permissions represented by items on lower levels.
- * A user may be assigned one or several authorization items (called [[Assignment]] assignments).
- * He can perform an operation only when it is among his assigned items.
- *
- * @property Manager $authManager The authorization manager.
- * @property integer $type The authorization item type. This could be 0 (operation), 1 (task) or 2 (role).
- * @property string $name The item name.
- * @property string $description The item description.
- * @property string $bizRule The business rule associated with this item.
- * @property mixed $data The additional data associated with this item.
- * @property array $children All child items of this item.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @author Alexander Kochetov <creocoder@gmail.com>
- * @since 2.0
- */
-class Item extends Object
-{
-	const TYPE_OPERATION = 0;
-	const TYPE_TASK = 1;
-	const TYPE_ROLE = 2;
-
-	private $_auth;
-	private $_type;
-	private $_name;
-	private $_description;
-	private $_bizRule;
-	private $_data;
-
-	/**
-	 * Constructor.
-	 * @param Manager $auth authorization manager
-	 * @param string $name authorization item name
-	 * @param integer $type authorization item type. This can be 0 (operation), 1 (task) or 2 (role).
-	 * @param string $description the description
-	 * @param string $bizRule the business rule associated with this item
-	 * @param mixed $data additional data for this item
-	 */
-	public function __construct($auth, $name, $type, $description = '', $bizRule = null, $data = null)
-	{
-		$this->_type = (int)$type;
-		$this->_auth = $auth;
-		$this->_name = $name;
-		$this->_description = $description;
-		$this->_bizRule = $bizRule;
-		$this->_data = $data;
-	}
-
-	/**
-	 * Checks to see if the specified item is within the hierarchy starting from this item.
-	 * This method is expected to be internally used by the actual implementations
-	 * of the [[Manager::checkAccess()]].
-	 * @param string $itemName the name of the item to be checked
-	 * @param array $params the parameters to be passed to business rule evaluation
-	 * @return boolean whether the specified item is within the hierarchy starting from this item.
-	 */
-	public function checkAccess($itemName, $params = array())
-	{
-		Yii::trace('Checking permission: ' . $this->_name, __METHOD__);
-		if ($this->_auth->executeBizRule($this->_bizRule, $params, $this->_data)) {
-			if ($this->_name == $itemName) {
-				return true;
-			}
-			foreach ($this->_auth->getItemChildren($this->_name) as $item) {
-				if ($item->checkAccess($itemName, $params)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @return Manager the authorization manager
-	 */
-	public function getManager()
-	{
-		return $this->_auth;
-	}
-
-	/**
-	 * @return integer the authorization item type. This could be 0 (operation), 1 (task) or 2 (role).
-	 */
-	public function getType()
-	{
-		return $this->_type;
-	}
-
-	/**
-	 * @return string the item name
-	 */
-	public function getName()
-	{
-		return $this->_name;
-	}
-
-	/**
-	 * @param string $value the item name
-	 */
-	public function setName($value)
-	{
-		if ($this->_name !== $value) {
-			$oldName = $this->_name;
-			$this->_name = $value;
-			$this->_auth->saveItem($this, $oldName);
-		}
-	}
-
-	/**
-	 * @return string the item description
-	 */
-	public function getDescription()
-	{
-		return $this->_description;
-	}
-
-	/**
-	 * @param string $value the item description
-	 */
-	public function setDescription($value)
-	{
-		if ($this->_description !== $value) {
-			$this->_description = $value;
-			$this->_auth->saveItem($this);
-		}
-	}
-
-	/**
-	 * @return string the business rule associated with this item
-	 */
-	public function getBizRule()
-	{
-		return $this->_bizRule;
-	}
-
-	/**
-	 * @param string $value the business rule associated with this item
-	 */
-	public function setBizRule($value)
-	{
-		if ($this->_bizRule !== $value) {
-			$this->_bizRule = $value;
-			$this->_auth->saveItem($this);
-		}
-	}
-
-	/**
-	 * @return mixed the additional data associated with this item
-	 */
-	public function getData()
-	{
-		return $this->_data;
-	}
-
-	/**
-	 * @param mixed $value the additional data associated with this item
-	 */
-	public function setData($value)
-	{
-		if ($this->_data !== $value) {
-			$this->_data = $value;
-			$this->_auth->saveItem($this);
-		}
-	}
-
-	/**
-	 * Adds a child item.
-	 * @param string $name the name of the child item
-	 * @return boolean whether the item is added successfully
-	 * @throws \yii\base\Exception if either parent or child doesn't exist or if a loop has been detected.
-	 * @see Manager::addItemChild
-	 */
-	public function addChild($name)
-	{
-		return $this->_auth->addItemChild($this->_name, $name);
-	}
-
-	/**
-	 * Removes a child item.
-	 * Note, the child item is not deleted. Only the parent-child relationship is removed.
-	 * @param string $name the child item name
-	 * @return boolean whether the removal is successful
-	 * @see Manager::removeItemChild
-	 */
-	public function removeChild($name)
-	{
-		return $this->_auth->removeItemChild($this->_name, $name);
-	}
-
-	/**
-	 * Returns a value indicating whether a child exists
-	 * @param string $name the child item name
-	 * @return boolean whether the child exists
-	 * @see Manager::hasItemChild
-	 */
-	public function hasChild($name)
-	{
-		return $this->_auth->hasItemChild($this->_name, $name);
-	}
-
-	/**
-	 * Returns the children of this item.
-	 * @return Item[] all child items of this item.
-	 * @see Manager::getItemChildren
-	 */
-	public function getChildren()
-	{
-		return $this->_auth->getItemChildren($this->_name);
-	}
-
-	/**
-	 * Assigns this item to a user.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @param string $bizRule the business rule to be executed when [[checkAccess()]] is called
-	 * for this particular authorization item.
-	 * @param mixed $data additional data associated with this assignment
-	 * @return Assignment the authorization assignment information.
-	 * @throws \yii\base\Exception if the item has already been assigned to the user
-	 * @see Manager::assign
-	 */
-	public function assign($userId, $bizRule = null, $data = null)
-	{
-		return $this->_auth->assign($userId, $this->_name, $bizRule, $data);
-	}
-
-	/**
-	 * Revokes an authorization assignment from a user.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @return boolean whether removal is successful
-	 * @see Manager::revoke
-	 */
-	public function revoke($userId)
-	{
-		return $this->_auth->revoke($userId, $this->_name);
-	}
-
-	/**
-	 * Returns a value indicating whether this item has been assigned to the user.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @return boolean whether the item has been assigned to the user.
-	 * @see Manager::isAssigned
-	 */
-	public function isAssigned($userId)
-	{
-		return $this->_auth->isAssigned($userId, $this->_name);
-	}
-
-	/**
-	 * Returns the item assignment information.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @return Assignment the item assignment information. Null is returned if
-	 * this item is not assigned to the user.
-	 * @see Manager::getAssignment
-	 */
-	public function getAssignment($userId)
-	{
-		return $this->_auth->getAssignment($userId, $this->_name);
-	}
-}
diff --git a/framework/rbac/Manager.php b/framework/rbac/Manager.php
deleted file mode 100644
index 5c3c4f6..0000000
--- a/framework/rbac/Manager.php
+++ /dev/null
@@ -1,312 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\rbac;
-
-use Yii;
-use yii\base\Component;
-use yii\base\InvalidParamException;
-
-/**
- * Manager is the base class for authorization manager classes.
- *
- * Manager extends [[Component]] and implements some methods
- * that are common among authorization manager classes.
- *
- * Manager together with its concrete child classes implement the Role-Based
- * Access Control (RBAC).
- *
- * The main idea is that permissions are organized as a hierarchy of
- * [[Item]] authorization items. Items on higer level inherit the permissions
- * represented by items on lower level. And roles are simply top-level authorization items
- * that may be assigned to individual users. A user is said to have a permission
- * to do something if the corresponding authorization item is inherited by one of his roles.
- *
- * Using authorization manager consists of two aspects. First, the authorization hierarchy
- * and assignments have to be established. Manager and its child classes
- * provides APIs to accomplish this task. Developers may need to develop some GUI
- * so that it is more intuitive to end-users. Second, developers call [[Manager::checkAccess()]]
- * at appropriate places in the application code to check if the current user
- * has the needed permission for an operation.
- *
- * @property array $roles Roles (name=>Item).
- * @property array $tasks Tasks (name=>Item).
- * @property array $operations Operations (name=>Item).
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @author Alexander Kochetov <creocoder@gmail.com>
- * @since 2.0
- */
-abstract class Manager extends Component
-{
-	/**
-	 * @var boolean Enable error reporting for bizRules.
-	 */
-	public $showErrors = false;
-
-	/**
-	 * @var array list of role names that are assigned to all users implicitly.
-	 * These roles do not need to be explicitly assigned to any user.
-	 * When calling [[checkAccess()]], these roles will be checked first.
-	 * For performance reason, you should minimize the number of such roles.
-	 * A typical usage of such roles is to define an 'authenticated' role and associate
-	 * it with a biz rule which checks if the current user is authenticated.
-	 * And then declare 'authenticated' in this property so that it can be applied to
-	 * every authenticated user.
-	 */
-	public $defaultRoles = array();
-
-	/**
-	 * Creates a role.
-	 * This is a shortcut method to [[Manager::createItem()]].
-	 * @param string $name the item name
-	 * @param string $description the item description.
-	 * @param string $bizRule the business rule associated with this item
-	 * @param mixed $data additional data to be passed when evaluating the business rule
-	 * @return Item the authorization item
-	 */
-	public function createRole($name, $description = '', $bizRule = null, $data = null)
-	{
-		return $this->createItem($name, Item::TYPE_ROLE, $description, $bizRule, $data);
-	}
-
-	/**
-	 * Creates a task.
-	 * This is a shortcut method to [[Manager::createItem()]].
-	 * @param string $name the item name
-	 * @param string $description the item description.
-	 * @param string $bizRule the business rule associated with this item
-	 * @param mixed $data additional data to be passed when evaluating the business rule
-	 * @return Item the authorization item
-	 */
-	public function createTask($name, $description = '', $bizRule = null, $data = null)
-	{
-		return $this->createItem($name, Item::TYPE_TASK, $description, $bizRule, $data);
-	}
-
-	/**
-	 * Creates an operation.
-	 * This is a shortcut method to [[Manager::createItem()]].
-	 * @param string $name the item name
-	 * @param string $description the item description.
-	 * @param string $bizRule the business rule associated with this item
-	 * @param mixed $data additional data to be passed when evaluating the business rule
-	 * @return Item the authorization item
-	 */
-	public function createOperation($name, $description = '', $bizRule = null, $data = null)
-	{
-		return $this->createItem($name, Item::TYPE_OPERATION, $description, $bizRule, $data);
-	}
-
-	/**
-	 * Returns roles.
-	 * This is a shortcut method to [[Manager::getItems()]].
-	 * @param mixed $userId the user ID. If not null, only the roles directly assigned to the user
-	 * will be returned. Otherwise, all roles will be returned.
-	 * @return Item[] roles (name=>AuthItem)
-	 */
-	public function getRoles($userId = null)
-	{
-		return $this->getItems($userId, Item::TYPE_ROLE);
-	}
-
-	/**
-	 * Returns tasks.
-	 * This is a shortcut method to [[Manager::getItems()]].
-	 * @param mixed $userId the user ID. If not null, only the tasks directly assigned to the user
-	 * will be returned. Otherwise, all tasks will be returned.
-	 * @return Item[] tasks (name=>AuthItem)
-	 */
-	public function getTasks($userId = null)
-	{
-		return $this->getItems($userId, Item::TYPE_TASK);
-	}
-
-	/**
-	 * Returns operations.
-	 * This is a shortcut method to [[Manager::getItems()]].
-	 * @param mixed $userId the user ID. If not null, only the operations directly assigned to the user
-	 * will be returned. Otherwise, all operations will be returned.
-	 * @return Item[] operations (name=>AuthItem)
-	 */
-	public function getOperations($userId = null)
-	{
-		return $this->getItems($userId, Item::TYPE_OPERATION);
-	}
-
-	/**
-	 * Executes the specified business rule.
-	 * @param string $bizRule the business rule to be executed.
-	 * @param array $params parameters passed to [[Manager::checkAccess()]].
-	 * @param mixed $data additional data associated with the authorization item or assignment.
-	 * @return boolean whether the business rule returns true.
-	 * If the business rule is empty, it will still return true.
-	 */
-	public function executeBizRule($bizRule, $params, $data)
-	{
-		return $bizRule === '' || $bizRule === null || ($this->showErrors ? eval($bizRule) != 0 : @eval($bizRule) != 0);
-	}
-
-	/**
-	 * Checks the item types to make sure a child can be added to a parent.
-	 * @param integer $parentType parent item type
-	 * @param integer $childType child item type
-	 * @throws InvalidParamException if the item cannot be added as a child due to its incompatible type.
-	 */
-	protected function checkItemChildType($parentType, $childType)
-	{
-		static $types = array('operation', 'task', 'role');
-		if ($parentType < $childType) {
-			throw new InvalidParamException("Cannot add an item of type '$types[$childType]' to an item of type '$types[$parentType]'.");
-		}
-	}
-
-	/**
-	 * Performs access check for the specified user.
-	 * @param mixed $userId the user ID. This should be either an integer or a string representing
-	 * the unique identifier of a user. See [[User::id]].
-	 * @param string $itemName the name of the operation that we are checking access to
-	 * @param array $params name-value pairs that would be passed to biz rules associated
-	 * with the tasks and roles assigned to the user.
-	 * @return boolean whether the operations can be performed by the user.
-	 */
-	abstract public function checkAccess($userId, $itemName, $params = array());
-
-	/**
-	 * Creates an authorization item.
-	 * An authorization item represents an action permission (e.g. creating a post).
-	 * It has three types: operation, task and role.
-	 * Authorization items form a hierarchy. Higher level items inheirt permissions representing
-	 * by lower level items.
-	 * @param string $name the item name. This must be a unique identifier.
-	 * @param integer $type the item type (0: operation, 1: task, 2: role).
-	 * @param string $description description of the item
-	 * @param string $bizRule business rule associated with the item. This is a piece of
-	 * PHP code that will be executed when [[checkAccess()]] is called for the item.
-	 * @param mixed $data additional data associated with the item.
-	 * @throws \yii\base\Exception if an item with the same name already exists
-	 * @return Item the authorization item
-	 */
-	abstract public function createItem($name, $type, $description = '', $bizRule = null, $data = null);
-	/**
-	 * Removes the specified authorization item.
-	 * @param string $name the name of the item to be removed
-	 * @return boolean whether the item exists in the storage and has been removed
-	 */
-	abstract public function removeItem($name);
-	/**
-	 * Returns the authorization items of the specific type and user.
-	 * @param mixed $userId the user ID. Defaults to null, meaning returning all items even if
-	 * they are not assigned to a user.
-	 * @param integer $type the item type (0: operation, 1: task, 2: role). Defaults to null,
-	 * meaning returning all items regardless of their type.
-	 * @return Item[] the authorization items of the specific type.
-	 */
-	abstract public function getItems($userId = null, $type = null);
-	/**
-	 * Returns the authorization item with the specified name.
-	 * @param string $name the name of the item
-	 * @return Item the authorization item. Null if the item cannot be found.
-	 */
-	abstract public function getItem($name);
-	/**
-	 * Saves an authorization item to persistent storage.
-	 * @param Item $item the item to be saved.
-	 * @param string $oldName the old item name. If null, it means the item name is not changed.
-	 */
-	abstract public function saveItem($item, $oldName = null);
-
-	/**
-	 * Adds an item as a child of another item.
-	 * @param string $itemName the parent item name
-	 * @param string $childName the child item name
-	 * @throws \yii\base\Exception if either parent or child doesn't exist or if a loop has been detected.
-	 */
-	abstract public function addItemChild($itemName, $childName);
-	/**
-	 * Removes a child from its parent.
-	 * Note, the child item is not deleted. Only the parent-child relationship is removed.
-	 * @param string $itemName the parent item name
-	 * @param string $childName the child item name
-	 * @return boolean whether the removal is successful
-	 */
-	abstract public function removeItemChild($itemName, $childName);
-	/**
-	 * Returns a value indicating whether a child exists within a parent.
-	 * @param string $itemName the parent item name
-	 * @param string $childName the child item name
-	 * @return boolean whether the child exists
-	 */
-	abstract public function hasItemChild($itemName, $childName);
-	/**
-	 * Returns the children of the specified item.
-	 * @param mixed $itemName the parent item name. This can be either a string or an array.
-	 * The latter represents a list of item names.
-	 * @return Item[] all child items of the parent
-	 */
-	abstract public function getItemChildren($itemName);
-
-	/**
-	 * Assigns an authorization item to a user.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @param string $itemName the item name
-	 * @param string $bizRule the business rule to be executed when [[checkAccess()]] is called
-	 * for this particular authorization item.
-	 * @param mixed $data additional data associated with this assignment
-	 * @return Assignment the authorization assignment information.
-	 * @throws \yii\base\Exception if the item does not exist or if the item has already been assigned to the user
-	 */
-	abstract public function assign($userId, $itemName, $bizRule = null, $data = null);
-	/**
-	 * Revokes an authorization assignment from a user.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @param string $itemName the item name
-	 * @return boolean whether removal is successful
-	 */
-	abstract public function revoke($userId, $itemName);
-	/**
-	 * Returns a value indicating whether the item has been assigned to the user.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @param string $itemName the item name
-	 * @return boolean whether the item has been assigned to the user.
-	 */
-	abstract public function isAssigned($userId, $itemName);
-	/**
-	 * Returns the item assignment information.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @param string $itemName the item name
-	 * @return Assignment the item assignment information. Null is returned if
-	 * the item is not assigned to the user.
-	 */
-	abstract public function getAssignment($userId, $itemName);
-	/**
-	 * Returns the item assignments for the specified user.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @return Item[] the item assignment information for the user. An empty array will be
-	 * returned if there is no item assigned to the user.
-	 */
-	abstract public function getAssignments($userId);
-	/**
-	 * Saves the changes to an authorization assignment.
-	 * @param Assignment $assignment the assignment that has been changed.
-	 */
-	abstract public function saveAssignment($assignment);
-	/**
-	 * Removes all authorization data.
-	 */
-	abstract public function clearAll();
-	/**
-	 * Removes all authorization assignments.
-	 */
-	abstract public function clearAssignments();
-	/**
-	 * Saves authorization data into persistent storage.
-	 * If any change is made to the authorization data, please make
-	 * sure you call this method to save the changed data into persistent storage.
-	 */
-	abstract public function save();
-}
diff --git a/framework/rbac/PhpManager.php b/framework/rbac/PhpManager.php
deleted file mode 100644
index 8a4dbec..0000000
--- a/framework/rbac/PhpManager.php
+++ /dev/null
@@ -1,516 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\rbac;
-
-use Yii;
-use yii\base\Exception;
-use yii\base\InvalidCallException;
-use yii\base\InvalidParamException;
-
-/**
- * PhpManager represents an authorization manager that stores authorization
- * information in terms of a PHP script file.
- *
- * The authorization data will be saved to and loaded from a file
- * specified by [[authFile]], which defaults to 'protected/data/rbac.php'.
- *
- * PhpManager is mainly suitable for authorization data that is not too big
- * (for example, the authorization data for a personal blog system).
- * Use [[DbManager]] for more complex authorization data.
- *
- * @property array $authItems The authorization items of the specific type.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @author Alexander Kochetov <creocoder@gmail.com>
- * @since 2.0
- */
-class PhpManager extends Manager
-{
-	/**
-	 * @var string the path of the PHP script that contains the authorization data.
-	 * If not set, it will be using 'protected/data/rbac.php' as the data file.
-	 * Make sure this file is writable by the Web server process if the authorization
-	 * needs to be changed.
-	 * @see loadFromFile
-	 * @see saveToFile
-	 */
-	public $authFile;
-
-	private $_items = array(); // itemName => item
-	private $_children = array(); // itemName, childName => child
-	private $_assignments = array(); // userId, itemName => assignment
-
-	/**
-	 * Initializes the application component.
-	 * This method overrides parent implementation by loading the authorization data
-	 * from PHP script.
-	 */
-	public function init()
-	{
-		parent::init();
-		if ($this->authFile === null) {
-			$this->authFile = Yii::getAlias('@app/data/rbac') . '.php';
-		}
-		$this->load();
-	}
-
-	/**
-	 * Performs access check for the specified user.
-	 * @param mixed $userId the user ID. This can be either an integer or a string representing
-	 * @param string $itemName the name of the operation that need access check
-	 * the unique identifier of a user. See [[User::id]].
-	 * @param array $params name-value pairs that would be passed to biz rules associated
-	 * with the tasks and roles assigned to the user. A param with name 'userId' is added to
-	 * this array, which holds the value of `$userId`.
-	 * @return boolean whether the operations can be performed by the user.
-	 */
-	public function checkAccess($userId, $itemName, $params = array())
-	{
-		if (!isset($this->_items[$itemName])) {
-			return false;
-		}
-		/** @var $item Item */
-		$item = $this->_items[$itemName];
-		Yii::trace('Checking permission: ' . $item->getName(), __METHOD__);
-		if (!isset($params['userId'])) {
-			$params['userId'] = $userId;
-		}
-		if ($this->executeBizRule($item->getBizRule(), $params, $item->getData())) {
-			if (in_array($itemName, $this->defaultRoles)) {
-				return true;
-			}
-			if (isset($this->_assignments[$userId][$itemName])) {
-				/** @var $assignment Assignment */
-				$assignment = $this->_assignments[$userId][$itemName];
-				if ($this->executeBizRule($assignment->getBizRule(), $params, $assignment->getData())) {
-					return true;
-				}
-			}
-			foreach ($this->_children as $parentName => $children) {
-				if (isset($children[$itemName]) && $this->checkAccess($userId, $parentName, $params)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Adds an item as a child of another item.
-	 * @param string $itemName the parent item name
-	 * @param string $childName the child item name
-	 * @return boolean whether the item is added successfully
-	 * @throws Exception if either parent or child doesn't exist.
-	 * @throws InvalidCallException if item already has a child with $itemName or if a loop has been detected.
-	 */
-	public function addItemChild($itemName, $childName)
-	{
-		if (!isset($this->_items[$childName], $this->_items[$itemName])) {
-			throw new Exception("Either '$itemName' or '$childName' does not exist.");
-		}
-		/** @var $child Item */
-		$child = $this->_items[$childName];
-		/** @var $item Item */
-		$item = $this->_items[$itemName];
-		$this->checkItemChildType($item->getType(), $child->getType());
-		if ($this->detectLoop($itemName, $childName)) {
-			throw new InvalidCallException("Cannot add '$childName' as a child of '$itemName'. A loop has been detected.");
-		}
-		if (isset($this->_children[$itemName][$childName])) {
-			throw new InvalidCallException("The item '$itemName' already has a child '$childName'.");
-		}
-		$this->_children[$itemName][$childName] = $this->_items[$childName];
-		return true;
-	}
-
-	/**
-	 * Removes a child from its parent.
-	 * Note, the child item is not deleted. Only the parent-child relationship is removed.
-	 * @param string $itemName the parent item name
-	 * @param string $childName the child item name
-	 * @return boolean whether the removal is successful
-	 */
-	public function removeItemChild($itemName, $childName)
-	{
-		if (isset($this->_children[$itemName][$childName])) {
-			unset($this->_children[$itemName][$childName]);
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Returns a value indicating whether a child exists within a parent.
-	 * @param string $itemName the parent item name
-	 * @param string $childName the child item name
-	 * @return boolean whether the child exists
-	 */
-	public function hasItemChild($itemName, $childName)
-	{
-		return isset($this->_children[$itemName][$childName]);
-	}
-
-	/**
-	 * Returns the children of the specified item.
-	 * @param mixed $names the parent item name. This can be either a string or an array.
-	 * The latter represents a list of item names.
-	 * @return Item[] all child items of the parent
-	 */
-	public function getItemChildren($names)
-	{
-		if (is_string($names)) {
-			return isset($this->_children[$names]) ? $this->_children[$names] : array();
-		}
-
-		$children = array();
-		foreach ($names as $name) {
-			if (isset($this->_children[$name])) {
-				$children = array_merge($children, $this->_children[$name]);
-			}
-		}
-		return $children;
-	}
-
-	/**
-	 * Assigns an authorization item to a user.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @param string $itemName the item name
-	 * @param string $bizRule the business rule to be executed when [[checkAccess()]] is called
-	 * for this particular authorization item.
-	 * @param mixed $data additional data associated with this assignment
-	 * @return Assignment the authorization assignment information.
-	 * @throws InvalidParamException if the item does not exist or if the item has already been assigned to the user
-	 */
-	public function assign($userId, $itemName, $bizRule = null, $data = null)
-	{
-		if (!isset($this->_items[$itemName])) {
-			throw new InvalidParamException("Unknown authorization item '$itemName'.");
-		} elseif (isset($this->_assignments[$userId][$itemName])) {
-			throw new InvalidParamException("Authorization item '$itemName' has already been assigned to user '$userId'.");
-		} else {
-			return $this->_assignments[$userId][$itemName] = new Assignment($this, $userId, $itemName, $bizRule, $data);
-		}
-	}
-
-	/**
-	 * Revokes an authorization assignment from a user.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @param string $itemName the item name
-	 * @return boolean whether removal is successful
-	 */
-	public function revoke($userId, $itemName)
-	{
-		if (isset($this->_assignments[$userId][$itemName])) {
-			unset($this->_assignments[$userId][$itemName]);
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Returns a value indicating whether the item has been assigned to the user.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @param string $itemName the item name
-	 * @return boolean whether the item has been assigned to the user.
-	 */
-	public function isAssigned($userId, $itemName)
-	{
-		return isset($this->_assignments[$userId][$itemName]);
-	}
-
-	/**
-	 * Returns the item assignment information.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @param string $itemName the item name
-	 * @return Assignment the item assignment information. Null is returned if
-	 * the item is not assigned to the user.
-	 */
-	public function getAssignment($userId, $itemName)
-	{
-		return isset($this->_assignments[$userId][$itemName]) ? $this->_assignments[$userId][$itemName] : null;
-	}
-
-	/**
-	 * Returns the item assignments for the specified user.
-	 * @param mixed $userId the user ID (see [[User::id]])
-	 * @return Assignment[] the item assignment information for the user. An empty array will be
-	 * returned if there is no item assigned to the user.
-	 */
-	public function getAssignments($userId)
-	{
-		return isset($this->_assignments[$userId]) ? $this->_assignments[$userId] : array();
-	}
-
-	/**
-	 * Returns the authorization items of the specific type and user.
-	 * @param mixed $userId the user ID. Defaults to null, meaning returning all items even if
-	 * they are not assigned to a user.
-	 * @param integer $type the item type (0: operation, 1: task, 2: role). Defaults to null,
-	 * meaning returning all items regardless of their type.
-	 * @return Item[] the authorization items of the specific type.
-	 */
-	public function getItems($userId = null, $type = null)
-	{
-		if ($userId === null && $type === null) {
-			return $this->_items;
-		}
-		$items = array();
-		if ($userId === null) {
-			foreach ($this->_items as $name => $item) {
-				/** @var $item Item */
-				if ($item->getType() == $type) {
-					$items[$name] = $item;
-				}
-			}
-		} elseif (isset($this->_assignments[$userId])) {
-			foreach ($this->_assignments[$userId] as $assignment) {
-				/** @var $assignment Assignment */
-				$name = $assignment->getItemName();
-				if (isset($this->_items[$name]) && ($type === null || $this->_items[$name]->getType() == $type)) {
-					$items[$name] = $this->_items[$name];
-				}
-			}
-		}
-		return $items;
-	}
-
-	/**
-	 * Creates an authorization item.
-	 * An authorization item represents an action permission (e.g. creating a post).
-	 * It has three types: operation, task and role.
-	 * Authorization items form a hierarchy. Higher level items inheirt permissions representing
-	 * by lower level items.
-	 * @param string $name the item name. This must be a unique identifier.
-	 * @param integer $type the item type (0: operation, 1: task, 2: role).
-	 * @param string $description description of the item
-	 * @param string $bizRule business rule associated with the item. This is a piece of
-	 * PHP code that will be executed when [[checkAccess()]] is called for the item.
-	 * @param mixed $data additional data associated with the item.
-	 * @return Item the authorization item
-	 * @throws Exception if an item with the same name already exists
-	 */
-	public function createItem($name, $type, $description = '', $bizRule = null, $data = null)
-	{
-		if (isset($this->_items[$name])) {
-			throw new Exception('Unable to add an item whose name is the same as an existing item.');
-		}
-		return $this->_items[$name] = new Item($this, $name, $type, $description, $bizRule, $data);
-	}
-
-	/**
-	 * Removes the specified authorization item.
-	 * @param string $name the name of the item to be removed
-	 * @return boolean whether the item exists in the storage and has been removed
-	 */
-	public function removeItem($name)
-	{
-		if (isset($this->_items[$name])) {
-			foreach ($this->_children as &$children) {
-				unset($children[$name]);
-			}
-			foreach ($this->_assignments as &$assignments) {
-				unset($assignments[$name]);
-			}
-			unset($this->_items[$name]);
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Returns the authorization item with the specified name.
-	 * @param string $name the name of the item
-	 * @return Item the authorization item. Null if the item cannot be found.
-	 */
-	public function getItem($name)
-	{
-		return isset($this->_items[$name]) ? $this->_items[$name] : null;
-	}
-
-	/**
-	 * Saves an authorization item to persistent storage.
-	 * @param Item $item the item to be saved.
-	 * @param string $oldName the old item name. If null, it means the item name is not changed.
-	 * @throws InvalidParamException if an item with the same name already taken
-	 */
-	public function saveItem($item, $oldName = null)
-	{
-		if ($oldName !== null && ($newName = $item->getName()) !== $oldName) // name changed
-		{
-			if (isset($this->_items[$newName])) {
-				throw new InvalidParamException("Unable to change the item name. The name '$newName' is already used by another item.");
-			}
-			if (isset($this->_items[$oldName]) && $this->_items[$oldName] === $item) {
-				unset($this->_items[$oldName]);
-				$this->_items[$newName] = $item;
-				if (isset($this->_children[$oldName])) {
-					$this->_children[$newName] = $this->_children[$oldName];
-					unset($this->_children[$oldName]);
-				}
-				foreach ($this->_children as &$children) {
-					if (isset($children[$oldName])) {
-						$children[$newName] = $children[$oldName];
-						unset($children[$oldName]);
-					}
-				}
-				foreach ($this->_assignments as &$assignments) {
-					if (isset($assignments[$oldName])) {
-						$assignments[$newName] = $assignments[$oldName];
-						unset($assignments[$oldName]);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Saves the changes to an authorization assignment.
-	 * @param Assignment $assignment the assignment that has been changed.
-	 */
-	public function saveAssignment($assignment)
-	{
-	}
-
-	/**
-	 * Saves authorization data into persistent storage.
-	 * If any change is made to the authorization data, please make
-	 * sure you call this method to save the changed data into persistent storage.
-	 */
-	public function save()
-	{
-		$items = array();
-		foreach ($this->_items as $name => $item) {
-			/** @var $item Item */
-			$items[$name] = array(
-				'type' => $item->getType(),
-				'description' => $item->getDescription(),
-				'bizRule' => $item->getBizRule(),
-				'data' => $item->getData(),
-			);
-			if (isset($this->_children[$name])) {
-				foreach ($this->_children[$name] as $child) {
-					/** @var $child Item */
-					$items[$name]['children'][] = $child->getName();
-				}
-			}
-		}
-
-		foreach ($this->_assignments as $userId => $assignments) {
-			foreach ($assignments as $name => $assignment) {
-				/** @var $assignment Assignment */
-				if (isset($items[$name])) {
-					$items[$name]['assignments'][$userId] = array(
-						'bizRule' => $assignment->getBizRule(),
-						'data' => $assignment->getData(),
-					);
-				}
-			}
-		}
-
-		$this->saveToFile($items, $this->authFile);
-	}
-
-	/**
-	 * Loads authorization data.
-	 */
-	public function load()
-	{
-		$this->clearAll();
-
-		$items = $this->loadFromFile($this->authFile);
-
-		foreach ($items as $name => $item) {
-			$this->_items[$name] = new Item($this, $name, $item['type'], $item['description'], $item['bizRule'], $item['data']);
-		}
-
-		foreach ($items as $name => $item) {
-			if (isset($item['children'])) {
-				foreach ($item['children'] as $childName) {
-					if (isset($this->_items[$childName])) {
-						$this->_children[$name][$childName] = $this->_items[$childName];
-					}
-				}
-			}
-			if (isset($item['assignments'])) {
-				foreach ($item['assignments'] as $userId => $assignment) {
-					$this->_assignments[$userId][$name] = new Assignment($this, $name, $userId, $assignment['bizRule'], $assignment['data']);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Removes all authorization data.
-	 */
-	public function clearAll()
-	{
-		$this->clearAssignments();
-		$this->_children = array();
-		$this->_items = array();
-	}
-
-	/**
-	 * Removes all authorization assignments.
-	 */
-	public function clearAssignments()
-	{
-		$this->_assignments = array();
-	}
-
-	/**
-	 * Checks whether there is a loop in the authorization item hierarchy.
-	 * @param string $itemName parent item name
-	 * @param string $childName the name of the child item that is to be added to the hierarchy
-	 * @return boolean whether a loop exists
-	 */
-	protected function detectLoop($itemName, $childName)
-	{
-		if ($childName === $itemName) {
-			return true;
-		}
-		if (!isset($this->_children[$childName], $this->_items[$itemName])) {
-			return false;
-		}
-		foreach ($this->_children[$childName] as $child) {
-			/** @var $child Item */
-			if ($this->detectLoop($itemName, $child->getName())) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Loads the authorization data from a PHP script file.
-	 * @param string $file the file path.
-	 * @return array the authorization data
-	 * @see saveToFile
-	 */
-	protected function loadFromFile($file)
-	{
-		if (is_file($file)) {
-			return require($file);
-		} else {
-			return array();
-		}
-	}
-
-	/**
-	 * Saves the authorization data to a PHP script file.
-	 * @param array $data the authorization data
-	 * @param string $file the file path.
-	 * @see loadFromFile
-	 */
-	protected function saveToFile($data, $file)
-	{
-		file_put_contents($file, "<?php\nreturn " . var_export($data, true) . ";\n", LOCK_EX);
-	}
-}
diff --git a/yii/rbac/Assignment.php b/yii/rbac/Assignment.php
new file mode 100644
index 0000000..5b6a607
--- /dev/null
+++ b/yii/rbac/Assignment.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\rbac;
+
+use Yii;
+use yii\base\Object;
+
+/**
+ * Assignment represents an assignment of a role to a user.
+ * It includes additional assignment information such as [[bizRule]] and [[data]].
+ * Do not create a Assignment instance using the 'new' operator.
+ * Instead, call [[Manager::assign()]].
+ *
+ * @property mixed $userId User ID (see [[User::id]]).
+ * @property string $itemName The authorization item name.
+ * @property string $bizRule The business rule associated with this assignment.
+ * @property mixed $data Additional data for this assignment.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Alexander Kochetov <creocoder@gmail.com>
+ * @since 2.0
+ */
+class Assignment extends Object
+{
+	private $_auth;
+	private $_userId;
+	private $_itemName;
+	private $_bizRule;
+	private $_data;
+
+	/**
+	 * Constructor.
+	 * @param Manager $auth the authorization manager
+	 * @param mixed $userId user ID (see [[User::id]])
+	 * @param string $itemName authorization item name
+	 * @param string $bizRule the business rule associated with this assignment
+	 * @param mixed $data additional data for this assignment
+	 */
+	public function __construct($auth, $userId, $itemName, $bizRule = null, $data = null)
+	{
+		$this->_auth = $auth;
+		$this->_userId = $userId;
+		$this->_itemName = $itemName;
+		$this->_bizRule = $bizRule;
+		$this->_data = $data;
+	}
+
+	/**
+	 * @return mixed user ID (see [[User::id]])
+	 */
+	public function getUserId()
+	{
+		return $this->_userId;
+	}
+
+	/**
+	 * @return string the authorization item name
+	 */
+	public function getItemName()
+	{
+		return $this->_itemName;
+	}
+
+	/**
+	 * @return string the business rule associated with this assignment
+	 */
+	public function getBizRule()
+	{
+		return $this->_bizRule;
+	}
+
+	/**
+	 * @param string $value the business rule associated with this assignment
+	 */
+	public function setBizRule($value)
+	{
+		if ($this->_bizRule !== $value) {
+			$this->_bizRule = $value;
+			$this->_auth->saveAssignment($this);
+		}
+	}
+
+	/**
+	 * @return mixed additional data for this assignment
+	 */
+	public function getData()
+	{
+		return $this->_data;
+	}
+
+	/**
+	 * @param mixed $value additional data for this assignment
+	 */
+	public function setData($value)
+	{
+		if ($this->_data !== $value) {
+			$this->_data = $value;
+			$this->_auth->saveAssignment($this);
+		}
+	}
+}
diff --git a/yii/rbac/DbManager.php b/yii/rbac/DbManager.php
new file mode 100644
index 0000000..ea6e8ac
--- /dev/null
+++ b/yii/rbac/DbManager.php
@@ -0,0 +1,573 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\rbac;
+
+use Yii;
+use yii\db\Connection;
+use yii\db\Query;
+use yii\base\Exception;
+use yii\base\InvalidConfigException;
+use yii\base\InvalidCallException;
+
+/**
+ * DbManager represents an authorization manager that stores authorization information in database.
+ *
+ * The database connection is specified by [[db]]. And the database schema
+ * should be as described in "framework/rbac/*.sql". You may change the names of
+ * the three tables used to store the authorization data by setting [[itemTable]],
+ * [[itemChildTable]] and [[assignmentTable]].
+ *
+ * @property array $authItems The authorization items of the specific type.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Alexander Kochetov <creocoder@gmail.com>
+ * @since 2.0
+ */
+class DbManager extends Manager
+{
+	/**
+	 * @var Connection|string the DB connection object or the application component ID of the DB connection.
+	 * After the DbManager object is created, if you want to change this property, you should only assign it
+	 * with a DB connection object.
+	 */
+	public $db = 'db';
+	/**
+	 * @var string the name of the table storing authorization items. Defaults to 'tbl_auth_item'.
+	 */
+	public $itemTable = 'tbl_auth_item';
+	/**
+	 * @var string the name of the table storing authorization item hierarchy. Defaults to 'tbl_auth_item_child'.
+	 */
+	public $itemChildTable = 'tbl_auth_item_child';
+	/**
+	 * @var string the name of the table storing authorization item assignments. Defaults to 'tbl_auth_assignment'.
+	 */
+	public $assignmentTable = 'tbl_auth_assignment';
+
+	private $_usingSqlite;
+
+	/**
+	 * Initializes the application component.
+	 * This method overrides the parent implementation by establishing the database connection.
+	 */
+	public function init()
+	{
+		if (is_string($this->db)) {
+			$this->db = Yii::$app->getComponent($this->db);
+		}
+		if (!$this->db instanceof Connection) {
+			throw new InvalidConfigException("DbManager::db must be either a DB connection instance or the application component ID of a DB connection.");
+		}
+		$this->_usingSqlite = !strncmp($this->db->getDriverName(), 'sqlite', 6);
+		parent::init();
+	}
+
+	/**
+	 * Performs access check for the specified user.
+	 * @param mixed $userId the user ID. This should can be either an integer or a string representing
+	 * the unique identifier of a user. See [[User::id]].
+	 * @param string $itemName the name of the operation that need access check
+	 * @param array $params name-value pairs that would be passed to biz rules associated
+	 * with the tasks and roles assigned to the user. A param with name 'userId' is added to this array,
+	 * which holds the value of `$userId`.
+	 * @return boolean whether the operations can be performed by the user.
+	 */
+	public function checkAccess($userId, $itemName, $params = array())
+	{
+		$assignments = $this->getAssignments($userId);
+		return $this->checkAccessRecursive($userId, $itemName, $params, $assignments);
+	}
+
+	/**
+	 * Performs access check for the specified user.
+	 * This method is internally called by [[checkAccess()]].
+	 * @param mixed $userId the user ID. This should can be either an integer or a string representing
+	 * the unique identifier of a user. See [[User::id]].
+	 * @param string $itemName the name of the operation that need access check
+	 * @param array $params name-value pairs that would be passed to biz rules associated
+	 * with the tasks and roles assigned to the user. A param with name 'userId' is added to this array,
+	 * which holds the value of `$userId`.
+	 * @param Assignment[] $assignments the assignments to the specified user
+	 * @return boolean whether the operations can be performed by the user.
+	 */
+	protected function checkAccessRecursive($userId, $itemName, $params, $assignments)
+	{
+		if (($item = $this->getItem($itemName)) === null) {
+			return false;
+		}
+		Yii::trace('Checking permission: ' . $item->getName(), __METHOD__);
+		if (!isset($params['userId'])) {
+			$params['userId'] = $userId;
+		}
+		if ($this->executeBizRule($item->getBizRule(), $params, $item->getData())) {
+			if (in_array($itemName, $this->defaultRoles)) {
+				return true;
+			}
+			if (isset($assignments[$itemName])) {
+				$assignment = $assignments[$itemName];
+				if ($this->executeBizRule($assignment->getBizRule(), $params, $assignment->getData())) {
+					return true;
+				}
+			}
+			$query = new Query;
+			$parents = $query->select(array('parent'))
+				->from($this->itemChildTable)
+				->where(array('child' => $itemName))
+				->createCommand($this->db)
+				->queryColumn();
+			foreach ($parents as $parent) {
+				if ($this->checkAccessRecursive($userId, $parent, $params, $assignments)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Adds an item as a child of another item.
+	 * @param string $itemName the parent item name
+	 * @param string $childName the child item name
+	 * @return boolean whether the item is added successfully
+	 * @throws Exception if either parent or child doesn't exist.
+	 * @throws InvalidCallException if a loop has been detected.
+	 */
+	public function addItemChild($itemName, $childName)
+	{
+		if ($itemName === $childName) {
+			throw new Exception("Cannot add '$itemName' as a child of itself.");
+		}
+		$query = new Query;
+		$rows = $query->from($this->itemTable)
+			->where(array('or', 'name=:name1', 'name=:name2'), array(
+				':name1' => $itemName,
+				':name2' => $childName
+			))
+			->createCommand($this->db)
+			->queryAll();
+		if (count($rows) == 2) {
+			if ($rows[0]['name'] === $itemName) {
+				$parentType = $rows[0]['type'];
+				$childType = $rows[1]['type'];
+			} else {
+				$childType = $rows[0]['type'];
+				$parentType = $rows[1]['type'];
+			}
+			$this->checkItemChildType($parentType, $childType);
+			if ($this->detectLoop($itemName, $childName)) {
+				throw new InvalidCallException("Cannot add '$childName' as a child of '$itemName'. A loop has been detected.");
+			}
+			$this->db->createCommand()
+				->insert($this->itemChildTable, array(
+					'parent' => $itemName,
+					'child' => $childName,
+				));
+			return true;
+		} else {
+			throw new Exception("Either '$itemName' or '$childName' does not exist.");
+		}
+	}
+
+	/**
+	 * Removes a child from its parent.
+	 * Note, the child item is not deleted. Only the parent-child relationship is removed.
+	 * @param string $itemName the parent item name
+	 * @param string $childName the child item name
+	 * @return boolean whether the removal is successful
+	 */
+	public function removeItemChild($itemName, $childName)
+	{
+		return $this->db->createCommand()
+			->delete($this->itemChildTable, array(
+				'parent' => $itemName,
+				'child' => $childName
+			)) > 0;
+	}
+
+	/**
+	 * Returns a value indicating whether a child exists within a parent.
+	 * @param string $itemName the parent item name
+	 * @param string $childName the child item name
+	 * @return boolean whether the child exists
+	 */
+	public function hasItemChild($itemName, $childName)
+	{
+		$query = new Query;
+		return $query->select(array('parent'))
+			->from($this->itemChildTable)
+			->where(array(
+				'parent' => $itemName,
+				'child' => $childName
+			))
+			->createCommand($this->db)
+			->queryScalar() !== false;
+	}
+
+	/**
+	 * Returns the children of the specified item.
+	 * @param mixed $names the parent item name. This can be either a string or an array.
+	 * The latter represents a list of item names.
+	 * @return Item[] all child items of the parent
+	 */
+	public function getItemChildren($names)
+	{
+		$query = new Query;
+		$rows = $query->select(array('name', 'type', 'description', 'bizrule', 'data'))
+			->from(array(
+				$this->itemTable,
+				$this->itemChildTable
+			))
+			->where(array('parent'=>$names))
+			->andWhere('name=child')
+			->createCommand($this->db)
+			->queryAll();
+		$children = array();
+		foreach ($rows as $row) {
+			if (($data = @unserialize($row['data'])) === false) {
+				$data = null;
+			}
+			$children[$row['name']] = new Item($this, $row['name'], $row['type'], $row['description'], $row['bizrule'], $data);
+		}
+		return $children;
+	}
+
+	/**
+	 * Assigns an authorization item to a user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @param string $bizRule the business rule to be executed when [[checkAccess()]] is called
+	 * for this particular authorization item.
+	 * @param mixed $data additional data associated with this assignment
+	 * @return Assignment the authorization assignment information.
+	 * @throws Exception if the item does not exist or if the item has already been assigned to the user
+	 */
+	public function assign($userId, $itemName, $bizRule = null, $data = null)
+	{
+		if ($this->usingSqlite() && $this->getItem($itemName) === null) {
+			throw new Exception("The item '$itemName' does not exist.");
+		}
+		$this->db->createCommand()
+			->insert($this->assignmentTable, array(
+				'userid' => $userId,
+				'itemname' => $itemName,
+				'bizrule' => $bizRule,
+				'data' => serialize($data)
+			));
+		return new Assignment($this, $userId, $itemName, $bizRule, $data);
+	}
+
+	/**
+	 * Revokes an authorization assignment from a user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @return boolean whether removal is successful
+	 */
+	public function revoke($userId, $itemName)
+	{
+		return $this->db->createCommand()
+			->delete($this->assignmentTable, array(
+				'userid' => $userId,
+				'itemname' => $itemName
+			)) > 0;
+	}
+
+	/**
+	 * Returns a value indicating whether the item has been assigned to the user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @return boolean whether the item has been assigned to the user.
+	 */
+	public function isAssigned($itemName, $userId)
+	{
+		$query = new Query;
+		return $query->select(array('itemname'))
+			->from($this->assignmentTable)
+			->where(array(
+				'userid' => $userId,
+				'itemname' => $itemName
+			))
+			->createCommand($this->db)
+			->queryScalar() !== false;
+	}
+
+	/**
+	 * Returns the item assignment information.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @return Assignment the item assignment information. Null is returned if
+	 * the item is not assigned to the user.
+	 */
+	public function getAssignment($userId, $itemName)
+	{
+		$query = new Query;
+		$row = $query->from($this->assignmentTable)
+			->where(array(
+				'userid' => $userId,
+				'itemname' => $itemName
+			))
+			->createCommand($this->db)
+			->queryRow();
+		if ($row !== false) {
+			if (($data = @unserialize($row['data'])) === false) {
+				$data = null;
+			}
+			return new Assignment($this, $row['userid'], $row['itemname'], $row['bizrule'], $data);
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * Returns the item assignments for the specified user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @return Assignment[] the item assignment information for the user. An empty array will be
+	 * returned if there is no item assigned to the user.
+	 */
+	public function getAssignments($userId)
+	{
+		$query = new Query;
+		$rows = $query->from($this->assignmentTable)
+			->where(array('userid' => $userId))
+			->createCommand($this->db)
+			->queryAll();
+		$assignments = array();
+		foreach ($rows as $row) {
+			if (($data = @unserialize($row['data'])) === false) {
+				$data = null;
+			}
+			$assignments[$row['itemname']] = new Assignment($this, $row['userid'], $row['itemname'], $row['bizrule'], $data);
+		}
+		return $assignments;
+	}
+
+	/**
+	 * Saves the changes to an authorization assignment.
+	 * @param Assignment $assignment the assignment that has been changed.
+	 */
+	public function saveAssignment($assignment)
+	{
+		$this->db->createCommand()
+			->update($this->assignmentTable, array(
+				'bizrule' => $assignment->getBizRule(),
+				'data' => serialize($assignment->getData()),
+			), array(
+				'userid' => $assignment->getUserId(),
+				'itemname' => $assignment->getItemName()
+			));
+	}
+
+	/**
+	 * Returns the authorization items of the specific type and user.
+	 * @param mixed $userId the user ID. Defaults to null, meaning returning all items even if
+	 * they are not assigned to a user.
+	 * @param integer $type the item type (0: operation, 1: task, 2: role). Defaults to null,
+	 * meaning returning all items regardless of their type.
+	 * @return Item[] the authorization items of the specific type.
+	 */
+	public function getItems($userId = null, $type = null)
+	{
+		$query = new Query;
+		if ($userId === null && $type === null) {
+			$command = $query->from($this->itemTable)
+				->createCommand($this->db);
+		} elseif ($userId === null) {
+			$command = $query->from($this->itemTable)
+				->where(array('type' => $type))
+				->createCommand($this->db);
+		} elseif ($type === null) {
+			$command = $query->select(array('name', 'type', 'description', 't1.bizrule', 't1.data'))
+				->from(array(
+					$this->itemTable . ' t1',
+					$this->assignmentTable . ' t2'
+				))
+				->where(array('userid' => $userId))
+				->andWhere('name=itemname')
+				->createCommand($this->db);
+		} else {
+			$command = $query->select('name', 'type', 'description', 't1.bizrule', 't1.data')
+				->from(array(
+					$this->itemTable . ' t1',
+					$this->assignmentTable . ' t2'
+				))
+				->where(array(
+					'userid' => $userId,
+					'type' => $type
+				))
+				->andWhere('name=itemname')
+				->createCommand($this->db);
+		}
+		$items = array();
+		foreach ($command->queryAll() as $row) {
+			if (($data = @unserialize($row['data'])) === false) {
+				$data = null;
+			}
+			$items[$row['name']] = new Item($this, $row['name'], $row['type'], $row['description'], $row['bizrule'], $data);
+		}
+		return $items;
+	}
+
+	/**
+	 * Creates an authorization item.
+	 * An authorization item represents an action permission (e.g. creating a post).
+	 * It has three types: operation, task and role.
+	 * Authorization items form a hierarchy. Higher level items inheirt permissions representing
+	 * by lower level items.
+	 * @param string $name the item name. This must be a unique identifier.
+	 * @param integer $type the item type (0: operation, 1: task, 2: role).
+	 * @param string $description description of the item
+	 * @param string $bizRule business rule associated with the item. This is a piece of
+	 * PHP code that will be executed when [[checkAccess()]] is called for the item.
+	 * @param mixed $data additional data associated with the item.
+	 * @return Item the authorization item
+	 * @throws Exception if an item with the same name already exists
+	 */
+	public function createItem($name, $type, $description = '', $bizRule = null, $data = null)
+	{
+		$this->db->createCommand()
+			->insert($this->itemTable, array(
+				'name' => $name,
+				'type' => $type,
+				'description' => $description,
+				'bizrule' => $bizRule,
+				'data' => serialize($data)
+			));
+		return new Item($this, $name, $type, $description, $bizRule, $data);
+	}
+
+	/**
+	 * Removes the specified authorization item.
+	 * @param string $name the name of the item to be removed
+	 * @return boolean whether the item exists in the storage and has been removed
+	 */
+	public function removeItem($name)
+	{
+		if ($this->usingSqlite()) {
+			$this->db->createCommand()
+				->delete($this->itemChildTable, array('or', 'parent=:name1', 'child=:name2'), array(
+					':name1' => $name,
+					':name2' => $name
+				));
+			$this->db->createCommand()->delete($this->assignmentTable, array('itemname' => $name));
+		}
+		return $this->db->createCommand()->delete($this->itemTable, array('name' => $name)) > 0;
+	}
+
+	/**
+	 * Returns the authorization item with the specified name.
+	 * @param string $name the name of the item
+	 * @return Item the authorization item. Null if the item cannot be found.
+	 */
+	public function getItem($name)
+	{
+		$query = new Query;
+		$row = $query->from($this->itemTable)
+			->where(array('name' => $name))
+			->createCommand($this->db)
+			->queryRow();
+
+		if ($row !== false) {
+			if (($data = @unserialize($row['data'])) === false) {
+				$data = null;
+			}
+			return new Item($this, $row['name'], $row['type'], $row['description'], $row['bizrule'], $data);
+		} else
+			return null;
+	}
+
+	/**
+	 * Saves an authorization item to persistent storage.
+	 * @param Item $item the item to be saved.
+	 * @param string $oldName the old item name. If null, it means the item name is not changed.
+	 */
+	public function saveItem($item, $oldName = null)
+	{
+		if ($this->usingSqlite() && $oldName !== null && $item->getName() !== $oldName) {
+			$this->db->createCommand()
+				->update($this->itemChildTable, array(
+					'parent' => $item->getName(),
+				), array(
+					'parent' => $oldName,
+				));
+			$this->db->createCommand()
+				->update($this->itemChildTable, array(
+					'child' => $item->getName(),
+				), array(
+					'child' => $oldName,
+				));
+			$this->db->createCommand()
+				->update($this->assignmentTable, array(
+					'itemname' => $item->getName(),
+				), array(
+					'itemname' => $oldName,
+				));
+		}
+
+		$this->db->createCommand()
+			->update($this->itemTable, array(
+				'name' => $item->getName(),
+				'type' => $item->getType(),
+				'description' => $item->getDescription(),
+				'bizrule' => $item->getBizRule(),
+				'data' => serialize($item->getData()),
+			), array(
+				'name' => $oldName === null ? $item->getName() : $oldName,
+			));
+	}
+
+	/**
+	 * Saves the authorization data to persistent storage.
+	 */
+	public function save()
+	{
+	}
+
+	/**
+	 * Removes all authorization data.
+	 */
+	public function clearAll()
+	{
+		$this->clearAssignments();
+		$this->db->createCommand()->delete($this->itemChildTable);
+		$this->db->createCommand()->delete($this->itemTable);
+	}
+
+	/**
+	 * Removes all authorization assignments.
+	 */
+	public function clearAssignments()
+	{
+		$this->db->createCommand()->delete($this->assignmentTable);
+	}
+
+	/**
+	 * Checks whether there is a loop in the authorization item hierarchy.
+	 * @param string $itemName parent item name
+	 * @param string $childName the name of the child item that is to be added to the hierarchy
+	 * @return boolean whether a loop exists
+	 */
+	protected function detectLoop($itemName, $childName)
+	{
+		if ($childName === $itemName) {
+			return true;
+		}
+		foreach ($this->getItemChildren($childName) as $child) {
+			if ($this->detectLoop($itemName, $child->getName())) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * @return boolean whether the database is a SQLite database
+	 */
+	protected function usingSqlite()
+	{
+		return $this->_usingSqlite;
+	}
+}
diff --git a/yii/rbac/Item.php b/yii/rbac/Item.php
new file mode 100644
index 0000000..ef56a53
--- /dev/null
+++ b/yii/rbac/Item.php
@@ -0,0 +1,275 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\rbac;
+
+use Yii;
+use yii\base\Object;
+
+/**
+ * Item represents an authorization item.
+ * An authorization item can be an operation, a task or a role.
+ * They form an authorization hierarchy. Items on higher levels of the hierarchy
+ * inherit the permissions represented by items on lower levels.
+ * A user may be assigned one or several authorization items (called [[Assignment]] assignments).
+ * He can perform an operation only when it is among his assigned items.
+ *
+ * @property Manager $authManager The authorization manager.
+ * @property integer $type The authorization item type. This could be 0 (operation), 1 (task) or 2 (role).
+ * @property string $name The item name.
+ * @property string $description The item description.
+ * @property string $bizRule The business rule associated with this item.
+ * @property mixed $data The additional data associated with this item.
+ * @property array $children All child items of this item.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Alexander Kochetov <creocoder@gmail.com>
+ * @since 2.0
+ */
+class Item extends Object
+{
+	const TYPE_OPERATION = 0;
+	const TYPE_TASK = 1;
+	const TYPE_ROLE = 2;
+
+	private $_auth;
+	private $_type;
+	private $_name;
+	private $_description;
+	private $_bizRule;
+	private $_data;
+
+	/**
+	 * Constructor.
+	 * @param Manager $auth authorization manager
+	 * @param string $name authorization item name
+	 * @param integer $type authorization item type. This can be 0 (operation), 1 (task) or 2 (role).
+	 * @param string $description the description
+	 * @param string $bizRule the business rule associated with this item
+	 * @param mixed $data additional data for this item
+	 */
+	public function __construct($auth, $name, $type, $description = '', $bizRule = null, $data = null)
+	{
+		$this->_type = (int)$type;
+		$this->_auth = $auth;
+		$this->_name = $name;
+		$this->_description = $description;
+		$this->_bizRule = $bizRule;
+		$this->_data = $data;
+	}
+
+	/**
+	 * Checks to see if the specified item is within the hierarchy starting from this item.
+	 * This method is expected to be internally used by the actual implementations
+	 * of the [[Manager::checkAccess()]].
+	 * @param string $itemName the name of the item to be checked
+	 * @param array $params the parameters to be passed to business rule evaluation
+	 * @return boolean whether the specified item is within the hierarchy starting from this item.
+	 */
+	public function checkAccess($itemName, $params = array())
+	{
+		Yii::trace('Checking permission: ' . $this->_name, __METHOD__);
+		if ($this->_auth->executeBizRule($this->_bizRule, $params, $this->_data)) {
+			if ($this->_name == $itemName) {
+				return true;
+			}
+			foreach ($this->_auth->getItemChildren($this->_name) as $item) {
+				if ($item->checkAccess($itemName, $params)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * @return Manager the authorization manager
+	 */
+	public function getManager()
+	{
+		return $this->_auth;
+	}
+
+	/**
+	 * @return integer the authorization item type. This could be 0 (operation), 1 (task) or 2 (role).
+	 */
+	public function getType()
+	{
+		return $this->_type;
+	}
+
+	/**
+	 * @return string the item name
+	 */
+	public function getName()
+	{
+		return $this->_name;
+	}
+
+	/**
+	 * @param string $value the item name
+	 */
+	public function setName($value)
+	{
+		if ($this->_name !== $value) {
+			$oldName = $this->_name;
+			$this->_name = $value;
+			$this->_auth->saveItem($this, $oldName);
+		}
+	}
+
+	/**
+	 * @return string the item description
+	 */
+	public function getDescription()
+	{
+		return $this->_description;
+	}
+
+	/**
+	 * @param string $value the item description
+	 */
+	public function setDescription($value)
+	{
+		if ($this->_description !== $value) {
+			$this->_description = $value;
+			$this->_auth->saveItem($this);
+		}
+	}
+
+	/**
+	 * @return string the business rule associated with this item
+	 */
+	public function getBizRule()
+	{
+		return $this->_bizRule;
+	}
+
+	/**
+	 * @param string $value the business rule associated with this item
+	 */
+	public function setBizRule($value)
+	{
+		if ($this->_bizRule !== $value) {
+			$this->_bizRule = $value;
+			$this->_auth->saveItem($this);
+		}
+	}
+
+	/**
+	 * @return mixed the additional data associated with this item
+	 */
+	public function getData()
+	{
+		return $this->_data;
+	}
+
+	/**
+	 * @param mixed $value the additional data associated with this item
+	 */
+	public function setData($value)
+	{
+		if ($this->_data !== $value) {
+			$this->_data = $value;
+			$this->_auth->saveItem($this);
+		}
+	}
+
+	/**
+	 * Adds a child item.
+	 * @param string $name the name of the child item
+	 * @return boolean whether the item is added successfully
+	 * @throws \yii\base\Exception if either parent or child doesn't exist or if a loop has been detected.
+	 * @see Manager::addItemChild
+	 */
+	public function addChild($name)
+	{
+		return $this->_auth->addItemChild($this->_name, $name);
+	}
+
+	/**
+	 * Removes a child item.
+	 * Note, the child item is not deleted. Only the parent-child relationship is removed.
+	 * @param string $name the child item name
+	 * @return boolean whether the removal is successful
+	 * @see Manager::removeItemChild
+	 */
+	public function removeChild($name)
+	{
+		return $this->_auth->removeItemChild($this->_name, $name);
+	}
+
+	/**
+	 * Returns a value indicating whether a child exists
+	 * @param string $name the child item name
+	 * @return boolean whether the child exists
+	 * @see Manager::hasItemChild
+	 */
+	public function hasChild($name)
+	{
+		return $this->_auth->hasItemChild($this->_name, $name);
+	}
+
+	/**
+	 * Returns the children of this item.
+	 * @return Item[] all child items of this item.
+	 * @see Manager::getItemChildren
+	 */
+	public function getChildren()
+	{
+		return $this->_auth->getItemChildren($this->_name);
+	}
+
+	/**
+	 * Assigns this item to a user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $bizRule the business rule to be executed when [[checkAccess()]] is called
+	 * for this particular authorization item.
+	 * @param mixed $data additional data associated with this assignment
+	 * @return Assignment the authorization assignment information.
+	 * @throws \yii\base\Exception if the item has already been assigned to the user
+	 * @see Manager::assign
+	 */
+	public function assign($userId, $bizRule = null, $data = null)
+	{
+		return $this->_auth->assign($userId, $this->_name, $bizRule, $data);
+	}
+
+	/**
+	 * Revokes an authorization assignment from a user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @return boolean whether removal is successful
+	 * @see Manager::revoke
+	 */
+	public function revoke($userId)
+	{
+		return $this->_auth->revoke($userId, $this->_name);
+	}
+
+	/**
+	 * Returns a value indicating whether this item has been assigned to the user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @return boolean whether the item has been assigned to the user.
+	 * @see Manager::isAssigned
+	 */
+	public function isAssigned($userId)
+	{
+		return $this->_auth->isAssigned($userId, $this->_name);
+	}
+
+	/**
+	 * Returns the item assignment information.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @return Assignment the item assignment information. Null is returned if
+	 * this item is not assigned to the user.
+	 * @see Manager::getAssignment
+	 */
+	public function getAssignment($userId)
+	{
+		return $this->_auth->getAssignment($userId, $this->_name);
+	}
+}
diff --git a/yii/rbac/Manager.php b/yii/rbac/Manager.php
new file mode 100644
index 0000000..5c3c4f6
--- /dev/null
+++ b/yii/rbac/Manager.php
@@ -0,0 +1,312 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\rbac;
+
+use Yii;
+use yii\base\Component;
+use yii\base\InvalidParamException;
+
+/**
+ * Manager is the base class for authorization manager classes.
+ *
+ * Manager extends [[Component]] and implements some methods
+ * that are common among authorization manager classes.
+ *
+ * Manager together with its concrete child classes implement the Role-Based
+ * Access Control (RBAC).
+ *
+ * The main idea is that permissions are organized as a hierarchy of
+ * [[Item]] authorization items. Items on higer level inherit the permissions
+ * represented by items on lower level. And roles are simply top-level authorization items
+ * that may be assigned to individual users. A user is said to have a permission
+ * to do something if the corresponding authorization item is inherited by one of his roles.
+ *
+ * Using authorization manager consists of two aspects. First, the authorization hierarchy
+ * and assignments have to be established. Manager and its child classes
+ * provides APIs to accomplish this task. Developers may need to develop some GUI
+ * so that it is more intuitive to end-users. Second, developers call [[Manager::checkAccess()]]
+ * at appropriate places in the application code to check if the current user
+ * has the needed permission for an operation.
+ *
+ * @property array $roles Roles (name=>Item).
+ * @property array $tasks Tasks (name=>Item).
+ * @property array $operations Operations (name=>Item).
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Alexander Kochetov <creocoder@gmail.com>
+ * @since 2.0
+ */
+abstract class Manager extends Component
+{
+	/**
+	 * @var boolean Enable error reporting for bizRules.
+	 */
+	public $showErrors = false;
+
+	/**
+	 * @var array list of role names that are assigned to all users implicitly.
+	 * These roles do not need to be explicitly assigned to any user.
+	 * When calling [[checkAccess()]], these roles will be checked first.
+	 * For performance reason, you should minimize the number of such roles.
+	 * A typical usage of such roles is to define an 'authenticated' role and associate
+	 * it with a biz rule which checks if the current user is authenticated.
+	 * And then declare 'authenticated' in this property so that it can be applied to
+	 * every authenticated user.
+	 */
+	public $defaultRoles = array();
+
+	/**
+	 * Creates a role.
+	 * This is a shortcut method to [[Manager::createItem()]].
+	 * @param string $name the item name
+	 * @param string $description the item description.
+	 * @param string $bizRule the business rule associated with this item
+	 * @param mixed $data additional data to be passed when evaluating the business rule
+	 * @return Item the authorization item
+	 */
+	public function createRole($name, $description = '', $bizRule = null, $data = null)
+	{
+		return $this->createItem($name, Item::TYPE_ROLE, $description, $bizRule, $data);
+	}
+
+	/**
+	 * Creates a task.
+	 * This is a shortcut method to [[Manager::createItem()]].
+	 * @param string $name the item name
+	 * @param string $description the item description.
+	 * @param string $bizRule the business rule associated with this item
+	 * @param mixed $data additional data to be passed when evaluating the business rule
+	 * @return Item the authorization item
+	 */
+	public function createTask($name, $description = '', $bizRule = null, $data = null)
+	{
+		return $this->createItem($name, Item::TYPE_TASK, $description, $bizRule, $data);
+	}
+
+	/**
+	 * Creates an operation.
+	 * This is a shortcut method to [[Manager::createItem()]].
+	 * @param string $name the item name
+	 * @param string $description the item description.
+	 * @param string $bizRule the business rule associated with this item
+	 * @param mixed $data additional data to be passed when evaluating the business rule
+	 * @return Item the authorization item
+	 */
+	public function createOperation($name, $description = '', $bizRule = null, $data = null)
+	{
+		return $this->createItem($name, Item::TYPE_OPERATION, $description, $bizRule, $data);
+	}
+
+	/**
+	 * Returns roles.
+	 * This is a shortcut method to [[Manager::getItems()]].
+	 * @param mixed $userId the user ID. If not null, only the roles directly assigned to the user
+	 * will be returned. Otherwise, all roles will be returned.
+	 * @return Item[] roles (name=>AuthItem)
+	 */
+	public function getRoles($userId = null)
+	{
+		return $this->getItems($userId, Item::TYPE_ROLE);
+	}
+
+	/**
+	 * Returns tasks.
+	 * This is a shortcut method to [[Manager::getItems()]].
+	 * @param mixed $userId the user ID. If not null, only the tasks directly assigned to the user
+	 * will be returned. Otherwise, all tasks will be returned.
+	 * @return Item[] tasks (name=>AuthItem)
+	 */
+	public function getTasks($userId = null)
+	{
+		return $this->getItems($userId, Item::TYPE_TASK);
+	}
+
+	/**
+	 * Returns operations.
+	 * This is a shortcut method to [[Manager::getItems()]].
+	 * @param mixed $userId the user ID. If not null, only the operations directly assigned to the user
+	 * will be returned. Otherwise, all operations will be returned.
+	 * @return Item[] operations (name=>AuthItem)
+	 */
+	public function getOperations($userId = null)
+	{
+		return $this->getItems($userId, Item::TYPE_OPERATION);
+	}
+
+	/**
+	 * Executes the specified business rule.
+	 * @param string $bizRule the business rule to be executed.
+	 * @param array $params parameters passed to [[Manager::checkAccess()]].
+	 * @param mixed $data additional data associated with the authorization item or assignment.
+	 * @return boolean whether the business rule returns true.
+	 * If the business rule is empty, it will still return true.
+	 */
+	public function executeBizRule($bizRule, $params, $data)
+	{
+		return $bizRule === '' || $bizRule === null || ($this->showErrors ? eval($bizRule) != 0 : @eval($bizRule) != 0);
+	}
+
+	/**
+	 * Checks the item types to make sure a child can be added to a parent.
+	 * @param integer $parentType parent item type
+	 * @param integer $childType child item type
+	 * @throws InvalidParamException if the item cannot be added as a child due to its incompatible type.
+	 */
+	protected function checkItemChildType($parentType, $childType)
+	{
+		static $types = array('operation', 'task', 'role');
+		if ($parentType < $childType) {
+			throw new InvalidParamException("Cannot add an item of type '$types[$childType]' to an item of type '$types[$parentType]'.");
+		}
+	}
+
+	/**
+	 * Performs access check for the specified user.
+	 * @param mixed $userId the user ID. This should be either an integer or a string representing
+	 * the unique identifier of a user. See [[User::id]].
+	 * @param string $itemName the name of the operation that we are checking access to
+	 * @param array $params name-value pairs that would be passed to biz rules associated
+	 * with the tasks and roles assigned to the user.
+	 * @return boolean whether the operations can be performed by the user.
+	 */
+	abstract public function checkAccess($userId, $itemName, $params = array());
+
+	/**
+	 * Creates an authorization item.
+	 * An authorization item represents an action permission (e.g. creating a post).
+	 * It has three types: operation, task and role.
+	 * Authorization items form a hierarchy. Higher level items inheirt permissions representing
+	 * by lower level items.
+	 * @param string $name the item name. This must be a unique identifier.
+	 * @param integer $type the item type (0: operation, 1: task, 2: role).
+	 * @param string $description description of the item
+	 * @param string $bizRule business rule associated with the item. This is a piece of
+	 * PHP code that will be executed when [[checkAccess()]] is called for the item.
+	 * @param mixed $data additional data associated with the item.
+	 * @throws \yii\base\Exception if an item with the same name already exists
+	 * @return Item the authorization item
+	 */
+	abstract public function createItem($name, $type, $description = '', $bizRule = null, $data = null);
+	/**
+	 * Removes the specified authorization item.
+	 * @param string $name the name of the item to be removed
+	 * @return boolean whether the item exists in the storage and has been removed
+	 */
+	abstract public function removeItem($name);
+	/**
+	 * Returns the authorization items of the specific type and user.
+	 * @param mixed $userId the user ID. Defaults to null, meaning returning all items even if
+	 * they are not assigned to a user.
+	 * @param integer $type the item type (0: operation, 1: task, 2: role). Defaults to null,
+	 * meaning returning all items regardless of their type.
+	 * @return Item[] the authorization items of the specific type.
+	 */
+	abstract public function getItems($userId = null, $type = null);
+	/**
+	 * Returns the authorization item with the specified name.
+	 * @param string $name the name of the item
+	 * @return Item the authorization item. Null if the item cannot be found.
+	 */
+	abstract public function getItem($name);
+	/**
+	 * Saves an authorization item to persistent storage.
+	 * @param Item $item the item to be saved.
+	 * @param string $oldName the old item name. If null, it means the item name is not changed.
+	 */
+	abstract public function saveItem($item, $oldName = null);
+
+	/**
+	 * Adds an item as a child of another item.
+	 * @param string $itemName the parent item name
+	 * @param string $childName the child item name
+	 * @throws \yii\base\Exception if either parent or child doesn't exist or if a loop has been detected.
+	 */
+	abstract public function addItemChild($itemName, $childName);
+	/**
+	 * Removes a child from its parent.
+	 * Note, the child item is not deleted. Only the parent-child relationship is removed.
+	 * @param string $itemName the parent item name
+	 * @param string $childName the child item name
+	 * @return boolean whether the removal is successful
+	 */
+	abstract public function removeItemChild($itemName, $childName);
+	/**
+	 * Returns a value indicating whether a child exists within a parent.
+	 * @param string $itemName the parent item name
+	 * @param string $childName the child item name
+	 * @return boolean whether the child exists
+	 */
+	abstract public function hasItemChild($itemName, $childName);
+	/**
+	 * Returns the children of the specified item.
+	 * @param mixed $itemName the parent item name. This can be either a string or an array.
+	 * The latter represents a list of item names.
+	 * @return Item[] all child items of the parent
+	 */
+	abstract public function getItemChildren($itemName);
+
+	/**
+	 * Assigns an authorization item to a user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @param string $bizRule the business rule to be executed when [[checkAccess()]] is called
+	 * for this particular authorization item.
+	 * @param mixed $data additional data associated with this assignment
+	 * @return Assignment the authorization assignment information.
+	 * @throws \yii\base\Exception if the item does not exist or if the item has already been assigned to the user
+	 */
+	abstract public function assign($userId, $itemName, $bizRule = null, $data = null);
+	/**
+	 * Revokes an authorization assignment from a user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @return boolean whether removal is successful
+	 */
+	abstract public function revoke($userId, $itemName);
+	/**
+	 * Returns a value indicating whether the item has been assigned to the user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @return boolean whether the item has been assigned to the user.
+	 */
+	abstract public function isAssigned($userId, $itemName);
+	/**
+	 * Returns the item assignment information.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @return Assignment the item assignment information. Null is returned if
+	 * the item is not assigned to the user.
+	 */
+	abstract public function getAssignment($userId, $itemName);
+	/**
+	 * Returns the item assignments for the specified user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @return Item[] the item assignment information for the user. An empty array will be
+	 * returned if there is no item assigned to the user.
+	 */
+	abstract public function getAssignments($userId);
+	/**
+	 * Saves the changes to an authorization assignment.
+	 * @param Assignment $assignment the assignment that has been changed.
+	 */
+	abstract public function saveAssignment($assignment);
+	/**
+	 * Removes all authorization data.
+	 */
+	abstract public function clearAll();
+	/**
+	 * Removes all authorization assignments.
+	 */
+	abstract public function clearAssignments();
+	/**
+	 * Saves authorization data into persistent storage.
+	 * If any change is made to the authorization data, please make
+	 * sure you call this method to save the changed data into persistent storage.
+	 */
+	abstract public function save();
+}
diff --git a/yii/rbac/PhpManager.php b/yii/rbac/PhpManager.php
new file mode 100644
index 0000000..8a4dbec
--- /dev/null
+++ b/yii/rbac/PhpManager.php
@@ -0,0 +1,516 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\rbac;
+
+use Yii;
+use yii\base\Exception;
+use yii\base\InvalidCallException;
+use yii\base\InvalidParamException;
+
+/**
+ * PhpManager represents an authorization manager that stores authorization
+ * information in terms of a PHP script file.
+ *
+ * The authorization data will be saved to and loaded from a file
+ * specified by [[authFile]], which defaults to 'protected/data/rbac.php'.
+ *
+ * PhpManager is mainly suitable for authorization data that is not too big
+ * (for example, the authorization data for a personal blog system).
+ * Use [[DbManager]] for more complex authorization data.
+ *
+ * @property array $authItems The authorization items of the specific type.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Alexander Kochetov <creocoder@gmail.com>
+ * @since 2.0
+ */
+class PhpManager extends Manager
+{
+	/**
+	 * @var string the path of the PHP script that contains the authorization data.
+	 * If not set, it will be using 'protected/data/rbac.php' as the data file.
+	 * Make sure this file is writable by the Web server process if the authorization
+	 * needs to be changed.
+	 * @see loadFromFile
+	 * @see saveToFile
+	 */
+	public $authFile;
+
+	private $_items = array(); // itemName => item
+	private $_children = array(); // itemName, childName => child
+	private $_assignments = array(); // userId, itemName => assignment
+
+	/**
+	 * Initializes the application component.
+	 * This method overrides parent implementation by loading the authorization data
+	 * from PHP script.
+	 */
+	public function init()
+	{
+		parent::init();
+		if ($this->authFile === null) {
+			$this->authFile = Yii::getAlias('@app/data/rbac') . '.php';
+		}
+		$this->load();
+	}
+
+	/**
+	 * Performs access check for the specified user.
+	 * @param mixed $userId the user ID. This can be either an integer or a string representing
+	 * @param string $itemName the name of the operation that need access check
+	 * the unique identifier of a user. See [[User::id]].
+	 * @param array $params name-value pairs that would be passed to biz rules associated
+	 * with the tasks and roles assigned to the user. A param with name 'userId' is added to
+	 * this array, which holds the value of `$userId`.
+	 * @return boolean whether the operations can be performed by the user.
+	 */
+	public function checkAccess($userId, $itemName, $params = array())
+	{
+		if (!isset($this->_items[$itemName])) {
+			return false;
+		}
+		/** @var $item Item */
+		$item = $this->_items[$itemName];
+		Yii::trace('Checking permission: ' . $item->getName(), __METHOD__);
+		if (!isset($params['userId'])) {
+			$params['userId'] = $userId;
+		}
+		if ($this->executeBizRule($item->getBizRule(), $params, $item->getData())) {
+			if (in_array($itemName, $this->defaultRoles)) {
+				return true;
+			}
+			if (isset($this->_assignments[$userId][$itemName])) {
+				/** @var $assignment Assignment */
+				$assignment = $this->_assignments[$userId][$itemName];
+				if ($this->executeBizRule($assignment->getBizRule(), $params, $assignment->getData())) {
+					return true;
+				}
+			}
+			foreach ($this->_children as $parentName => $children) {
+				if (isset($children[$itemName]) && $this->checkAccess($userId, $parentName, $params)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Adds an item as a child of another item.
+	 * @param string $itemName the parent item name
+	 * @param string $childName the child item name
+	 * @return boolean whether the item is added successfully
+	 * @throws Exception if either parent or child doesn't exist.
+	 * @throws InvalidCallException if item already has a child with $itemName or if a loop has been detected.
+	 */
+	public function addItemChild($itemName, $childName)
+	{
+		if (!isset($this->_items[$childName], $this->_items[$itemName])) {
+			throw new Exception("Either '$itemName' or '$childName' does not exist.");
+		}
+		/** @var $child Item */
+		$child = $this->_items[$childName];
+		/** @var $item Item */
+		$item = $this->_items[$itemName];
+		$this->checkItemChildType($item->getType(), $child->getType());
+		if ($this->detectLoop($itemName, $childName)) {
+			throw new InvalidCallException("Cannot add '$childName' as a child of '$itemName'. A loop has been detected.");
+		}
+		if (isset($this->_children[$itemName][$childName])) {
+			throw new InvalidCallException("The item '$itemName' already has a child '$childName'.");
+		}
+		$this->_children[$itemName][$childName] = $this->_items[$childName];
+		return true;
+	}
+
+	/**
+	 * Removes a child from its parent.
+	 * Note, the child item is not deleted. Only the parent-child relationship is removed.
+	 * @param string $itemName the parent item name
+	 * @param string $childName the child item name
+	 * @return boolean whether the removal is successful
+	 */
+	public function removeItemChild($itemName, $childName)
+	{
+		if (isset($this->_children[$itemName][$childName])) {
+			unset($this->_children[$itemName][$childName]);
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Returns a value indicating whether a child exists within a parent.
+	 * @param string $itemName the parent item name
+	 * @param string $childName the child item name
+	 * @return boolean whether the child exists
+	 */
+	public function hasItemChild($itemName, $childName)
+	{
+		return isset($this->_children[$itemName][$childName]);
+	}
+
+	/**
+	 * Returns the children of the specified item.
+	 * @param mixed $names the parent item name. This can be either a string or an array.
+	 * The latter represents a list of item names.
+	 * @return Item[] all child items of the parent
+	 */
+	public function getItemChildren($names)
+	{
+		if (is_string($names)) {
+			return isset($this->_children[$names]) ? $this->_children[$names] : array();
+		}
+
+		$children = array();
+		foreach ($names as $name) {
+			if (isset($this->_children[$name])) {
+				$children = array_merge($children, $this->_children[$name]);
+			}
+		}
+		return $children;
+	}
+
+	/**
+	 * Assigns an authorization item to a user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @param string $bizRule the business rule to be executed when [[checkAccess()]] is called
+	 * for this particular authorization item.
+	 * @param mixed $data additional data associated with this assignment
+	 * @return Assignment the authorization assignment information.
+	 * @throws InvalidParamException if the item does not exist or if the item has already been assigned to the user
+	 */
+	public function assign($userId, $itemName, $bizRule = null, $data = null)
+	{
+		if (!isset($this->_items[$itemName])) {
+			throw new InvalidParamException("Unknown authorization item '$itemName'.");
+		} elseif (isset($this->_assignments[$userId][$itemName])) {
+			throw new InvalidParamException("Authorization item '$itemName' has already been assigned to user '$userId'.");
+		} else {
+			return $this->_assignments[$userId][$itemName] = new Assignment($this, $userId, $itemName, $bizRule, $data);
+		}
+	}
+
+	/**
+	 * Revokes an authorization assignment from a user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @return boolean whether removal is successful
+	 */
+	public function revoke($userId, $itemName)
+	{
+		if (isset($this->_assignments[$userId][$itemName])) {
+			unset($this->_assignments[$userId][$itemName]);
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Returns a value indicating whether the item has been assigned to the user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @return boolean whether the item has been assigned to the user.
+	 */
+	public function isAssigned($userId, $itemName)
+	{
+		return isset($this->_assignments[$userId][$itemName]);
+	}
+
+	/**
+	 * Returns the item assignment information.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @param string $itemName the item name
+	 * @return Assignment the item assignment information. Null is returned if
+	 * the item is not assigned to the user.
+	 */
+	public function getAssignment($userId, $itemName)
+	{
+		return isset($this->_assignments[$userId][$itemName]) ? $this->_assignments[$userId][$itemName] : null;
+	}
+
+	/**
+	 * Returns the item assignments for the specified user.
+	 * @param mixed $userId the user ID (see [[User::id]])
+	 * @return Assignment[] the item assignment information for the user. An empty array will be
+	 * returned if there is no item assigned to the user.
+	 */
+	public function getAssignments($userId)
+	{
+		return isset($this->_assignments[$userId]) ? $this->_assignments[$userId] : array();
+	}
+
+	/**
+	 * Returns the authorization items of the specific type and user.
+	 * @param mixed $userId the user ID. Defaults to null, meaning returning all items even if
+	 * they are not assigned to a user.
+	 * @param integer $type the item type (0: operation, 1: task, 2: role). Defaults to null,
+	 * meaning returning all items regardless of their type.
+	 * @return Item[] the authorization items of the specific type.
+	 */
+	public function getItems($userId = null, $type = null)
+	{
+		if ($userId === null && $type === null) {
+			return $this->_items;
+		}
+		$items = array();
+		if ($userId === null) {
+			foreach ($this->_items as $name => $item) {
+				/** @var $item Item */
+				if ($item->getType() == $type) {
+					$items[$name] = $item;
+				}
+			}
+		} elseif (isset($this->_assignments[$userId])) {
+			foreach ($this->_assignments[$userId] as $assignment) {
+				/** @var $assignment Assignment */
+				$name = $assignment->getItemName();
+				if (isset($this->_items[$name]) && ($type === null || $this->_items[$name]->getType() == $type)) {
+					$items[$name] = $this->_items[$name];
+				}
+			}
+		}
+		return $items;
+	}
+
+	/**
+	 * Creates an authorization item.
+	 * An authorization item represents an action permission (e.g. creating a post).
+	 * It has three types: operation, task and role.
+	 * Authorization items form a hierarchy. Higher level items inheirt permissions representing
+	 * by lower level items.
+	 * @param string $name the item name. This must be a unique identifier.
+	 * @param integer $type the item type (0: operation, 1: task, 2: role).
+	 * @param string $description description of the item
+	 * @param string $bizRule business rule associated with the item. This is a piece of
+	 * PHP code that will be executed when [[checkAccess()]] is called for the item.
+	 * @param mixed $data additional data associated with the item.
+	 * @return Item the authorization item
+	 * @throws Exception if an item with the same name already exists
+	 */
+	public function createItem($name, $type, $description = '', $bizRule = null, $data = null)
+	{
+		if (isset($this->_items[$name])) {
+			throw new Exception('Unable to add an item whose name is the same as an existing item.');
+		}
+		return $this->_items[$name] = new Item($this, $name, $type, $description, $bizRule, $data);
+	}
+
+	/**
+	 * Removes the specified authorization item.
+	 * @param string $name the name of the item to be removed
+	 * @return boolean whether the item exists in the storage and has been removed
+	 */
+	public function removeItem($name)
+	{
+		if (isset($this->_items[$name])) {
+			foreach ($this->_children as &$children) {
+				unset($children[$name]);
+			}
+			foreach ($this->_assignments as &$assignments) {
+				unset($assignments[$name]);
+			}
+			unset($this->_items[$name]);
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Returns the authorization item with the specified name.
+	 * @param string $name the name of the item
+	 * @return Item the authorization item. Null if the item cannot be found.
+	 */
+	public function getItem($name)
+	{
+		return isset($this->_items[$name]) ? $this->_items[$name] : null;
+	}
+
+	/**
+	 * Saves an authorization item to persistent storage.
+	 * @param Item $item the item to be saved.
+	 * @param string $oldName the old item name. If null, it means the item name is not changed.
+	 * @throws InvalidParamException if an item with the same name already taken
+	 */
+	public function saveItem($item, $oldName = null)
+	{
+		if ($oldName !== null && ($newName = $item->getName()) !== $oldName) // name changed
+		{
+			if (isset($this->_items[$newName])) {
+				throw new InvalidParamException("Unable to change the item name. The name '$newName' is already used by another item.");
+			}
+			if (isset($this->_items[$oldName]) && $this->_items[$oldName] === $item) {
+				unset($this->_items[$oldName]);
+				$this->_items[$newName] = $item;
+				if (isset($this->_children[$oldName])) {
+					$this->_children[$newName] = $this->_children[$oldName];
+					unset($this->_children[$oldName]);
+				}
+				foreach ($this->_children as &$children) {
+					if (isset($children[$oldName])) {
+						$children[$newName] = $children[$oldName];
+						unset($children[$oldName]);
+					}
+				}
+				foreach ($this->_assignments as &$assignments) {
+					if (isset($assignments[$oldName])) {
+						$assignments[$newName] = $assignments[$oldName];
+						unset($assignments[$oldName]);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Saves the changes to an authorization assignment.
+	 * @param Assignment $assignment the assignment that has been changed.
+	 */
+	public function saveAssignment($assignment)
+	{
+	}
+
+	/**
+	 * Saves authorization data into persistent storage.
+	 * If any change is made to the authorization data, please make
+	 * sure you call this method to save the changed data into persistent storage.
+	 */
+	public function save()
+	{
+		$items = array();
+		foreach ($this->_items as $name => $item) {
+			/** @var $item Item */
+			$items[$name] = array(
+				'type' => $item->getType(),
+				'description' => $item->getDescription(),
+				'bizRule' => $item->getBizRule(),
+				'data' => $item->getData(),
+			);
+			if (isset($this->_children[$name])) {
+				foreach ($this->_children[$name] as $child) {
+					/** @var $child Item */
+					$items[$name]['children'][] = $child->getName();
+				}
+			}
+		}
+
+		foreach ($this->_assignments as $userId => $assignments) {
+			foreach ($assignments as $name => $assignment) {
+				/** @var $assignment Assignment */
+				if (isset($items[$name])) {
+					$items[$name]['assignments'][$userId] = array(
+						'bizRule' => $assignment->getBizRule(),
+						'data' => $assignment->getData(),
+					);
+				}
+			}
+		}
+
+		$this->saveToFile($items, $this->authFile);
+	}
+
+	/**
+	 * Loads authorization data.
+	 */
+	public function load()
+	{
+		$this->clearAll();
+
+		$items = $this->loadFromFile($this->authFile);
+
+		foreach ($items as $name => $item) {
+			$this->_items[$name] = new Item($this, $name, $item['type'], $item['description'], $item['bizRule'], $item['data']);
+		}
+
+		foreach ($items as $name => $item) {
+			if (isset($item['children'])) {
+				foreach ($item['children'] as $childName) {
+					if (isset($this->_items[$childName])) {
+						$this->_children[$name][$childName] = $this->_items[$childName];
+					}
+				}
+			}
+			if (isset($item['assignments'])) {
+				foreach ($item['assignments'] as $userId => $assignment) {
+					$this->_assignments[$userId][$name] = new Assignment($this, $name, $userId, $assignment['bizRule'], $assignment['data']);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Removes all authorization data.
+	 */
+	public function clearAll()
+	{
+		$this->clearAssignments();
+		$this->_children = array();
+		$this->_items = array();
+	}
+
+	/**
+	 * Removes all authorization assignments.
+	 */
+	public function clearAssignments()
+	{
+		$this->_assignments = array();
+	}
+
+	/**
+	 * Checks whether there is a loop in the authorization item hierarchy.
+	 * @param string $itemName parent item name
+	 * @param string $childName the name of the child item that is to be added to the hierarchy
+	 * @return boolean whether a loop exists
+	 */
+	protected function detectLoop($itemName, $childName)
+	{
+		if ($childName === $itemName) {
+			return true;
+		}
+		if (!isset($this->_children[$childName], $this->_items[$itemName])) {
+			return false;
+		}
+		foreach ($this->_children[$childName] as $child) {
+			/** @var $child Item */
+			if ($this->detectLoop($itemName, $child->getName())) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Loads the authorization data from a PHP script file.
+	 * @param string $file the file path.
+	 * @return array the authorization data
+	 * @see saveToFile
+	 */
+	protected function loadFromFile($file)
+	{
+		if (is_file($file)) {
+			return require($file);
+		} else {
+			return array();
+		}
+	}
+
+	/**
+	 * Saves the authorization data to a PHP script file.
+	 * @param array $data the authorization data
+	 * @param string $file the file path.
+	 * @see loadFromFile
+	 */
+	protected function saveToFile($data, $file)
+	{
+		file_put_contents($file, "<?php\nreturn " . var_export($data, true) . ";\n", LOCK_EX);
+	}
+}

From 810d232ee6717f14f5ecfc4b7b7486ac4d199f26 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 10 May 2013 15:13:23 +0400
Subject: [PATCH 135/152] fixes #209 added setting default timezone to UTC in
 case it's not set via php.ini

---
 apps/bootstrap/index.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/bootstrap/index.php b/apps/bootstrap/index.php
index c046b69..dec6e35 100644
--- a/apps/bootstrap/index.php
+++ b/apps/bootstrap/index.php
@@ -1,4 +1,8 @@
 <?php
+if(!ini_get('date.timezone')) {
+	date_default_timezone_set('UTC');
+}
+
 // comment out the following line to disable debug mode
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 

From 1ccce67f345ca33441fe22602e11cc62a31db371 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 10 May 2013 15:46:59 +0400
Subject: [PATCH 136/152] fixes #209: do not produce error if not timezone set
 in case of running yiic from framework dir

---
 yii/yiic.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/yii/yiic.php b/yii/yiic.php
index 7cd0c40..3be0436 100644
--- a/yii/yiic.php
+++ b/yii/yiic.php
@@ -7,6 +7,10 @@
  * @license http://www.yiiframework.com/license/
  */
 
+if(!ini_get('date.timezone')) {
+	date_default_timezone_set('UTC');
+}
+
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 
 // fcgi doesn't have STDIN defined by default

From b8ad3567e44f818d7b45f20bf1ebdfa274f90dfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20W=C3=B6ster?= <benjamin.woester@gmail.com>
Date: Fri, 10 May 2013 13:49:42 +0200
Subject: [PATCH 137/152] set application timezone early in application
 constructor, set default of UTC if no timezone is configured at all (not in
 app config nor in php.ini)

---
 yii/base/Application.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/yii/base/Application.php b/yii/base/Application.php
index ac7cc6a..2cea627 100644
--- a/yii/base/Application.php
+++ b/yii/base/Application.php
@@ -84,6 +84,10 @@ class Application extends Module
 		} else {
 			throw new InvalidConfigException('The "basePath" configuration is required.');
 		}
+		
+		if (isset($config['timeZone']) || !ini_get('date.timezone')) {
+			$this->setTimeZone( \yii\helpers\ArrayHelper::remove($config,'timeZone','UTC') );
+		}
 
 		$this->registerErrorHandlers();
 		$this->registerCoreComponents();

From 612eb3fdb775fd7c2645c12ac4d18a687db0536f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20W=C3=B6ster?= <benjamin.woester@gmail.com>
Date: Fri, 10 May 2013 13:55:40 +0200
Subject: [PATCH 138/152] undo commit 1ccce67f345ca33441fe22602e11cc62a31db371

---
 yii/yiic.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/yii/yiic.php b/yii/yiic.php
index 3be0436..7cd0c40 100644
--- a/yii/yiic.php
+++ b/yii/yiic.php
@@ -7,10 +7,6 @@
  * @license http://www.yiiframework.com/license/
  */
 
-if(!ini_get('date.timezone')) {
-	date_default_timezone_set('UTC');
-}
-
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 
 // fcgi doesn't have STDIN defined by default

From bea449f8a0487a8b75a9b6d2401f5664d51ced96 Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Fri, 10 May 2013 16:11:04 +0400
Subject: [PATCH 139/152] Unit tests

---
 tests/unit/framework/rbac/ManagerTestBase.php | 248 ++++++++++++++++++++++++++
 tests/unit/framework/rbac/PhpManagerTest.php  |  33 ++++
 2 files changed, 281 insertions(+)
 create mode 100644 tests/unit/framework/rbac/ManagerTestBase.php
 create mode 100644 tests/unit/framework/rbac/PhpManagerTest.php

diff --git a/tests/unit/framework/rbac/ManagerTestBase.php b/tests/unit/framework/rbac/ManagerTestBase.php
new file mode 100644
index 0000000..03d5354
--- /dev/null
+++ b/tests/unit/framework/rbac/ManagerTestBase.php
@@ -0,0 +1,248 @@
+<?php
+
+namespace yiiunit\framework\rbac;
+
+use yii\rbac\Assignment;
+use yii\rbac\Item;
+use yiiunit\TestCase;
+
+abstract class ManagerTestBase extends TestCase
+{
+	/** @var \yii\rbac\PhpManager|\yii\rbac\DbManager */
+	protected $auth;
+
+	public function testCreateItem()
+	{
+		$type = Item::TYPE_TASK;
+		$name = 'editUser';
+		$description = 'edit a user';
+		$bizRule = 'checkUserIdentity()';
+		$data = array(1, 2, 3);
+		$item = $this->auth->createItem($name, $type, $description, $bizRule, $data);
+		$this->assertTrue($item instanceof Item);
+		$this->assertEquals($item->type, $type);
+		$this->assertEquals($item->name, $name);
+		$this->assertEquals($item->description, $description);
+		$this->assertEquals($item->bizRule, $bizRule);
+		$this->assertEquals($item->data, $data);
+
+		// test shortcut
+		$name2 = 'createUser';
+		$item2 = $this->auth->createRole($name2, $description, $bizRule, $data);
+		$this->assertEquals($item2->type, Item::TYPE_ROLE);
+
+		// test adding an item with the same name
+		$this->setExpectedException('Exception');
+		$this->auth->createItem($name, $type, $description, $bizRule, $data);
+	}
+
+	public function testGetItem()
+	{
+		$this->assertTrue($this->auth->getItem('readPost') instanceof Item);
+		$this->assertTrue($this->auth->getItem('reader') instanceof Item);
+		$this->assertNull($this->auth->getItem('unknown'));
+	}
+
+	public function testRemoveAuthItem()
+	{
+		$this->assertTrue($this->auth->getItem('updatePost') instanceof Item);
+		$this->assertTrue($this->auth->removeItem('updatePost'));
+		$this->assertNull($this->auth->getItem('updatePost'));
+		$this->assertFalse($this->auth->removeItem('updatePost'));
+	}
+
+	public function testChangeItemName()
+	{
+		$item = $this->auth->getItem('readPost');
+		$this->assertTrue($item instanceof Item);
+		$this->assertTrue($this->auth->hasItemChild('reader', 'readPost'));
+		$item->name = 'readPost2';
+		$this->assertNull($this->auth->getItem('readPost'));
+		$this->assertEquals($this->auth->getItem('readPost2'), $item);
+		$this->assertFalse($this->auth->hasItemChild('reader', 'readPost'));
+		$this->assertTrue($this->auth->hasItemChild('reader', 'readPost2'));
+	}
+
+	public function testAddItemChild()
+	{
+		$this->auth->addItemChild('createPost', 'updatePost');
+
+		// test adding upper level item to lower one
+		$this->setExpectedException('Exception');
+		$this->auth->addItemChild('readPost', 'reader');
+	}
+
+	public function testAddItemChild2()
+	{
+		// test adding inexistent items
+		$this->setExpectedException('Exception');
+		$this->assertFalse($this->auth->addItemChild('createPost2', 'updatePost'));
+	}
+
+	public function testRemoveItemChild()
+	{
+		$this->assertTrue($this->auth->hasItemChild('reader', 'readPost'));
+		$this->assertTrue($this->auth->removeItemChild('reader', 'readPost'));
+		$this->assertFalse($this->auth->hasItemChild('reader', 'readPost'));
+		$this->assertFalse($this->auth->removeItemChild('reader', 'readPost'));
+	}
+
+	public function testGetItemChildren()
+	{
+		$this->assertEquals(array(), $this->auth->getItemChildren('readPost'));
+		$children = $this->auth->getItemChildren('author');
+		$this->assertEquals(3, count($children));
+		$this->assertTrue(reset($children) instanceof Item);
+	}
+
+	public function testAssign()
+	{
+		$auth = $this->auth->assign('new user', 'createPost', 'rule', 'data');
+		$this->assertTrue($auth instanceof Assignment);
+		$this->assertEquals($auth->userId, 'new user');
+		$this->assertEquals($auth->itemName, 'createPost');
+		$this->assertEquals($auth->bizRule, 'rule');
+		$this->assertEquals($auth->data, 'data');
+
+		$this->setExpectedException('Exception');
+		$this->auth->assign('new user', 'createPost2', 'rule', 'data');
+	}
+
+	public function testRevoke()
+	{
+		$this->assertTrue($this->auth->isAssigned('author B', 'author'));
+		$auth = $this->auth->getAssignment('author B', 'author');
+		$this->assertTrue($auth instanceof Assignment);
+		$this->assertTrue($this->auth->revoke('author B', 'author'));
+		$this->assertFalse($this->auth->isAssigned('author B', 'author'));
+		$this->assertFalse($this->auth->revoke('author B', 'author'));
+	}
+
+	public function testGetAssignments()
+	{
+		$this->auth->assign('author B', 'deletePost');
+		$auths = $this->auth->getAssignments('author B');
+		$this->assertEquals(2, count($auths));
+		$this->assertTrue(reset($auths) instanceof Assignment);
+	}
+
+	public function testGetItems()
+	{
+		$this->assertEquals(count($this->auth->getRoles()), 4);
+		$this->assertEquals(count($this->auth->getOperations()), 4);
+		$this->assertEquals(count($this->auth->getTasks()), 1);
+		$this->assertEquals(count($this->auth->getItems()), 9);
+
+		$this->assertEquals(count($this->auth->getItems('author B', null)), 1);
+		$this->assertEquals(count($this->auth->getItems('author C', null)), 0);
+		$this->assertEquals(count($this->auth->getItems('author B', Item::TYPE_ROLE)), 1);
+		$this->assertEquals(count($this->auth->getItems('author B', Item::TYPE_OPERATION)), 0);
+	}
+
+	public function testClearAll()
+	{
+		$this->auth->clearAll();
+		$this->assertEquals(count($this->auth->getRoles()), 0);
+		$this->assertEquals(count($this->auth->getOperations()), 0);
+		$this->assertEquals(count($this->auth->getTasks()), 0);
+		$this->assertEquals(count($this->auth->getItems()), 0);
+		$this->assertEquals(count($this->auth->getAssignments('author B')), 0);
+	}
+
+	public function testClearAssignments()
+	{
+		$this->auth->clearAssignments();
+		$this->assertEquals(count($this->auth->getAssignments('author B')), 0);
+	}
+
+	public function testDetectLoop()
+	{
+		$this->setExpectedException('Exception');
+		$this->auth->addItemChild('readPost', 'readPost');
+	}
+
+	public function testExecuteBizRule()
+	{
+		$this->assertTrue($this->auth->executeBizRule(null, array(), null));
+		$this->assertTrue($this->auth->executeBizRule('return 1==true;', array(), null));
+		$this->assertTrue($this->auth->executeBizRule('return $params[0]==$params[1];', array(1, '1'), null));
+		$this->assertFalse($this->auth->executeBizRule('invalid', array(), null));
+	}
+
+	public function testCheckAccess()
+	{
+		$results = array(
+			'reader A' => array(
+				'createPost' => false,
+				'readPost' => true,
+				'updatePost' => false,
+				'updateOwnPost' => false,
+				'deletePost' => false,
+			),
+			'author B' => array(
+				'createPost' => true,
+				'readPost' => true,
+				'updatePost' => true,
+				'updateOwnPost' => true,
+				'deletePost' => false,
+			),
+			'editor C' => array(
+				'createPost' => false,
+				'readPost' => true,
+				'updatePost' => true,
+				'updateOwnPost' => false,
+				'deletePost' => false,
+			),
+			'admin D' => array(
+				'createPost' => true,
+				'readPost' => true,
+				'updatePost' => true,
+				'updateOwnPost' => false,
+				'deletePost' => true,
+			),
+		);
+
+		$params = array('authorID' => 'author B');
+
+		foreach (array('reader A', 'author B', 'editor C', 'admin D') as $user) {
+			$params['userID'] = $user;
+			foreach (array('createPost', 'readPost', 'updatePost', 'updateOwnPost', 'deletePost') as $operation) {
+				$result = $this->auth->checkAccess($user, $operation, $params);
+				$this->assertEquals($results[$user][$operation], $result);
+			}
+		}
+	}
+
+	protected function prepareData()
+	{
+		$this->auth->createOperation('createPost', 'create a post');
+		$this->auth->createOperation('readPost', 'read a post');
+		$this->auth->createOperation('updatePost', 'update a post');
+		$this->auth->createOperation('deletePost', 'delete a post');
+
+		$task = $this->auth->createTask('updateOwnPost', 'update a post by author himself', 'return $params["authorID"]==$params["userID"];');
+		$task->addChild('updatePost');
+
+		$role = $this->auth->createRole('reader');
+		$role->addChild('readPost');
+
+		$role = $this->auth->createRole('author');
+		$role->addChild('reader');
+		$role->addChild('createPost');
+		$role->addChild('updateOwnPost');
+
+		$role = $this->auth->createRole('editor');
+		$role->addChild('reader');
+		$role->addChild('updatePost');
+
+		$role = $this->auth->createRole('admin');
+		$role->addChild('editor');
+		$role->addChild('author');
+		$role->addChild('deletePost');
+
+		$this->auth->assign('reader A', 'reader');
+		$this->auth->assign('author B', 'author');
+		$this->auth->assign('editor C', 'editor');
+		$this->auth->assign('admin D', 'admin');
+	}
+}
diff --git a/tests/unit/framework/rbac/PhpManagerTest.php b/tests/unit/framework/rbac/PhpManagerTest.php
new file mode 100644
index 0000000..2a9fc3f
--- /dev/null
+++ b/tests/unit/framework/rbac/PhpManagerTest.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace yiiunit\framework\rbac;
+
+use yii\rbac\PhpManager;
+
+require_once(__DIR__ . '/ManagerTestBase.php');
+
+class PhpManagerTest extends ManagerTestBase
+{
+	public function setUp()
+	{
+		$authFile = \Yii::$app->getRuntimePath() . '/rbac.php';
+		@unlink($authFile);
+		$this->auth = new PhpManager;
+		$this->auth->authFile = $authFile;
+		$this->auth->init();
+		$this->prepareData();
+	}
+
+	public function tearDown()
+	{
+		@unlink($this->auth->authFile);
+	}
+
+	public function testSaveLoad()
+	{
+		$this->auth->save();
+		$this->auth->clearAll();
+		$this->auth->load();
+		$this->testCheckAccess();
+	}
+}

From 4b8bcd43e06e66cc1ee805843960bedb8a516460 Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Fri, 10 May 2013 16:18:01 +0400
Subject: [PATCH 140/152] Unit tests fix

---
 tests/unit/framework/rbac/PhpManagerTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/unit/framework/rbac/PhpManagerTest.php b/tests/unit/framework/rbac/PhpManagerTest.php
index 2a9fc3f..69fdd41 100644
--- a/tests/unit/framework/rbac/PhpManagerTest.php
+++ b/tests/unit/framework/rbac/PhpManagerTest.php
@@ -2,6 +2,7 @@
 
 namespace yiiunit\framework\rbac;
 
+use Yii;
 use yii\rbac\PhpManager;
 
 require_once(__DIR__ . '/ManagerTestBase.php');
@@ -10,7 +11,7 @@ class PhpManagerTest extends ManagerTestBase
 {
 	public function setUp()
 	{
-		$authFile = \Yii::$app->getRuntimePath() . '/rbac.php';
+		$authFile = Yii::$app->getRuntimePath() . '/rbac.php';
 		@unlink($authFile);
 		$this->auth = new PhpManager;
 		$this->auth->authFile = $authFile;

From b9ea7e6fd8b1f6d88dbb786580e91999f351bc6d Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Fri, 10 May 2013 16:32:28 +0400
Subject: [PATCH 141/152] DbManager code style fix + right Exception type fix

---
 yii/rbac/DbManager.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/yii/rbac/DbManager.php b/yii/rbac/DbManager.php
index ea6e8ac..386ce5a 100644
--- a/yii/rbac/DbManager.php
+++ b/yii/rbac/DbManager.php
@@ -10,9 +10,11 @@ namespace yii\rbac;
 use Yii;
 use yii\db\Connection;
 use yii\db\Query;
+use yii\db\Expression;
 use yii\base\Exception;
 use yii\base\InvalidConfigException;
 use yii\base\InvalidCallException;
+use yii\base\InvalidParamException;
 
 /**
  * DbManager represents an authorization manager that stores authorization information in database.
@@ -222,8 +224,7 @@ class DbManager extends Manager
 				$this->itemTable,
 				$this->itemChildTable
 			))
-			->where(array('parent'=>$names))
-			->andWhere('name=child')
+			->where(array('parent' => $names, 'name' => new Expression('child')))
 			->createCommand($this->db)
 			->queryAll();
 		$children = array();
@@ -244,12 +245,12 @@ class DbManager extends Manager
 	 * for this particular authorization item.
 	 * @param mixed $data additional data associated with this assignment
 	 * @return Assignment the authorization assignment information.
-	 * @throws Exception if the item does not exist or if the item has already been assigned to the user
+	 * @throws InvalidParamException if the item does not exist or if the item has already been assigned to the user
 	 */
 	public function assign($userId, $itemName, $bizRule = null, $data = null)
 	{
 		if ($this->usingSqlite() && $this->getItem($itemName) === null) {
-			throw new Exception("The item '$itemName' does not exist.");
+			throw new InvalidParamException("The item '$itemName' does not exist.");
 		}
 		$this->db->createCommand()
 			->insert($this->assignmentTable, array(
@@ -385,8 +386,7 @@ class DbManager extends Manager
 					$this->itemTable . ' t1',
 					$this->assignmentTable . ' t2'
 				))
-				->where(array('userid' => $userId))
-				->andWhere('name=itemname')
+				->where(array('userid' => $userId, 'name' => new Expression('itemname')))
 				->createCommand($this->db);
 		} else {
 			$command = $query->select('name', 'type', 'description', 't1.bizrule', 't1.data')
@@ -396,9 +396,9 @@ class DbManager extends Manager
 				))
 				->where(array(
 					'userid' => $userId,
-					'type' => $type
+					'type' => $type,
+					'name' => new Expression('itemname'),
 				))
-				->andWhere('name=itemname')
 				->createCommand($this->db);
 		}
 		$items = array();

From 9d3a3b3ebef665a68cd83cf291acf72b270141cd Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Fri, 10 May 2013 17:28:28 +0400
Subject: [PATCH 142/152] DbManager some Db fields renaming

---
 yii/rbac/DbManager.php | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/yii/rbac/DbManager.php b/yii/rbac/DbManager.php
index 386ce5a..f3658b2 100644
--- a/yii/rbac/DbManager.php
+++ b/yii/rbac/DbManager.php
@@ -254,8 +254,8 @@ class DbManager extends Manager
 		}
 		$this->db->createCommand()
 			->insert($this->assignmentTable, array(
-				'userid' => $userId,
-				'itemname' => $itemName,
+				'user_id' => $userId,
+				'item_name' => $itemName,
 				'bizrule' => $bizRule,
 				'data' => serialize($data)
 			));
@@ -272,8 +272,8 @@ class DbManager extends Manager
 	{
 		return $this->db->createCommand()
 			->delete($this->assignmentTable, array(
-				'userid' => $userId,
-				'itemname' => $itemName
+				'user_id' => $userId,
+				'item_name' => $itemName
 			)) > 0;
 	}
 
@@ -286,11 +286,11 @@ class DbManager extends Manager
 	public function isAssigned($itemName, $userId)
 	{
 		$query = new Query;
-		return $query->select(array('itemname'))
+		return $query->select(array('item_name'))
 			->from($this->assignmentTable)
 			->where(array(
-				'userid' => $userId,
-				'itemname' => $itemName
+				'user_id' => $userId,
+				'item_name' => $itemName
 			))
 			->createCommand($this->db)
 			->queryScalar() !== false;
@@ -308,8 +308,8 @@ class DbManager extends Manager
 		$query = new Query;
 		$row = $query->from($this->assignmentTable)
 			->where(array(
-				'userid' => $userId,
-				'itemname' => $itemName
+				'user_id' => $userId,
+				'item_name' => $itemName
 			))
 			->createCommand($this->db)
 			->queryRow();
@@ -317,7 +317,7 @@ class DbManager extends Manager
 			if (($data = @unserialize($row['data'])) === false) {
 				$data = null;
 			}
-			return new Assignment($this, $row['userid'], $row['itemname'], $row['bizrule'], $data);
+			return new Assignment($this, $row['user_id'], $row['item_name'], $row['bizrule'], $data);
 		} else {
 			return null;
 		}
@@ -333,7 +333,7 @@ class DbManager extends Manager
 	{
 		$query = new Query;
 		$rows = $query->from($this->assignmentTable)
-			->where(array('userid' => $userId))
+			->where(array('user_id' => $userId))
 			->createCommand($this->db)
 			->queryAll();
 		$assignments = array();
@@ -341,7 +341,7 @@ class DbManager extends Manager
 			if (($data = @unserialize($row['data'])) === false) {
 				$data = null;
 			}
-			$assignments[$row['itemname']] = new Assignment($this, $row['userid'], $row['itemname'], $row['bizrule'], $data);
+			$assignments[$row['item_name']] = new Assignment($this, $row['user_id'], $row['item_name'], $row['bizrule'], $data);
 		}
 		return $assignments;
 	}
@@ -357,8 +357,8 @@ class DbManager extends Manager
 				'bizrule' => $assignment->getBizRule(),
 				'data' => serialize($assignment->getData()),
 			), array(
-				'userid' => $assignment->getUserId(),
-				'itemname' => $assignment->getItemName()
+				'user_id' => $assignment->getUserId(),
+				'item_name' => $assignment->getItemName()
 			));
 	}
 
@@ -386,7 +386,7 @@ class DbManager extends Manager
 					$this->itemTable . ' t1',
 					$this->assignmentTable . ' t2'
 				))
-				->where(array('userid' => $userId, 'name' => new Expression('itemname')))
+				->where(array('user_id' => $userId, 'name' => new Expression('item_name')))
 				->createCommand($this->db);
 		} else {
 			$command = $query->select('name', 'type', 'description', 't1.bizrule', 't1.data')
@@ -395,9 +395,9 @@ class DbManager extends Manager
 					$this->assignmentTable . ' t2'
 				))
 				->where(array(
-					'userid' => $userId,
+					'user_id' => $userId,
 					'type' => $type,
-					'name' => new Expression('itemname'),
+					'name' => new Expression('item_name'),
 				))
 				->createCommand($this->db);
 		}
@@ -452,7 +452,7 @@ class DbManager extends Manager
 					':name1' => $name,
 					':name2' => $name
 				));
-			$this->db->createCommand()->delete($this->assignmentTable, array('itemname' => $name));
+			$this->db->createCommand()->delete($this->assignmentTable, array('item_name' => $name));
 		}
 		return $this->db->createCommand()->delete($this->itemTable, array('name' => $name)) > 0;
 	}
@@ -501,9 +501,9 @@ class DbManager extends Manager
 				));
 			$this->db->createCommand()
 				->update($this->assignmentTable, array(
-					'itemname' => $item->getName(),
+					'item_name' => $item->getName(),
 				), array(
-					'itemname' => $oldName,
+					'item_name' => $oldName,
 				));
 		}
 

From f554d3ec2ebfa847dc2be5fe59d9116ea44cc9f4 Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Fri, 10 May 2013 21:41:07 +0400
Subject: [PATCH 143/152] RBAC sql files

---
 yii/rbac/schema-mssql.sql  | 43 +++++++++++++++++++++++++++++++++++++++++++
 yii/rbac/schema-mysql.sql  | 43 +++++++++++++++++++++++++++++++++++++++++++
 yii/rbac/schema-oci.sql    | 43 +++++++++++++++++++++++++++++++++++++++++++
 yii/rbac/schema-pgsql.sql  | 43 +++++++++++++++++++++++++++++++++++++++++++
 yii/rbac/schema-sqlite.sql | 43 +++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 215 insertions(+)
 create mode 100644 yii/rbac/schema-mssql.sql
 create mode 100644 yii/rbac/schema-mysql.sql
 create mode 100644 yii/rbac/schema-oci.sql
 create mode 100644 yii/rbac/schema-pgsql.sql
 create mode 100644 yii/rbac/schema-sqlite.sql

diff --git a/yii/rbac/schema-mssql.sql b/yii/rbac/schema-mssql.sql
new file mode 100644
index 0000000..f02b261
--- /dev/null
+++ b/yii/rbac/schema-mssql.sql
@@ -0,0 +1,43 @@
+/**
+ * Database schema required by \yii\rbac\DbManager.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Alexander Kochetov <creocoder@gmail.com>
+ * @link http://www.yiiframework.com/
+ * @copyright 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ * @since 2.0
+ */
+
+drop table if exists [tbl_auth_assignment];
+drop table if exists [tbl_auth_item_child];
+drop table if exists [tbl_auth_item];
+
+create table [tbl_auth_item]
+(
+   [name]                 varchar(64) not null,
+   [type]                 integer not null,
+   [description]          text,
+   [bizrule]              text,
+   [data]                 text,
+   primary key ([name])
+);
+
+create table [tbl_auth_item_child]
+(
+   [parent]               varchar(64) not null,
+   [child]                varchar(64) not null,
+   primary key ([parent],[child]),
+   foreign key ([parent]) references [tbl_auth_item] ([name]) on delete cascade on update cascade,
+   foreign key ([child]) references [tbl_auth_item] ([name]) on delete cascade on update cascade
+);
+
+create table [tbl_auth_assignment]
+(
+   [item_name]             varchar(64) not null,
+   [user_id]               varchar(64) not null,
+   [bizrule]              text,
+   [data]                 text,
+   primary key ([item_name],[user_id]),
+   foreign key ([item_name]) references [tbl_auth_item] ([name]) on delete cascade on update cascade
+);
diff --git a/yii/rbac/schema-mysql.sql b/yii/rbac/schema-mysql.sql
new file mode 100644
index 0000000..687a436
--- /dev/null
+++ b/yii/rbac/schema-mysql.sql
@@ -0,0 +1,43 @@
+/**
+ * Database schema required by \yii\rbac\DbManager.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Alexander Kochetov <creocoder@gmail.com>
+ * @link http://www.yiiframework.com/
+ * @copyright 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ * @since 2.0
+ */
+
+drop table if exists `tbl_auth_assignment`;
+drop table if exists `tbl_auth_item_child`;
+drop table if exists `tbl_auth_item`;
+
+create table `tbl_auth_item`
+(
+   `name`                 varchar(64) not null,
+   `type`                 integer not null,
+   `description`          text,
+   `bizrule`              text,
+   `data`                 text,
+   primary key (`name`)
+) engine InnoDB;
+
+create table `tbl_auth_item_child`
+(
+   `parent`               varchar(64) not null,
+   `child`                varchar(64) not null,
+   primary key (`parent`,`child`),
+   foreign key (`parent`) references `tbl_auth_item` (`name`) on delete cascade on update cascade,
+   foreign key (`child`) references `tbl_auth_item` (`name`) on delete cascade on update cascade
+) engine InnoDB;
+
+create table `tbl_auth_assignment`
+(
+   `item_name`             varchar(64) not null,
+   `user_id`               varchar(64) not null,
+   `bizrule`              text,
+   `data`                 text,
+   primary key (`item_name`,`user_id`),
+   foreign key (`item_name`) references `tbl_auth_item` (`name`) on delete cascade on update cascade
+) engine InnoDB;
diff --git a/yii/rbac/schema-oci.sql b/yii/rbac/schema-oci.sql
new file mode 100644
index 0000000..623fba2
--- /dev/null
+++ b/yii/rbac/schema-oci.sql
@@ -0,0 +1,43 @@
+/**
+ * Database schema required by \yii\rbac\DbManager.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Alexander Kochetov <creocoder@gmail.com>
+ * @link http://www.yiiframework.com/
+ * @copyright 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ * @since 2.0
+ */
+
+drop table if exists "tbl_auth_assignment";
+drop table if exists "tbl_auth_item_child";
+drop table if exists "tbl_auth_item";
+
+create table "tbl_auth_item"
+(
+   "name"                 varchar(64) not null,
+   "type"                 integer not null,
+   "description"          text,
+   "bizrule"              text,
+   "data"                 text,
+   primary key ("name")
+);
+
+create table "tbl_auth_item_child"
+(
+   "parent"               varchar(64) not null,
+   "child"                varchar(64) not null,
+   primary key ("parent","child"),
+   foreign key ("parent") references "tbl_auth_item" ("name") on delete cascade on update cascade,
+   foreign key ("child") references "tbl_auth_item" ("name") on delete cascade on update cascade
+);
+
+create table "tbl_auth_assignment"
+(
+   "item_name"             varchar(64) not null,
+   "user_id"               varchar(64) not null,
+   "bizrule"              text,
+   "data"                 text,
+   primary key ("item_name","user_id"),
+   foreign key ("item_name") references "tbl_auth_item" ("name") on delete cascade on update cascade
+);
diff --git a/yii/rbac/schema-pgsql.sql b/yii/rbac/schema-pgsql.sql
new file mode 100644
index 0000000..623fba2
--- /dev/null
+++ b/yii/rbac/schema-pgsql.sql
@@ -0,0 +1,43 @@
+/**
+ * Database schema required by \yii\rbac\DbManager.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Alexander Kochetov <creocoder@gmail.com>
+ * @link http://www.yiiframework.com/
+ * @copyright 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ * @since 2.0
+ */
+
+drop table if exists "tbl_auth_assignment";
+drop table if exists "tbl_auth_item_child";
+drop table if exists "tbl_auth_item";
+
+create table "tbl_auth_item"
+(
+   "name"                 varchar(64) not null,
+   "type"                 integer not null,
+   "description"          text,
+   "bizrule"              text,
+   "data"                 text,
+   primary key ("name")
+);
+
+create table "tbl_auth_item_child"
+(
+   "parent"               varchar(64) not null,
+   "child"                varchar(64) not null,
+   primary key ("parent","child"),
+   foreign key ("parent") references "tbl_auth_item" ("name") on delete cascade on update cascade,
+   foreign key ("child") references "tbl_auth_item" ("name") on delete cascade on update cascade
+);
+
+create table "tbl_auth_assignment"
+(
+   "item_name"             varchar(64) not null,
+   "user_id"               varchar(64) not null,
+   "bizrule"              text,
+   "data"                 text,
+   primary key ("item_name","user_id"),
+   foreign key ("item_name") references "tbl_auth_item" ("name") on delete cascade on update cascade
+);
diff --git a/yii/rbac/schema-sqlite.sql b/yii/rbac/schema-sqlite.sql
new file mode 100644
index 0000000..32eb363
--- /dev/null
+++ b/yii/rbac/schema-sqlite.sql
@@ -0,0 +1,43 @@
+/**
+ * Database schema required by \yii\rbac\DbManager.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Alexander Kochetov <creocoder@gmail.com>
+ * @link http://www.yiiframework.com/
+ * @copyright 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ * @since 2.0
+ */
+
+drop table if exists 'tbl_auth_assignment';
+drop table if exists 'tbl_auth_item_child';
+drop table if exists 'tbl_auth_item';
+
+create table 'tbl_auth_item'
+(
+   "name"                 varchar(64) not null,
+   "type"                 integer not null,
+   "description"          text,
+   "bizrule"              text,
+   "data"                 text,
+   primary key ("name")
+);
+
+create table 'tbl_auth_item_child'
+(
+   "parent"               varchar(64) not null,
+   "child"                varchar(64) not null,
+   primary key ("parent","child"),
+   foreign key ("parent") references 'tbl_auth_item' ("name") on delete cascade on update cascade,
+   foreign key ("child") references 'tbl_auth_item' ("name") on delete cascade on update cascade
+);
+
+create table 'tbl_auth_assignment'
+(
+   "item_name"             varchar(64) not null,
+   "user_id"               varchar(64) not null,
+   "bizrule"              text,
+   "data"                 text,
+   primary key ("item_name","user_id"),
+   foreign key ("item_name") references 'tbl_auth_item' ("name") on delete cascade on update cascade
+);

From 176366a24d81245ce4ba9e255bc62646ef4248c7 Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Fri, 10 May 2013 21:49:54 +0400
Subject: [PATCH 144/152] RBAC sql files identation fix

---
 yii/rbac/schema-mssql.sql  | 4 ++--
 yii/rbac/schema-mysql.sql  | 4 ++--
 yii/rbac/schema-oci.sql    | 4 ++--
 yii/rbac/schema-pgsql.sql  | 4 ++--
 yii/rbac/schema-sqlite.sql | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/yii/rbac/schema-mssql.sql b/yii/rbac/schema-mssql.sql
index f02b261..a1170b1 100644
--- a/yii/rbac/schema-mssql.sql
+++ b/yii/rbac/schema-mssql.sql
@@ -34,8 +34,8 @@ create table [tbl_auth_item_child]
 
 create table [tbl_auth_assignment]
 (
-   [item_name]             varchar(64) not null,
-   [user_id]               varchar(64) not null,
+   [item_name]            varchar(64) not null,
+   [user_id]              varchar(64) not null,
    [bizrule]              text,
    [data]                 text,
    primary key ([item_name],[user_id]),
diff --git a/yii/rbac/schema-mysql.sql b/yii/rbac/schema-mysql.sql
index 687a436..aa8015b 100644
--- a/yii/rbac/schema-mysql.sql
+++ b/yii/rbac/schema-mysql.sql
@@ -34,8 +34,8 @@ create table `tbl_auth_item_child`
 
 create table `tbl_auth_assignment`
 (
-   `item_name`             varchar(64) not null,
-   `user_id`               varchar(64) not null,
+   `item_name`            varchar(64) not null,
+   `user_id`              varchar(64) not null,
    `bizrule`              text,
    `data`                 text,
    primary key (`item_name`,`user_id`),
diff --git a/yii/rbac/schema-oci.sql b/yii/rbac/schema-oci.sql
index 623fba2..16b7964 100644
--- a/yii/rbac/schema-oci.sql
+++ b/yii/rbac/schema-oci.sql
@@ -34,8 +34,8 @@ create table "tbl_auth_item_child"
 
 create table "tbl_auth_assignment"
 (
-   "item_name"             varchar(64) not null,
-   "user_id"               varchar(64) not null,
+   "item_name"            varchar(64) not null,
+   "user_id"              varchar(64) not null,
    "bizrule"              text,
    "data"                 text,
    primary key ("item_name","user_id"),
diff --git a/yii/rbac/schema-pgsql.sql b/yii/rbac/schema-pgsql.sql
index 623fba2..16b7964 100644
--- a/yii/rbac/schema-pgsql.sql
+++ b/yii/rbac/schema-pgsql.sql
@@ -34,8 +34,8 @@ create table "tbl_auth_item_child"
 
 create table "tbl_auth_assignment"
 (
-   "item_name"             varchar(64) not null,
-   "user_id"               varchar(64) not null,
+   "item_name"            varchar(64) not null,
+   "user_id"              varchar(64) not null,
    "bizrule"              text,
    "data"                 text,
    primary key ("item_name","user_id"),
diff --git a/yii/rbac/schema-sqlite.sql b/yii/rbac/schema-sqlite.sql
index 32eb363..668196e 100644
--- a/yii/rbac/schema-sqlite.sql
+++ b/yii/rbac/schema-sqlite.sql
@@ -34,8 +34,8 @@ create table 'tbl_auth_item_child'
 
 create table 'tbl_auth_assignment'
 (
-   "item_name"             varchar(64) not null,
-   "user_id"               varchar(64) not null,
+   "item_name"            varchar(64) not null,
+   "user_id"              varchar(64) not null,
    "bizrule"              text,
    "data"                 text,
    primary key ("item_name","user_id"),

From 124b153350bcadb0c5287642a38c2566d7632a58 Mon Sep 17 00:00:00 2001
From: resurtm <resurtm@gmail.com>
Date: Fri, 10 May 2013 23:57:24 +0600
Subject: [PATCH 145/152] Initial Gettext support.

---
 tests/unit/data/i18n/test.mo                       | Bin 0 -> 1426 bytes
 tests/unit/data/i18n/test.po                       |  64 +++++
 .../framework/i18n/GettextMessageSourceTest.php    |  14 ++
 tests/unit/framework/i18n/GettextMoFileTest.php    |  95 ++++++++
 tests/unit/framework/i18n/GettextPoFileTest.php    |  95 ++++++++
 yii/i18n/GettextFile.php                           |  37 +++
 yii/i18n/GettextMessageSource.php                  |  59 +++++
 yii/i18n/GettextMoFile.php                         | 267 +++++++++++++++++++++
 yii/i18n/GettextPoFile.php                         |  97 ++++++++
 9 files changed, 728 insertions(+)
 create mode 100644 tests/unit/data/i18n/test.mo
 create mode 100644 tests/unit/data/i18n/test.po
 create mode 100644 tests/unit/framework/i18n/GettextMessageSourceTest.php
 create mode 100644 tests/unit/framework/i18n/GettextMoFileTest.php
 create mode 100644 tests/unit/framework/i18n/GettextPoFileTest.php
 create mode 100644 yii/i18n/GettextFile.php
 create mode 100644 yii/i18n/GettextMessageSource.php
 create mode 100644 yii/i18n/GettextMoFile.php
 create mode 100644 yii/i18n/GettextPoFile.php

diff --git a/tests/unit/data/i18n/test.mo b/tests/unit/data/i18n/test.mo
new file mode 100644
index 0000000000000000000000000000000000000000..d5f94f14a3b52a4ef0b2ddaeeb6bcff474f67594
GIT binary patch
literal 1426
zcma)5!EO{s5FL^wht2_sD?t=@X23>B$b=+_kjTQoDlCWtIkab+bw@KjOHYqUq#SIb
zzySeL6fPVH+{n#YJg^vhIB-Vl`GNdF{vog0Ya0m;j8t1y-PQG8z3%;YZ|6aT?=#pJ
zusPW0uwP;PJ%zo6{SCVdyRj>Z_QCJ|B#QRKADsBF;r~PaBm5iGoc%P42>G7fQFH+Q
z2t4QAiN6kyvZw<?Y51@dc%a4mUs@Qaes)uxQ<=VA$()?ZhgC@`(~cHZM#IV?&5KNx
zPAeK_GF4W(gk}wuMV9GQyQ;4ZIc-wiuZ$CtTd7du)IiytEgD$4sQWUY6gD&ggGGrx
zCCz8j^a0zibb!t!Kr7joi8x=GG^~|!sFfju{18bRTIF<=BhNCKMBCGRT)pV3EK?Am
z1YcT^^V&({Fsz-|<gCWTyiqEnQpch=GHMcRlcQ@gS0%}mTxEwC10$DCmhZ5+h+bv@
zlKDKVaiiGYo9^@$6cuhkSs^Cu6R|bNbO+Sj)KzBaro~mk{%F*-#ZMp<&-UZX%9gq?
zGbFkfdhuziq(d5iE1e2!@egWIbH&!uoGe}3v(l8AbcLNE3yH1E>B~v*%^;ULOVT3$
zO3X<!sN_J!JtcGWJ2!jo%nsyKazvcw=VQ?EmmvW8B^|~K(dGoD3(}U#oxIfhE<V0f
z$H>=|jnA00z^fU|&~d0PuEgI%WV|b;)GZW0gQ?_La!f@2k$>gK?JZxoH~q*r?UJwk
zh9CQyeB)OUHhv9@E7(SykpC-`thUQoS;3K4;lM_F$G@bIthLKHzvi15LG9O3wSn4k
zdmA9j*cfvq7Gc2lFQ~oGeeeqs=zCxI*W9E19pGHC;h&*k93bCqvrc|Qs042Sp=pDJ
z8IOE@h&Up^*XYA&K=SKc-hjy_>&;Pd@bv^~l~It@?Gik;G4LNDza1plJO*_H4tz+R
z$AEglq=CUqY6{|UPoAam&x2e+-w`zX2bEBlCkM6m9`Cc%n{s{(`6TiW!@V^)HxV}s
z03a4-6$MYA>k{HMzY=5#sw@#E82J_K|A}#bgUF44DFk0#xUm{Hk6Xq+2Ay$r?M?hy
NwnF~HY{f^T{{g1ziG%<E

literal 0
HcmV?d00001

diff --git a/tests/unit/data/i18n/test.po b/tests/unit/data/i18n/test.po
new file mode 100644
index 0000000..fed95c9
--- /dev/null
+++ b/tests/unit/data/i18n/test.po
@@ -0,0 +1,64 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: resurtm <resurtm@gmail.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.5\n"
+
+msgctxt "context1"
+msgid ""
+"Aliquam tempus elit vel purus molestie placerat. In sollicitudin tincidunt\n"
+"aliquet. Integer tincidunt gravida tempor. In convallis blandit dui vel "
+"malesuada.\n"
+"Nunc vel sapien nunc, a pretium nulla."
+msgstr ""
+"Олицетворение однократно. Представленный лексико-семантический анализ "
+"является\n"
+"психолингвистическим в своей основе, но механизм сочленений полидисперсен. "
+"Впечатление\n"
+"однократно. Различное расположение выбирает сюжетный механизм сочленений."
+
+msgctxt "context1"
+msgid "String number two."
+msgstr "Строка номер два."
+
+msgctxt "context2"
+msgid ""
+"The other\n"
+"\n"
+"context.\n"
+msgstr ""
+"Другой\n"
+"\n"
+"контекст.\n"
+
+msgctxt "context1"
+msgid ""
+"Missing\n"
+"\r\t\"translation."
+msgstr ""
+
+msgctxt "context1"
+msgid ""
+"Nunc vel sapien nunc, a pretium nulla.\n"
+"Pellentesque habitant morbi tristique senectus et netus et malesuada fames "
+"ac turpis egestas."
+msgstr "Короткий перевод."
+
+msgid "contextless"
+msgstr ""
+
+msgctxt "context2"
+msgid ""
+"test1\\ntest2\n"
+"\\\n"
+"test3"
+msgstr ""
+"тест1\\nтест2\n"
+"\\\n"
+"тест3"
diff --git a/tests/unit/framework/i18n/GettextMessageSourceTest.php b/tests/unit/framework/i18n/GettextMessageSourceTest.php
new file mode 100644
index 0000000..7b499f4
--- /dev/null
+++ b/tests/unit/framework/i18n/GettextMessageSourceTest.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace yiiunit\framework\i18n;
+
+use yii\i18n\GettextMessageSource;
+use yiiunit\TestCase;
+
+class GettextMessageSourceTest extends TestCase
+{
+	public function testLoadMessages()
+	{
+		$this->markTestSkipped();
+	}
+}
diff --git a/tests/unit/framework/i18n/GettextMoFileTest.php b/tests/unit/framework/i18n/GettextMoFileTest.php
new file mode 100644
index 0000000..0aa22da
--- /dev/null
+++ b/tests/unit/framework/i18n/GettextMoFileTest.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace yiiunit\framework\i18n;
+
+use yii\i18n\GettextMoFile;
+use yiiunit\TestCase;
+
+class GettextMoFileTest extends TestCase
+{
+	public function testLoad()
+	{
+		$moFile = new GettextMoFile();
+		$moFilePath = __DIR__ . '/../../data/i18n/test.mo';
+		$context1 = $moFile->load($moFilePath, 'context1');
+		$context2 = $moFile->load($moFilePath, 'context2');
+
+		// item count
+		$this->assertCount(3, $context1);
+		$this->assertCount(2, $context2);
+
+		// original messages
+		$this->assertArrayNotHasKey("Missing\n\r\t\"translation.", $context1);
+		$this->assertArrayHasKey("Aliquam tempus elit vel purus molestie placerat. In sollicitudin tincidunt\naliquet. Integer tincidunt gravida tempor. In convallis blandit dui vel malesuada.\nNunc vel sapien nunc, a pretium nulla.", $context1);
+		$this->assertArrayHasKey("String number two.", $context1);
+		$this->assertArrayHasKey("Nunc vel sapien nunc, a pretium nulla.\nPellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.", $context1);
+
+		$this->assertArrayHasKey("The other\n\ncontext.\n", $context2);
+		$this->assertArrayHasKey("test1\\ntest2\n\\\ntest3", $context2);
+
+		// translated messages
+		$this->assertFalse(in_array("", $context1));
+		$this->assertTrue(in_array("Олицетворение однократно. Представленный лексико-семантический анализ является\nпсихолингвистическим в своей основе, но механизм сочленений полидисперсен. Впечатление\nоднократно. Различное расположение выбирает сюжетный механизм сочленений.", $context1));
+		$this->assertTrue(in_array('Строка номер два.', $context1));
+		$this->assertTrue(in_array('Короткий перевод.', $context1));
+
+		$this->assertTrue(in_array("Другой\n\nконтекст.\n", $context2));
+		$this->assertTrue(in_array("тест1\\nтест2\n\\\nтест3", $context2));
+	}
+
+	public function testSave()
+	{
+		// initial data
+		$s = chr(4);
+		$messages = array(
+			'Hello!' => 'Привет!',
+			"context1{$s}Hello?" => 'Привет?',
+			'Hello!?' => '',
+			"context1{$s}Hello!?!" => '',
+			"context2{$s}\"Quotes\"" => '"Кавычки"',
+			"context2{$s}\nNew lines\n" => "\nПереносы строк\n",
+			"context2{$s}\tTabs\t" => "\tТабы\t",
+			"context2{$s}\rCarriage returns\r" => "\rВозвраты кареток\r",
+		);
+
+		// create temporary directory and dump messages
+		$poFileDirectory = __DIR__ . '/../../runtime/i18n';
+		if (!is_dir($poFileDirectory)) {
+			mkdir($poFileDirectory);
+		}
+		if (is_file($poFileDirectory . '/test.mo')) {
+			unlink($poFileDirectory . '/test.mo');
+		}
+
+		$moFile = new GettextMoFile();
+		$moFile->save($poFileDirectory . '/test.mo', $messages);
+
+		// load messages
+		$context1 = $moFile->load($poFileDirectory . '/test.mo', 'context1');
+		$context2 = $moFile->load($poFileDirectory . '/test.mo', 'context2');
+
+		// context1
+		$this->assertCount(2, $context1);
+
+		$this->assertArrayHasKey('Hello?', $context1);
+		$this->assertTrue(in_array('Привет?', $context1));
+
+		$this->assertArrayHasKey('Hello!?!', $context1);
+		$this->assertTrue(in_array('', $context1));
+
+		// context2
+		$this->assertCount(4, $context2);
+
+		$this->assertArrayHasKey("\"Quotes\"", $context2);
+		$this->assertTrue(in_array('"Кавычки"', $context2));
+
+		$this->assertArrayHasKey("\nNew lines\n", $context2);
+		$this->assertTrue(in_array("\nПереносы строк\n", $context2));
+
+		$this->assertArrayHasKey("\tTabs\t", $context2);
+		$this->assertTrue(in_array("\tТабы\t", $context2));
+
+		$this->assertArrayHasKey("\rCarriage returns\r", $context2);
+		$this->assertTrue(in_array("\rВозвраты кареток\r", $context2));
+	}
+}
diff --git a/tests/unit/framework/i18n/GettextPoFileTest.php b/tests/unit/framework/i18n/GettextPoFileTest.php
new file mode 100644
index 0000000..8dddb40
--- /dev/null
+++ b/tests/unit/framework/i18n/GettextPoFileTest.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace yiiunit\framework\i18n;
+
+use yii\i18n\GettextPoFile;
+use yiiunit\TestCase;
+
+class GettextPoFileTest extends TestCase
+{
+	public function testLoad()
+	{
+		$poFile = new GettextPoFile();
+		$poFilePath = __DIR__ . '/../../data/i18n/test.po';
+		$context1 = $poFile->load($poFilePath, 'context1');
+		$context2 = $poFile->load($poFilePath, 'context2');
+
+		// item count
+		$this->assertCount(4, $context1);
+		$this->assertCount(2, $context2);
+
+		// original messages
+		$this->assertArrayHasKey("Missing\n\r\t\"translation.", $context1);
+		$this->assertArrayHasKey("Aliquam tempus elit vel purus molestie placerat. In sollicitudin tincidunt\naliquet. Integer tincidunt gravida tempor. In convallis blandit dui vel malesuada.\nNunc vel sapien nunc, a pretium nulla.", $context1);
+		$this->assertArrayHasKey("String number two.", $context1);
+		$this->assertArrayHasKey("Nunc vel sapien nunc, a pretium nulla.\nPellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.", $context1);
+
+		$this->assertArrayHasKey("The other\n\ncontext.\n", $context2);
+		$this->assertArrayHasKey("test1\\\ntest2\n\\\\\ntest3", $context2);
+
+		// translated messages
+		$this->assertTrue(in_array("", $context1));
+		$this->assertTrue(in_array("Олицетворение однократно. Представленный лексико-семантический анализ является\nпсихолингвистическим в своей основе, но механизм сочленений полидисперсен. Впечатление\nоднократно. Различное расположение выбирает сюжетный механизм сочленений.", $context1));
+		$this->assertTrue(in_array('Строка номер два.', $context1));
+		$this->assertTrue(in_array('Короткий перевод.', $context1));
+
+		$this->assertTrue(in_array("Другой\n\nконтекст.\n", $context2));
+		$this->assertTrue(in_array("тест1\\\nтест2\n\\\\\nтест3", $context2));
+	}
+
+	public function testSave()
+	{
+		// initial data
+		$s = chr(4);
+		$messages = array(
+			'Hello!' => 'Привет!',
+			"context1{$s}Hello?" => 'Привет?',
+			'Hello!?' => '',
+			"context1{$s}Hello!?!" => '',
+			"context2{$s}\"Quotes\"" => '"Кавычки"',
+			"context2{$s}\nNew lines\n" => "\nПереносы строк\n",
+			"context2{$s}\tTabs\t" => "\tТабы\t",
+			"context2{$s}\rCarriage returns\r" => "\rВозвраты кареток\r",
+		);
+
+		// create temporary directory and dump messages
+		$poFileDirectory = __DIR__ . '/../../runtime/i18n';
+		if (!is_dir($poFileDirectory)) {
+			mkdir($poFileDirectory);
+		}
+		if (is_file($poFileDirectory . '/test.po')) {
+			unlink($poFileDirectory . '/test.po');
+		}
+
+		$poFile = new GettextPoFile();
+		$poFile->save($poFileDirectory . '/test.po', $messages);
+
+		// load messages
+		$context1 = $poFile->load($poFileDirectory . '/test.po', 'context1');
+		$context2 = $poFile->load($poFileDirectory . '/test.po', 'context2');
+
+		// context1
+		$this->assertCount(2, $context1);
+
+		$this->assertArrayHasKey('Hello?', $context1);
+		$this->assertTrue(in_array('Привет?', $context1));
+
+		$this->assertArrayHasKey('Hello!?!', $context1);
+		$this->assertTrue(in_array('', $context1));
+
+		// context2
+		$this->assertCount(4, $context2);
+
+		$this->assertArrayHasKey("\"Quotes\"", $context2);
+		$this->assertTrue(in_array('"Кавычки"', $context2));
+
+		$this->assertArrayHasKey("\nNew lines\n", $context2);
+		$this->assertTrue(in_array("\nПереносы строк\n", $context2));
+
+		$this->assertArrayHasKey("\tTabs\t", $context2);
+		$this->assertTrue(in_array("\tТабы\t", $context2));
+
+		$this->assertArrayHasKey("\rCarriage returns\r", $context2);
+		$this->assertTrue(in_array("\rВозвраты кареток\r", $context2));
+	}
+}
diff --git a/yii/i18n/GettextFile.php b/yii/i18n/GettextFile.php
new file mode 100644
index 0000000..03eecca
--- /dev/null
+++ b/yii/i18n/GettextFile.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\i18n;
+
+use yii\base\Component;
+
+/**
+ * GettextFile is the base class for representing a Gettext message file.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+abstract class GettextFile extends Component
+{
+	/**
+	 * Loads messages from a file.
+	 * @param string $filePath file path
+	 * @param string $context message context
+	 * @return array message translations. Array keys are source messages and array values are translated messages:
+	 * source message => translated message.
+	 */
+	abstract public function load($filePath, $context);
+
+	/**
+	 * Saves messages to a file.
+	 * @param string $filePath file path
+	 * @param array $messages message translations. Array keys are source messages and array values are
+	 * translated messages: source message => translated message. Note if the message has a context,
+	 * the message ID must be prefixed with the context with chr(4) as the separator.
+	 */
+	abstract public function save($filePath, $messages);
+}
diff --git a/yii/i18n/GettextMessageSource.php b/yii/i18n/GettextMessageSource.php
new file mode 100644
index 0000000..0eb7cb3
--- /dev/null
+++ b/yii/i18n/GettextMessageSource.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\i18n;
+
+use Yii;
+
+class GettextMessageSource extends MessageSource
+{
+	const MO_FILE_EXT = '.mo';
+	const PO_FILE_EXT = '.po';
+
+	/**
+	 * @var string
+	 */
+	public $basePath = '@app/messages';
+	/**
+	 * @var string
+	 */
+	public $catalog = 'messages';
+	/**
+	 * @var boolean
+	 */
+	public $useMoFile = true;
+	/**
+	 * @var boolean
+	 */
+	public $useBigEndian = false;
+
+	protected function loadMessages($category, $language)
+	{
+		$messageFile = Yii::getAlias($this->basePath) . '/' . $language . '/' . $this->catalog;
+		if ($this->useMoFile) {
+			$messageFile .= static::MO_FILE_EXT;
+		} else {
+			$messageFile .= static::PO_FILE_EXT;
+		}
+
+		if (is_file($messageFile)) {
+			if ($this->useMoFile) {
+				$gettextFile = new GettextMoFile(array('useBigEndian' => $this->useBigEndian));
+			} else {
+				$gettextFile = new GettextPoFile();
+			}
+			$messages = $gettextFile->load($messageFile, $category);
+			if (!is_array($messages)) {
+				$messages = array();
+			}
+			return $messages;
+		} else {
+			Yii::error("The message file for category '$category' does not exist: $messageFile", __METHOD__);
+			return array();
+		}
+	}
+}
diff --git a/yii/i18n/GettextMoFile.php b/yii/i18n/GettextMoFile.php
new file mode 100644
index 0000000..bacba52
--- /dev/null
+++ b/yii/i18n/GettextMoFile.php
@@ -0,0 +1,267 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\i18n;
+
+use yii\base\Exception;
+
+/**
+ * GettextMoFile represents an MO Gettext message file.
+ *
+ * This class is written by adapting Michael's Gettext_MO class in PEAR.
+ * Please refer to the following license terms.
+ *
+ * Copyright (c) 2004-2005, Michael Wallner <mike@iworks.at>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class GettextMoFile extends GettextFile
+{
+	/**
+	 * @var boolean whether to use big-endian when reading and writing an integer.
+	 */
+	public $useBigEndian = false;
+
+	/**
+	 * Loads messages from an MO file.
+	 * @param string $filePath file path
+	 * @param string $context message context
+	 * @return array message translations. Array keys are source messages and array values are translated messages:
+	 * source message => translated message.
+	 */
+	public function load($filePath, $context)
+	{
+		if (false === ($fileHandle = @fopen($filePath, 'rb'))) {
+			throw new Exception('Unable to read file "' . $filePath . '".');
+		}
+		if (false === @flock($fileHandle, LOCK_SH)) {
+			throw new Exception('Unable to lock file "' . $filePath . '" for reading.');
+		}
+
+		// magic
+		$array = unpack('c', $this->readBytes($fileHandle, 4));
+		$magic = current($array);
+		if ($magic == -34) {
+			$this->useBigEndian = false;
+		} elseif ($magic == -107) {
+			$this->useBigEndian = true;
+		} else {
+			throw new Exception('Invalid MO file: ' . $filePath . ' (magic: ' . $magic . ').');
+		}
+
+		// revision
+		$revision = $this->readInteger($fileHandle);
+		if ($revision != 0) {
+			throw new Exception('Invalid MO file revision: ' . $revision . '.');
+		}
+
+		$count = $this->readInteger($fileHandle);
+		$sourceOffset = $this->readInteger($fileHandle);
+		$targetOffset = $this->readInteger($fileHandle);
+
+		$sourceLengths = array();
+		$sourceOffsets = array();
+		fseek($fileHandle, $sourceOffset);
+		for ($i = 0; $i < $count; ++$i) {
+			$sourceLengths[] = $this->readInteger($fileHandle);
+			$sourceOffsets[] = $this->readInteger($fileHandle);
+		}
+
+		$targetLengths = array();
+		$targetOffsets = array();
+		fseek($fileHandle, $targetOffset);
+		for ($i = 0; $i < $count; ++$i) {
+			$targetLengths[] = $this->readInteger($fileHandle);
+			$targetOffsets[] = $this->readInteger($fileHandle);
+		}
+
+		$messages = array();
+		for ($i = 0; $i < $count; ++$i) {
+			$id = $this->readString($fileHandle, $sourceLengths[$i], $sourceOffsets[$i]);
+			$separatorPosition = strpos($id, chr(4));
+
+			if (($context && $separatorPosition !== false && substr($id, 0, $separatorPosition) === $context) ||
+				(!$context && $separatorPosition === false)) {
+				if ($separatorPosition !== false) {
+					$id = substr($id,$separatorPosition+1);
+				}
+
+				$message = $this->readString($fileHandle, $targetLengths[$i], $targetOffsets[$i]);
+				$messages[$id] = $message;
+			}
+		}
+
+		@flock($fileHandle, LOCK_UN);
+		@fclose($fileHandle);
+		return $messages;
+	}
+
+	/**
+	 * Saves messages to an MO file.
+	 * @param string $filePath file path
+	 * @param array $messages message translations. Array keys are source messages and array values are
+	 * translated messages: source message => translated message. Note if the message has a context,
+	 * the message ID must be prefixed with the context with chr(4) as the separator.
+	 */
+	public function save($filePath, $messages)
+	{
+		if (false === ($fileHandle = @fopen($filePath, 'wb'))) {
+			throw new Exception('Unable to write file "' . $filePath . '".');
+		}
+		if (false === @flock($fileHandle, LOCK_EX)) {
+			throw new Exception('Unable to lock file "' . $filePath . '" for reading.');
+		}
+
+		// magic
+		if ($this->useBigEndian) {
+			$this->writeBytes($fileHandle, pack('c*', 0x95, 0x04, 0x12, 0xde)); // -107
+		} else {
+			$this->writeBytes($fileHandle, pack('c*', 0xde, 0x12, 0x04, 0x95)); // -34
+		}
+
+		// revision
+		$this->writeInteger($fileHandle, 0);
+
+		// message count
+		$messageCount = count($messages);
+		$this->writeInteger($fileHandle, $messageCount);
+
+		// offset of source message table
+		$offset = 28;
+		$this->writeInteger($fileHandle, $offset);
+		$offset += $messageCount * 8;
+		$this->writeInteger($fileHandle, $offset);
+
+		// hashtable size, omitted
+		$this->writeInteger($fileHandle, 0);
+		$offset += $messageCount * 8;
+		$this->writeInteger($fileHandle, $offset);
+
+		// length and offsets for source messages
+		foreach (array_keys($messages) as $id) {
+			$length = strlen($id);
+			$this->writeInteger($fileHandle, $length);
+			$this->writeInteger($fileHandle, $offset);
+			$offset += $length + 1;
+		}
+
+		// length and offsets for target messages
+		foreach ($messages as $message) {
+			$length = strlen($message);
+			$this->writeInteger($fileHandle, $length);
+			$this->writeInteger($fileHandle, $offset);
+			$offset += $length + 1;
+		}
+
+		// source messages
+		foreach (array_keys($messages) as $id) {
+			$this->writeString($fileHandle, $id);
+		}
+
+		// target messages
+		foreach ($messages as $message) {
+			$this->writeString($fileHandle, $message);
+		}
+
+		@flock($fileHandle, LOCK_UN);
+		@fclose($fileHandle);
+	}
+
+	/**
+	 * Reads one or several bytes.
+	 * @param resource $fileHandle to read from
+	 * @param integer $byteCount to be read
+	 * @return string bytes
+	 */
+	protected function readBytes($fileHandle, $byteCount = 1)
+	{
+		if ($byteCount > 0) {
+			return fread($fileHandle, $byteCount);
+		}
+	}
+
+	/**
+	 * Write bytes.
+	 * @param resource $fileHandle to write to
+	 * @param string $bytes to be written
+	 * @return integer how many bytes are written
+	 */
+	protected function writeBytes($fileHandle, $bytes)
+	{
+		return fwrite($fileHandle, $bytes);
+	}
+
+	/**
+	 * Reads a 4-byte integer.
+	 * @param resource $fileHandle to read from
+	 * @return integer the result
+	 */
+	protected function readInteger($fileHandle)
+	{
+		$array = unpack($this->useBigEndian ? 'N' : 'V', $this->readBytes($fileHandle, 4));
+		return current($array);
+	}
+
+	/**
+	 * Writes a 4-byte integer.
+	 * @param resource $fileHandle to write to
+	 * @param integer $integer to be written
+	 * @return integer how many bytes are written
+	 */
+	protected function writeInteger($fileHandle, $integer)
+	{
+		return $this->writeBytes($fileHandle, pack($this->useBigEndian ? 'N' : 'V', (int)$integer));
+	}
+
+	/**
+	 * Reads a string.
+	 * @param resource $fileHandle file handle
+	 * @param integer $length of the string
+	 * @param integer $offset of the string in the file. If null, it reads from the current position.
+	 * @return string the result
+	 */
+	protected function readString($fileHandle, $length, $offset = null)
+	{
+		if ($offset !== null) {
+			fseek($fileHandle, $offset);
+		}
+		return $this->readBytes($fileHandle, $length);
+	}
+
+	/**
+	 * Writes a string.
+	 * @param resource $fileHandle to write to
+	 * @param string $string to be written
+	 * @return integer how many bytes are written
+	 */
+	protected function writeString($fileHandle, $string)
+	{
+		return $this->writeBytes($fileHandle, $string. "\0");
+	}
+}
diff --git a/yii/i18n/GettextPoFile.php b/yii/i18n/GettextPoFile.php
new file mode 100644
index 0000000..cac075b
--- /dev/null
+++ b/yii/i18n/GettextPoFile.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\i18n;
+
+use Yii;
+
+/**
+ * GettextPoFile represents a PO Gettext message file.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class GettextPoFile extends GettextFile
+{
+	/**
+	 * Loads messages from a PO file.
+	 * @param string $filePath file path
+	 * @param string $context message context
+	 * @return array message translations. Array keys are source messages and array values are translated messages:
+	 * source message => translated message.
+	 */
+	public function load($filePath, $context)
+	{
+		$pattern = '/(msgctxt\s+"(.*?(?<!\\\\))")?\s+' // context
+			. 'msgid\s+((?:".*(?<!\\\\)"\s*)+)\s+' // message ID, i.e. original string
+			. 'msgstr\s+((?:".*(?<!\\\\)"\s*)+)/'; // translated string
+		$content = file_get_contents($filePath);
+		$matches = array();
+		$matchCount = preg_match_all($pattern, $content, $matches);
+
+		$messages = array();
+		for ($i = 0; $i < $matchCount; ++$i) {
+			if ($matches[2][$i] == $context) {
+				$id = $this->decode($matches[3][$i]);
+				$message = $this->decode($matches[4][$i]);
+				$messages[$id] = $message;
+			}
+		}
+		return $messages;
+	}
+
+	/**
+	 * Saves messages to a PO file.
+	 * @param string $filePath file path
+	 * @param array $messages message translations. Array keys are source messages and array values are
+	 * translated messages: source message => translated message. Note if the message has a context,
+	 * the message ID must be prefixed with the context with chr(4) as the separator.
+	 */
+	public function save($filePath, $messages)
+	{
+		$content = '';
+		foreach ($messages as $id => $message) {
+			$separatorPosition = strpos($id, chr(4));
+			if ($separatorPosition !== false) {
+				$content .= 'msgctxt "' . substr($id, 0, $separatorPosition) . "\"\n";
+				$id = substr($id, $separatorPosition + 1);
+			}
+			$content .= 'msgid "' . $this->encode($id) . "\"\n";
+			$content .= 'msgstr "' . $this->encode($message) . "\"\n\n";
+		}
+		file_put_contents($filePath, $content);
+	}
+
+	/**
+	 * Encodes special characters in a message.
+	 * @param string $string message to be encoded
+	 * @return string the encoded message
+	 */
+	protected function encode($string)
+	{
+		return str_replace(
+			array('"', "\n", "\t", "\r"),
+			array('\\"', '\\n', '\\t', '\\r'),
+			$string
+		);
+	}
+
+	/**
+	 * Decodes special characters in a message.
+	 * @param string $string message to be decoded
+	 * @return string the decoded message
+	 */
+	protected function decode($string)
+	{
+		$string = preg_replace(
+			array('/"\s+"/', '/\\\\n/', '/\\\\r/', '/\\\\t/', '/\\\\"/'),
+			array('', "\n", "\r", "\t", '"'),
+			$string
+		);
+		return substr(rtrim($string), 1, -1);
+	}
+}

From 1c1b2da5b1ff08a59cc30cd6465252d3d7c72f88 Mon Sep 17 00:00:00 2001
From: resurtm <resurtm@gmail.com>
Date: Sat, 11 May 2013 00:17:50 +0600
Subject: [PATCH 146/152] Add exception classes hierarchy UML diagram.

---
 docs/internals/exception_hierarchy.png | Bin 0 -> 64306 bytes
 docs/internals/exception_hierarchy.vsd | Bin 0 -> 151040 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 docs/internals/exception_hierarchy.png
 create mode 100644 docs/internals/exception_hierarchy.vsd

diff --git a/docs/internals/exception_hierarchy.png b/docs/internals/exception_hierarchy.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c43e03793b16102385a46f1d00d84ab67da9f2a
GIT binary patch
literal 64306
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

literal 0
HcmV?d00001

diff --git a/docs/internals/exception_hierarchy.vsd b/docs/internals/exception_hierarchy.vsd
new file mode 100644
index 0000000000000000000000000000000000000000..d044ea931510cc2c9749abefe7ef74f56e449d27
GIT binary patch
literal 151040
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
C1i6*~

literal 0
HcmV?d00001


From b005b087b4d64b116ea4ac675864f609ca406bd2 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Sat, 11 May 2013 01:17:51 +0200
Subject: [PATCH 147/152] better have timezone fix in application

app is resposible for setting time zone, so it should also do the
fixing.
+ documentation about the behavior.
issue #210 and #209
---
 apps/bootstrap/index.php | 3 ---
 yii/base/Application.php | 6 ++++++
 yii/yiic.php             | 4 ----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/apps/bootstrap/index.php b/apps/bootstrap/index.php
index dec6e35..a0488ca 100644
--- a/apps/bootstrap/index.php
+++ b/apps/bootstrap/index.php
@@ -1,7 +1,4 @@
 <?php
-if(!ini_get('date.timezone')) {
-	date_default_timezone_set('UTC');
-}
 
 // comment out the following line to disable debug mode
 defined('YII_DEBUG') or define('YII_DEBUG', true);
diff --git a/yii/base/Application.php b/yii/base/Application.php
index 2e068ef..d6096ad 100644
--- a/yii/base/Application.php
+++ b/yii/base/Application.php
@@ -85,6 +85,10 @@ class Application extends Module
 			throw new InvalidConfigException('The "basePath" configuration is required.');
 		}
 
+		if (!ini_get('date.timezone')) {
+			$this->setTimeZone('UTC');
+		}
+
 		$this->registerErrorHandlers();
 		$this->registerCoreComponents();
 
@@ -222,6 +226,8 @@ class Application extends Module
 	/**
 	 * Returns the time zone used by this application.
 	 * This is a simple wrapper of PHP function date_default_timezone_get().
+	 * If time zone is not configured in php.ini or application config,
+	 * it will be set to UTC by default.
 	 * @return string the time zone used by this application.
 	 * @see http://php.net/manual/en/function.date-default-timezone-get.php
 	 */
diff --git a/yii/yiic.php b/yii/yiic.php
index 3be0436..7cd0c40 100644
--- a/yii/yiic.php
+++ b/yii/yiic.php
@@ -7,10 +7,6 @@
  * @license http://www.yiiframework.com/license/
  */
 
-if(!ini_get('date.timezone')) {
-	date_default_timezone_set('UTC');
-}
-
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 
 // fcgi doesn't have STDIN defined by default

From 8c6cf6158932160f668deace507715311e64bf13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20W=C3=B6ster?= <benjamin.woester@gmail.com>
Date: Sat, 11 May 2013 03:28:05 +0200
Subject: [PATCH 148/152] mod: don't use ArrayHelper to avoid loading another
 class during every request

---
 yii/base/Application.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/yii/base/Application.php b/yii/base/Application.php
index 2cea627..0eed31b 100644
--- a/yii/base/Application.php
+++ b/yii/base/Application.php
@@ -85,9 +85,13 @@ class Application extends Module
 			throw new InvalidConfigException('The "basePath" configuration is required.');
 		}
 		
-		if (isset($config['timeZone']) || !ini_get('date.timezone')) {
-			$this->setTimeZone( \yii\helpers\ArrayHelper::remove($config,'timeZone','UTC') );
-		}
+		if (isset($config['timeZone'])) {
+			$this->setTimeZone($config['timeZone']);
+			unset($config['timeZone']);
+		} elseif (!ini_get('date.timezone')) {
+			$this->setTimeZone('UTC');
+			unset($config['timeZone']);
+		} 
 
 		$this->registerErrorHandlers();
 		$this->registerCoreComponents();

From 6d46abcd88fd2a20da8546138efb29cb0e0fbb1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20W=C3=B6ster?= <benjamin.woester@gmail.com>
Date: Sat, 11 May 2013 03:36:58 +0200
Subject: [PATCH 149/152] remove fix for unset timezone from bootstrap app

---
 apps/bootstrap/index.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/apps/bootstrap/index.php b/apps/bootstrap/index.php
index dec6e35..a0488ca 100644
--- a/apps/bootstrap/index.php
+++ b/apps/bootstrap/index.php
@@ -1,7 +1,4 @@
 <?php
-if(!ini_get('date.timezone')) {
-	date_default_timezone_set('UTC');
-}
 
 // comment out the following line to disable debug mode
 defined('YII_DEBUG') or define('YII_DEBUG', true);

From 49a4314a41ccb1c206ce6df656fda0a18573af4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20W=C3=B6ster?= <benjamin.woester@gmail.com>
Date: Sat, 11 May 2013 03:39:19 +0200
Subject: [PATCH 150/152] fix: remove pointless unset

---
 yii/base/Application.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/yii/base/Application.php b/yii/base/Application.php
index 0eed31b..80ecefb 100644
--- a/yii/base/Application.php
+++ b/yii/base/Application.php
@@ -90,7 +90,6 @@ class Application extends Module
 			unset($config['timeZone']);
 		} elseif (!ini_get('date.timezone')) {
 			$this->setTimeZone('UTC');
-			unset($config['timeZone']);
 		} 
 
 		$this->registerErrorHandlers();

From 22ca2922d2cd63730a69ed5f816c51f23fcdcc6a Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Fri, 10 May 2013 22:33:24 -0400
Subject: [PATCH 151/152] Fixes issue #50: implemented pager widgets.

---
 yii/web/Pagination.php    |   2 +-
 yii/widgets/LinkPager.php | 201 ++++++++++++++++++++++++++++++++++++++++++++++
 yii/widgets/ListPager.php |  95 ++++++++++++++++++++++
 3 files changed, 297 insertions(+), 1 deletion(-)
 create mode 100644 yii/widgets/LinkPager.php
 create mode 100644 yii/widgets/ListPager.php

diff --git a/yii/web/Pagination.php b/yii/web/Pagination.php
index 764dbb4..3d4e242 100644
--- a/yii/web/Pagination.php
+++ b/yii/web/Pagination.php
@@ -73,7 +73,7 @@ class Pagination extends \yii\base\Object
 	 * @var boolean whether to always have the page parameter in the URL created by [[createUrl()]].
 	 * If false and [[page]] is 0, the page parameter will not be put in the URL.
 	 */
-	public $forcePageVar = false;
+	public $forcePageVar = true;
 	/**
 	 * @var string the route of the controller action for displaying the paged contents.
 	 * If not set, it means using the currently requested route.
diff --git a/yii/widgets/LinkPager.php b/yii/widgets/LinkPager.php
new file mode 100644
index 0000000..1651246
--- /dev/null
+++ b/yii/widgets/LinkPager.php
@@ -0,0 +1,201 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\widgets;
+
+use Yii;
+use yii\base\InvalidConfigException;
+use yii\helpers\Html;
+use yii\base\Widget;
+use yii\web\Pagination;
+
+/**
+ * LinkPager displays a list of hyperlinks that lead to different pages of target.
+ *
+ * LinkPager works with a [[Pagination]] object which specifies the totally number
+ * of pages and the current page number.
+ *
+ * Note that LinkPager only generates the necessary HTML markups. In order for it
+ * to look like a real pager, you should provide some CSS styles for it.
+ * With the default configuration, LinkPager should look good using Twitter Bootstrap CSS framework.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class LinkPager extends Widget
+{
+	/**
+	 * @var Pagination the pagination object that this pager is associated with.
+	 * You must set this property in order to make LinkPager work.
+	 */
+	public $pagination;
+	/**
+	 * @var array HTML attributes for the pager container tag.
+	 */
+	public $options = array('class' => 'pagination');
+	/**
+	 * @var string the CSS class for the "first" page button.
+	 */
+	public $firstPageCssClass = 'first';
+	/**
+	 * @var string the CSS class for the "last" page button.
+	 */
+	public $lastPageCssClass = 'last';
+	/**
+	 * @var string the CSS class for the "previous" page button.
+	 */
+	public $prevPageCssClass = 'prev';
+	/**
+	 * @var string the CSS class for the "next" page button.
+	 */
+	public $nextPageCssClass = 'next';
+	/**
+	 * @var string the CSS class for the active (currently selected) page button.
+	 */
+	public $activePageCssClass = 'active';
+	/**
+	 * @var string the CSS class for the disabled page buttons.
+	 */
+	public $disabledPageCssClass = 'disabled';
+	/**
+	 * @var integer maximum number of page buttons that can be displayed. Defaults to 10.
+	 */
+	public $maxButtonCount = 10;
+	/**
+	 * @var string the label for the "next" page button. Note that this will NOT be HTML-encoded.
+	 * If this property is null, the "next" page button will not be displayed.
+	 */
+	public $nextPageLabel = '&raquo;';
+	/**
+	 * @var string the text label for the previous page button. Note that this will NOT be HTML-encoded.
+	 * If this property is null, the "previous" page button will not be displayed.
+	 */
+	public $prevPageLabel = '&laquo;';
+	/**
+	 * @var string the text label for the "first" page button. Note that this will NOT be HTML-encoded.
+	 * If this property is null, the "first" page button will not be displayed.
+	 */
+	public $firstPageLabel;
+	/**
+	 * @var string the text label for the "last" page button. Note that this will NOT be HTML-encoded.
+	 * If this property is null, the "last" page button will not be displayed.
+	 */
+	public $lastPageLabel;
+	/**
+	 * @var string the template used to render the content within the pager container.
+	 * The token "{buttons}" will be replaced with the actual page buttons.
+	 */
+	public $template = '{buttons}';
+
+
+	/**
+	 * Initializes the pager.
+	 */
+	public function init()
+	{
+		if ($this->pagination === null) {
+			throw new InvalidConfigException('The "pagination" property must be set.');
+		}
+	}
+
+	/**
+	 * Executes the widget.
+	 * This overrides the parent implementation by displaying the generated page buttons.
+	 */
+	public function run()
+	{
+		$buttons = strtr($this->template, array(
+			'{buttons}' => Html::tag('ul', implode("\n", $this->createPageButtons())),
+		));
+		echo Html::tag('div', $buttons, $this->options);
+	}
+
+	/**
+	 * Creates the page buttons.
+	 * @return array a list of page buttons (in HTML code).
+	 */
+	protected function createPageButtons()
+	{
+		$buttons = array();
+
+		$pageCount = $this->pagination->pageCount;
+		$currentPage = $this->pagination->getPage();
+
+		// first page
+		if ($this->firstPageLabel !== null) {
+			$buttons[] = $this->createPageButton($this->firstPageLabel, 0, $this->firstPageCssClass, $currentPage <= 0, false);
+		}
+
+		// prev page
+		if ($this->prevPageLabel !== null) {
+			if (($page = $currentPage - 1) < 0) {
+				$page = 0;
+			}
+			$buttons[] = $this->createPageButton($this->prevPageLabel, $page, $this->prevPageCssClass, $currentPage <= 0, false);
+		}
+
+		// internal pages
+		list($beginPage, $endPage) = $this->getPageRange();
+		for ($i = $beginPage; $i <= $endPage; ++$i) {
+			$buttons[] = $this->createPageButton($i + 1, $i, null, false, $i == $currentPage);
+		}
+
+		// next page
+		if ($this->nextPageLabel !== null) {
+			if (($page = $currentPage + 1) >= $pageCount - 1) {
+				$page = $pageCount - 1;
+			}
+			$buttons[] = $this->createPageButton($this->nextPageLabel, $page, $this->nextPageCssClass, $currentPage >= $pageCount - 1, false);
+		}
+
+		// last page
+		if ($this->lastPageLabel !== null) {
+			$buttons[] = $this->createPageButton($this->lastPageLabel, $pageCount - 1, $this->lastPageCssClass, $currentPage >= $pageCount - 1, false);
+		}
+
+		return $buttons;
+	}
+
+	/**
+	 * Creates a page button.
+	 * You may override this method to customize the generation of page buttons.
+	 * @param string $label the text label for the button
+	 * @param integer $page the page number
+	 * @param string $class the CSS class for the page button.
+	 * @param boolean $disabled whether this page button is disabled
+	 * @param boolean $active whether this page button is active
+	 * @return string the generated button
+	 */
+	protected function createPageButton($label, $page, $class, $disabled, $active)
+	{
+		if ($active) {
+			$class .= ' ' . $this->activePageCssClass;
+		}
+		if ($disabled) {
+			$class .= ' ' . $this->disabledPageCssClass;
+		}
+		$class = trim($class);
+		$options = array('class' => $class === '' ? null : $class);
+		return Html::tag('li', Html::a($label, $this->pagination->createUrl($page)), $options);
+	}
+
+	/**
+	 * @return array the begin and end pages that need to be displayed.
+	 */
+	protected function getPageRange()
+	{
+		$currentPage = $this->pagination->getPage();
+		$pageCount = $this->pagination->getPageCount();
+
+		$beginPage = max(0, $currentPage - (int)($this->maxButtonCount / 2));
+		if (($endPage = $beginPage + $this->maxButtonCount - 1) >= $pageCount) {
+			$endPage = $pageCount - 1;
+			$beginPage = max(0, $endPage - $this->maxButtonCount + 1);
+		}
+		return array($beginPage, $endPage);
+	}
+}
\ No newline at end of file
diff --git a/yii/widgets/ListPager.php b/yii/widgets/ListPager.php
new file mode 100644
index 0000000..1bc2b21
--- /dev/null
+++ b/yii/widgets/ListPager.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\widgets;
+
+use yii\base\InvalidConfigException;
+use yii\helpers\Html;
+use yii\base\Widget;
+use yii\web\Pagination;
+
+/**
+ * ListPager displays a drop-down list that contains options leading to different pages.
+ *
+ * ListPager works with a [[Pagination]] object which specifies the totally number
+ * of pages and the current page number.
+ *
+ * Note that ListPager requires JavaScript to work. You should consider using [[LinkPager]]
+ * if you want to make your page work without JavaScript.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class ListPager extends Widget
+{
+	/**
+	 * @var Pagination the pagination object that this pager is associated with.
+	 * You must set this property in order to make ListPager work.
+	 */
+	public $pagination;
+	/**
+	 * @var array HTML attributes for the drop-down list tag. The following options are specially handled:
+	 *
+	 * - prompt: string, a prompt text to be displayed as the first option.
+	 *
+	 * The rest of the options will be rendered as the attributes of the resulting tag. The values will
+	 * be HTML-encoded using [[encode()]]. If a value is null, the corresponding attribute will not be rendered.
+	 */
+	public $options = array();
+	/**
+	 * @var string the template used to render the label for each list option.
+	 * The token "{page}" will be replaced with the actual page number (1-based).
+	 */
+	public $template = '{page}';
+
+
+	/**
+	 * Initializes the pager.
+	 */
+	public function init()
+	{
+		if ($this->pagination === null) {
+			throw new InvalidConfigException('The "pagination" property must be set.');
+		}
+	}
+
+	/**
+	 * Executes the widget.
+	 * This overrides the parent implementation by displaying the generated page buttons.
+	 */
+	public function run()
+	{
+		$pageCount = $this->pagination->pageCount;
+		$currentPage = $this->pagination->getPage();
+
+		$pages = array();
+		for ($i = 0; $i < $pageCount; ++$i) {
+			$pages[$this->pagination->createUrl($i)] = $this->generatePageText($i);
+		}
+		$selection = $this->pagination->createUrl($currentPage);
+
+		if (!isset($this->options['onchange'])) {
+			$this->options['onchange'] = "if(this.value!='') {window.location=this.value;};";
+		}
+
+		echo Html::dropDownList(null, $selection, $pages, $this->options);
+	}
+
+	/**
+	 * Generates the label of the list option for the specified page number.
+	 * You may override this method to customize the option display.
+	 * @param integer $page zero-based page number
+	 * @return string the list option for the page number
+	 */
+	protected function generatePageText($page)
+	{
+		return strtr($this->template, array(
+			'{page}' => $page + 1,
+		));
+	}
+
+}
\ No newline at end of file

From a87e64c6500b16f2e59e1c60845ada880f4d40b5 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Fri, 10 May 2013 22:40:26 -0400
Subject: [PATCH 152/152] Fixed duplicated merge.

---
 yii/base/Application.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/yii/base/Application.php b/yii/base/Application.php
index 6e82e9a..fb9a6c1 100644
--- a/yii/base/Application.php
+++ b/yii/base/Application.php
@@ -92,10 +92,6 @@ class Application extends Module
 			$this->setTimeZone('UTC');
 		} 
 
-		if (!ini_get('date.timezone')) {
-			$this->setTimeZone('UTC');
-		}
-
 		$this->registerErrorHandlers();
 		$this->registerCoreComponents();