merge fix kalkov/develop
Merge remote-tracking branch 'kalkov/develop' into develop

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

Conflicts:
	admissions/app/views/gaku/admin/admissions/_links.html.slim
Merge remote-tracking branch 'absolu7/develop' into develop

Conflicts:
	admissions/app/views/gaku/admin/admissions/_links.html.slim
Merge remote-tracking branch 'tapalilov/develop' into develop
added UML and updated erd
WIP fix calculation.rb
fixed calculation.rb
mini fix calculation.rb
Merge remote-tracking branch 'tapalilov/develop' into develop
added (messy) xmi
WIP fix grading view
WIP fix grading view
fix for maerge
fix for maerge
fix grading view style