Merge pull request #135 from kalkov/master

only one failure in admissions
Merge branch 'master' of git://github.com/Kagetsuki/GAKUEngine into develop
Merge remote-tracking branch 'snowsunny/master' into develop
Merge branch 'master' of git://github.com/kalkov/GAKUEngine into develop
external school recrod view partial and locales
Merge branch 'master' of git://github.com/Kagetsuki/GAKUEngine into develop
add external_school_record foreign_key
[helpers] visualizing achievements and simple grades
[model] add to_s to simple grades
connect partial with achievements and simple grades
[admissions] passing parameters between admission pages
[admissions] change state logic refactoring
fix conflict after pull from absolu7
[controller specs] wip dirty
Merge branch 'develop' of https://github.com/absolu7/GAKUEngine into develop

Conflicts:
	admissions/app/controllers/gaku/admin/admissions_controller.rb
	admissions/app/views/gaku/admin/admissions/_student_fields.html.slim
	admissions/app/views/gaku/admin/admissions/_students_list.html.slim
Merge branch 'develop' of https://github.com/martakostova/GAKUEngine into develop

Conflicts:
	admissions/app/controllers/gaku/admin/admissions_controller.rb
Comment puts in admission_controller
Fix admin/student_changes
[spec] student specialties in students#show
[fixes] css classes and id for gaku naming convention