Redirection fix
Merge branch 'master' of https://github.com/taier/Life-Helper

Conflicts:
	fuel/app/bootstrap.php
	fuel/app/classes/controller/common.php
	fuel/app/classes/controller/users.php
	fuel/app/classes/controller/welcome.php
	fuel/app/classes/model/user.php
	fuel/app/config/auth.php
	fuel/app/config/complexauth.php
	fuel/app/config/config.php
	fuel/app/config/crypt.php
	fuel/app/config/db.php
	fuel/app/config/migrate.php
	fuel/app/config/routes.php
	fuel/app/logs/2011/06/02.php
	fuel/app/migrations/001_create_users.php
	fuel/app/tasks/robots.php
	fuel/app/views/template.php
	fuel/app/views/users/create.php
	fuel/app/views/users/edit.php
	fuel/app/views/users/index.php
	fuel/app/views/users/view.php
	fuel/app/views/users/write_review.php
	fuel/app/views/welcome/404.php
	fuel/app/views/welcome/index.php
	fuel/core/base.php
	fuel/core/bootstrap.php
	fuel/core/bootstrap_phpunit.php
	fuel/core/classes/agent.php
	fuel/core/classes/arr.php
	fuel/core/classes/asset.php
	fuel/core/classes/autoloader.php
	fuel/core/classes/cache.php
	fuel/core/classes/cache/exception.php
	fuel/core/classes/cache/handler/driver.php
	fuel/core/classes/cache/handler/json.php
	fuel/core/classes/cache/handler/serialized.php
	fuel/core/classes/cache/handler/string.php
	fuel/core/classes/cache/storage/driver.php
	fuel/core/classes/cache/storage/file.php
	fuel/core/classes/cache/storage/memcached.php
	fuel/core/classes/cache/storage/redis.php
	fuel/core/classes/cli.php
	fuel/core/classes/config.php
	fuel/core/classes/controller.php
	fuel/core/classes/controller/rest.php
	fuel/core/classes/controller/template.php
	fuel/core/classes/cookie.php
	fuel/core/classes/crypt.php
	fuel/core/classes/database.php
	fuel/core/classes/database/mysql.php
	fuel/core/classes/database/mysqli.php
	fuel/core/classes/database/pdo.php
	fuel/core/classes/database/query.php
	fuel/core/classes/database/query/builder.php
	fuel/core/classes/database/query/builder/delete.php
	fuel/core/classes/database/query/builder/insert.php
	fuel/core/classes/database/query/builder/join.php
	fuel/core/classes/database/query/builder/select.php
	fuel/core/classes/database/query/builder/update.php
	fuel/core/classes/database/query/builder/where.php
	fuel/core/classes/database/transaction.php
	fuel/core/classes/date.php
	fuel/core/classes/db.php
	fuel/core/classes/dbutil.php
	fuel/core/classes/debug.php
	fuel/core/classes/email/driver.php
	fuel/core/classes/email/smtp.php
	fuel/core/classes/error.php
	fuel/core/classes/event.php
	fuel/core/classes/fieldset.php
	fuel/core/classes/fieldset/field.php
	fuel/core/classes/file.php
	fuel/core/classes/file/area.php
	fuel/core/classes/file/driver/directory.php
	fuel/core/classes/file/driver/file.php
	fuel/core/classes/file/exception.php
	fuel/core/classes/form.php
	fuel/core/classes/format.php
	fuel/core/classes/ftp.php
	fuel/core/classes/fuel.php
	fuel/core/classes/fuel/exception.php
	fuel/core/classes/html.php
	fuel/core/classes/image.php
	fuel/core/classes/image/driver.php
	fuel/core/classes/image/gd.php
	fuel/core/classes/image/imagemagick.php
	fuel/core/classes/inflector.php
	fuel/core/classes/input.php
	fuel/core/classes/lang.php
	fuel/core/classes/log.php
	fuel/core/classes/migrate.php
	fuel/core/classes/model.php
	fuel/core/classes/output.php
	fuel/core/classes/pagination.php
	fuel/core/classes/profiler.php
	fuel/core/classes/redis.php
	fuel/core/classes/redis/exception.php
	fuel/core/classes/request.php
	fuel/core/classes/route.php
	fuel/core/classes/router.php
	fuel/core/classes/security.php
	fuel/core/classes/session.php
	fuel/core/classes/session/cookie.php
	fuel/core/classes/session/db.php
	fuel/core/classes/session/driver.php
	fuel/core/classes/session/exception.php
	fuel/core/classes/session/file.php
	fuel/core/classes/session/memcached.php
	fuel/core/classes/session/redis.php
	fuel/core/classes/singleton.php
	fuel/core/classes/str.php
	fuel/core/classes/testcase.php
	fuel/core/classes/unzip.php
	fuel/core/classes/upload.php
	fuel/core/classes/uri.php
	fuel/core/classes/validation.php
	fuel/core/classes/validation/error.php
	fuel/core/classes/view.php
	fuel/core/classes/view/exception.php
	fuel/core/classes/viewmodel.php
	fuel/core/config/agent.php
	fuel/core/config/asset.php
	fuel/core/config/cache.php
	fuel/core/config/date.php
	fuel/core/config/form.php
	fuel/core/config/ftp.php
	fuel/core/config/image.php
	fuel/core/config/package.php
	fuel/core/config/rest.php
	fuel/core/config/session.php
	fuel/core/config/upload.php
	fuel/core/lang/en/date.php
	fuel/core/phpunit.xml
	fuel/core/tasks/install.php
	fuel/core/tasks/migrate.php
	fuel/core/tests/arr.php
	fuel/core/tests/classes/html.php
	fuel/core/tests/date.php
	fuel/core/tests/inflector.php
	fuel/core/tests/str.php
	fuel/core/tests/uri.php
	fuel/core/vendor/htmlawed/htmlawed.php
	fuel/core/vendor/phpquickprofiler/display.php
	fuel/core/vendor/phpquickprofiler/phpquickprofiler.php
	fuel/core/vendor/phpseclib/Crypt/AES.php
	fuel/core/vendor/phpseclib/Crypt/DES.php
	fuel/core/vendor/phpseclib/Crypt/Hash.php
	fuel/core/vendor/phpseclib/Crypt/RC4.php
	fuel/core/vendor/phpseclib/Crypt/RSA.php
	fuel/core/vendor/phpseclib/Crypt/Random.php
	fuel/core/vendor/phpseclib/Crypt/Rijndael.php
	fuel/core/vendor/phpseclib/Crypt/TripleDES.php
	fuel/core/vendor/phpseclib/Math/BigInteger.php
	fuel/core/vendor/phpseclib/Net/SFTP.php
	fuel/core/vendor/phpseclib/Net/SSH1.php
	fuel/core/vendor/phpseclib/Net/SSH2.php
	fuel/core/vendor/spyc/spyc.php
	fuel/core/views/errors/php_error.php
	fuel/core/views/errors/php_fatal_error.php
	fuel/core/views/errors/production.php
	fuel/packages/auth/bootstrap.php
	fuel/packages/auth/classes/auth.php
	fuel/packages/auth/classes/auth/acl/driver.php
	fuel/packages/auth/classes/auth/acl/simpleacl.php
	fuel/packages/auth/classes/auth/driver.php
	fuel/packages/auth/classes/auth/exception.php
	fuel/packages/auth/classes/auth/group/driver.php
	fuel/packages/auth/classes/auth/group/simplegroup.php
	fuel/packages/auth/classes/auth/login/driver.php
	fuel/packages/auth/classes/auth/login/simpleauth.php
	fuel/packages/auth/config/auth.php
	fuel/packages/auth/config/simpleauth.php
	fuel/packages/oil/bootstrap.php
	fuel/packages/oil/classes/cli.php
	fuel/packages/oil/classes/console.php
	fuel/packages/oil/classes/exception.php
	fuel/packages/oil/classes/generate.php
	fuel/packages/oil/classes/generate/migration/actions.php
	fuel/packages/oil/classes/package.php
	fuel/packages/oil/classes/refine.php
	fuel/packages/oil/classes/scaffold.php
	fuel/packages/oil/views/default/scaffold/actions/create.php
	fuel/packages/oil/views/default/scaffold/actions/delete.php
	fuel/packages/oil/views/default/scaffold/actions/edit.php
	fuel/packages/oil/views/default/scaffold/ar_model.php
	fuel/packages/oil/views/default/scaffold/views/create.php
	fuel/packages/oil/views/default/scaffold/views/edit.php
	fuel/packages/oil/views/default/scaffold/views/index.php
	fuel/packages/oil/views/default/scaffold/views/view.php
	fuel/packages/oil/views/default/template.php
	fuel/packages/orm/bootstrap.php
	fuel/packages/orm/classes/belongsto.php
	fuel/packages/orm/classes/exceptions.php
	fuel/packages/orm/classes/hasmany.php
	fuel/packages/orm/classes/hasone.php
	fuel/packages/orm/classes/manymany.php
	fuel/packages/orm/classes/manythrough.php
	fuel/packages/orm/classes/model.php
	fuel/packages/orm/classes/observer.php
	fuel/packages/orm/classes/observer/createdat.php
	fuel/packages/orm/classes/observer/typing.php
	fuel/packages/orm/classes/observer/updatedat.php
	fuel/packages/orm/classes/observer/validation.php
	fuel/packages/orm/classes/query.php
	fuel/packages/orm/classes/relation.php
	oil
	public/index.php