fixed:
更正多语言
fixed:
补充翻译
Merge branch 'master' of github.com:aronezhang/ironmine

Conflicts:
	vendor/plugins/acts_as_multilingual/init.rb