Merge remote-tracking branch 'kalkov/develop'

Conflicts:
	admissions/app/views/gaku/admin/admissions/_links.html.slim
Merge remote-tracking branch 'tapalilov/develop'
updated locales
WIP fix calculation.rb
fixed calculation.rb
mini fix calculation.rb
WIP fix grading view
ja updated
Merge remote-tracking branch 'tapalilov/develop'
WIP fix grading view
fix for maerge
fix for maerge
fix grading view style
Merge remote-tracking branch 'kalkov/develop'
Merge remote-tracking branch 'absolu7/develop'
Merge remote-tracking branch 'tapalilov/develop'
updated diagrams
Merge branch 'develop' of github.com:Kagetsuki/GAKUEngine into develop