Merge branch 'develop' of github.com:kalkov/GAKUEngine into develop
typo fix
edit logic and fixes for exam portion attachments
[spec] edit specs for exam portion attachments
Merge branch 'develop' of https://github.com/martakostova/GAKUEngine into develop

Conflicts:
	core/spec/requests/exams/exam_portions/attachments_spec.rb
Merge branch 'develop' of https://github.com/kalkov/GAKUEngine into develop
change admission phase states edits
Merge branch 'develop' of github.com:martakostova/GAKUEngine into develop
Merge branch 'develop' of github.com:kalkov/GAKUEngine into develop
[specs] fix admission phase state spec
[student] check if the student is active or not by its enrollment status
fix recovering deleted applicant
[locales] remove unused translations
[specs] listing admissions soft delete
minor fix
Merge branch 'develop' of https://github.com/martakostova/GAKUEngine into develop
Merge branch 'develop' of https://github.com/absolu7/GAKUEngine into develop
Merge branch 'develop' of https://github.com/tapalilov/GAKUEngine into develop
Merge branch 'develop' of github.com:absolu7/GAKUEngine into develop
Merge branch 'develop' of https://github.com/martakostova/GAKUEngine into develop