fixed incorrect syntax on related() with conditions
Documented ORM related() 'join_on' option
Merge branch '1.5/develop' into upstream-1.5-merge
Merge pull request #107 from kenjis/upstream-1.5-merge

本家 1.5/develop をマージしました
目次にマージ漏れがあったので追加
Merge pull request #108 from kenjis/fix_js

目次にマージ漏れがあったので追加
installation/download.html翻訳
Some translation

2 sections are translated, 'Using Model_Crud to create models' and 'Using the Orm to create models'.
Merge pull request #109 from kenjis/patch-7

installation/download.html翻訳
Merge pull request #110 from koyhoge/feature/koyhoge-test

Some translation
packages/orm/creating_models.html 翻訳
Merge pull request #111 from orcaaoshi/patch-1

packages/orm/creating_models.html 翻訳
Introduction → はじめに
Merge pull request #112 from kenjis/fix_intro

Introduction → はじめに
<title> の翻訳など
Merge pull request #113 from kenjis/title

<title> の翻訳など
Translation a note of general/modules.html.
Translation for general/controllers/base.html
Merge pull request #114 from koyhoge/feature/koyhoge-general-modules

Translation a note of general/modules.html.
Merge pull request #115 from koyhoge/feature/koyhoge-controllers-base

Translation for general/controllers/base.html