readme.md translate ja
Merge branch 'master' of git://github.com/Shogun147/Katana

Conflicts:
	readme.md
readme merge miss fix
file upload Unhandle error fix
Corresponding to the PostgreSQL
readme translate japanese split
readme_ja.md translate fix
Merge pull request #12 from dai-yamashita/feature

Japanese readme.md and PostgreSQL store