Merge branch 'master' of github.com:kalkov/GAKUEngine into develop
Merge branch 'develop' of github.com:kalkov/GAKUEngine into develop
refactoring state change
Merge branch 'develop' of github.com:martakostova/GAKUEngine into develop
change link_to_edit helper
extract form fields in partial for students specialties
[spec] request spec for student_achievement in students#show
[factory] student_achievement_factory
[fixes] problem caught with specs in student_specialty views  in  students#show
[fix] change helper link_to edit in student achievements
Create ExtracurricularActivity and ExtracurricularActivityEnrollment models and links
showing in student show table when create, edit, delete student achievements
showing simple grades on students#show show_table
fix problem with appending in modal index table for student specialties
add =hr to separte two tables in schools#index
fixing and refoactoring change student state
WIP : Basic extracurricular_activities views
WIP: extracurricular_activities view changes and added request spec
Merge remote-tracking branch 'kagetsuki/develop'
Merge remote-tracking branch 'kagetsuki/develop'