3/6(1)
Merge branch 'master' of https://github.com/hyoshida1106/libreplan_jp

Conflicts:
	doc/src/user/ja/01-introducion.rst
	doc/src/user/ja/02-criterios.rst
	doc/src/user/ja/index.rst
	libreplan-webapp/src/main/resources/i18n/ja.po