updated locales
Merge branch 'develop'

Conflicts:
	core/config/locales/bg.yml
	core/config/locales/en.yml
	core/config/locales/ja.yml
	core/config/locales/pt-BR.yml
Merge branch 'develop' of https://github.com/absolu7/GAKUEngine into develop

Conflicts:
	admissions/app/views/gaku/admin/admissions/_links.html.slim
Merge remote-tracking branch 'snowsunny/master'
merge fix kalkov/develop