refactor
Merge remote-tracking branch 'upstream/develop'
over-parallelized?
added worker
Merge remote-tracking branch 'kalkov/develop'
Merge remote-tracking branch 'absolu7/refactor_admissions'
change student scope var from 0 to false
Merge branch 'develop' of github.com:kalkov/GAKUEngine into refactor_admissions
[enrollment status] refactor enrollment status in students/view
pull tapalilov
include student enrollment status in admissions
Merge branch 'develop' of git://github.com/martakostova/GAKUEngine into refactor_admissions
debugging and improving model importer
Merge remote-tracking branch 'kalkov/develop'
Merge remote-tracking branch 'tapalilov/develop'

Conflicts:
	core/app/views/gaku/students/_show_table.html.slim
Merge remote-tracking branch 'absolu7/refactor_admissions'
Add enrollment_status_id in Student for versioning
Merge branch 'develop' of git://github.com/tapalilov/GAKUEngine into develop

Conflicts:
	core/app/views/gaku/students/_show_table.html.slim
mostly finished importer. duplicate check not working
pull kagetsuki