Merge remote-tracking branch 'kagetsuki/develop'
Merge remote-tracking branch 'kagetsuki/develop'
[refactor] program - syllabuses assoc
[fix] merge conflict
add and refactor helpers
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
factories and helper
[models] associations
[spec/req] program views
helpers
[views] school program
[controller] program controller
routes for programs
[locale] program and program_*
added program in schools#show view
Merge pull request #139 from Genshin/core_default_student_enrollment_status

Core default student enrollment status
[styling] change styling on methods and blocks