small update
Merge branch 'master' of github.com:zenphoto/zenphoto
Merge branch 'master' of github.com:zenphoto/zenphoto
update japanese
Update Japanese
Merge remote-tracking branch 'origin/master' into 1.4.5

Conflicts:
	zp-core/locale/ja_JP/LC_MESSAGES/zenphoto.mo
	zp-core/locale/ja_JP/LC_MESSAGES/zenphoto.po