Merge pull request #101 from kenjis/1.5/develop_japanese

Merge branch '1.5/develop' into 1.5/develop_japanese
installation/upgrade.html一部翻訳
Merge pull request #102 from kenjis/patch-4

installation/upgrade.html一部翻訳
general/environments.html一部翻訳
Merge pull request #103 from kenjis/patch-5

general/environments.html一部翻訳
packages/orm/relations/intro.html typoの修正
reorganized the download page, added a link for the future 1.5. related #490
clarified the contribution procedure. related #490
bumped the copyright to 2013
documented $_write_connection
documented master/slave setup for ORM
Merge pull request #104 from kenjis/patch-6

packages/orm/relations/intro.html typoの修正
Merge branch '1.5/develop' into upstream-1.5-merge

Conflicts:
	classes/agent/config.html
	classes/agent/usage.html
	classes/arr.html
	classes/asset/advanced.html
	classes/asset/config.html
	classes/asset/usage.html
	classes/autoloader.html
	classes/cache/advanced.html
	classes/cache/config.html
	classes/cache/usage.html
	classes/cli.html
	classes/config.html
	classes/cookie.html
	classes/crypt.html
	classes/database/db.html
	classes/database/dbutil.html
	classes/database/introduction.html
	classes/database/qb.html
	classes/database/qb_delete.html
	classes/database/qb_insert.html
	classes/database/qb_select.html
	classes/database/qb_update.html
	classes/database/qb_where.html
	classes/database/usage.html
	classes/date.html
	classes/debug.html
	classes/event.html
	classes/fieldset.html
	classes/file/advanced.html
	classes/file/handlers.html
	classes/file/intro.html
	classes/file/usage.html
	classes/finder.html
	classes/form.html
	classes/format.html
	classes/ftp.html
	classes/fuel.html
	classes/html.html
	classes/image.html
	classes/inflector.html
	classes/input.html
	classes/lang.html
	classes/log.html
	classes/markdown.html
	classes/migrate.html
	classes/model_crud/introduction.html
	classes/model_crud/methods.html
	classes/module.html
	classes/mongo/introduction.html
	classes/mongo/methods.html
	classes/num.html
	classes/package.html
	classes/pagination.html
	classes/profiler.html
	classes/redis.html
	classes/request/curl.html
	classes/request/request.html
	classes/request/soap.html
	classes/response.html
	classes/router.html
	classes/security.html
	classes/session/advanced.html
	classes/session/config.html
	classes/session/usage.html
	classes/str.html
	classes/theme/advanced.html
	classes/theme/introduction.html
	classes/theme/methods.html
	classes/upload/config.html
	classes/upload/usage.html
	classes/uri.html
	classes/validation/errors.html
	classes/validation/methods.html
	classes/validation/validation.html
	classes/view.html
	contribute.html
	credits.html
	general/classes.html
	general/coding_standards.html
	general/configuration.html
	general/constants.html
	general/controllers/base.html
	general/controllers/hybrid.html
	general/controllers/rest.html
	general/controllers/template.html
	general/environments.html
	general/error.html
	general/extending_core.html
	general/hmvc.html
	general/migrations.html
	general/models.html
	general/modules.html
	general/mvc.html
	general/packages.html
	general/profiling.html
	general/routing.html
	general/security.html
	general/tasks.html
	general/unit_testing.html
	general/viewmodels.html
	general/views.html
	index.html
	installation/download.html
	installation/instructions.html
	installation/troubleshooting.html
	installation/tutorials.html
	installation/upgrade.html
	license.html
	packages/auth/drivers.html
	packages/auth/intro.html
	packages/auth/simpleauth/acl.html
	packages/auth/simpleauth/groups.html
	packages/auth/simpleauth/intro.html
	packages/auth/simpleauth/login.html
	packages/auth/types/acl.html
	packages/auth/types/group.html
	packages/auth/types/login.html
	packages/auth/usage.html
	packages/email/introduction.html
	packages/email/methods.html
	packages/email/usage.html
	packages/oil/console.html
	packages/oil/generate.html
	packages/oil/intro.html
	packages/oil/package.html
	packages/oil/refine.html
	packages/oil/test.html
	packages/orm/creating_models.html
	packages/orm/crud.html
	packages/orm/eav.html
	packages/orm/intro.html
	packages/orm/model/soft.html
	packages/orm/observers/creating.html
	packages/orm/observers/included.html
	packages/orm/observers/intro.html
	packages/orm/relations/belongs_to.html
	packages/orm/relations/has_many.html
	packages/orm/relations/has_one.html
	packages/orm/relations/intro.html
	packages/orm/relations/many_many.html
	packages/parser/intro.html
	requirements.html
	templates/index.html
	vendor/htmlawed.html
	vendor/intro.html
	vendor/markdown.html
	vendor/phpquickprofiler.html
	vendor/phpseclib.html
	vendor/spyc.html
Introduction の訳を「はじめに」に統一
fixed incorrect syntax on related() with conditions
Documented ORM related() 'join_on' option
Merge pull request #105 from kenjis/upstream-1.5-merge

本家 1.5/develop をマージしました
Merge pull request #106 from kenjis/fix_term

Introduction の訳を「はじめに」に統一
Merge branch '1.5/develop' into upstream-1.5-merge
Merge pull request #107 from kenjis/upstream-1.5-merge

本家 1.5/develop をマージしました