Merge remote-tracking branch 'kagetsuki/develop'
Merge remote-tracking branch 'kagetsuki/develop'
Merge pull request #137 from kalkov/master

merge in master
[models] remove make_applicant after_create from student_decorator in admissions
[core][controllers][models] add make_enrolled to student model and call it from controller after_filter on create
[models][controllers] fixes
Merge pull request #139 from Genshin/core_default_student_enrollment_status

Core default student enrollment status
add admin menu link to school years
[locale] for admin menu school years label
Merge remote-tracking branch 'kagetsuki/develop'
Merge remote-tracking branch 'kalkov/master'
Merge remote-tracking branch 'kagetsuki/master'
change assiagmentscore score attribute to float to match exam portion score
Update README: correct gem name from 'gaku' to 'gaku_engine'
Merge pull request #145 from theCrab/patch-1

Update README: correct gem name from 'gaku' to 'gaku_engine'
Merge branch 'develop' of github.com:tapalilov/GAKUEngine into tapalilov-develop

Conflicts:
	core/spec/requests/students/achievements_spec.rb
Merge branch 'master' of github.com:Genshin/GAKUEngine
Merge pull request #141 from Genshin/add_school_year_to_admin_menu

Add school year to admin menu
Merge pull request #143 from Genshin/change_assigment_score_to_float

change assiagmentscore score attribute to float to match exam portion sc...
[README] Update install instructions