Merge remote-tracking branch 'origin/master' into implement_grading_methods
Merge remote-tracking branch 'origin/master' into implement_grading_methods
[view] make student new to be html not js
[spec/feature] new student html
[spec/C] html create and new for student
[frontend] Fix students_controller_spec
Merge remote-tracking branch 'origin/master' into implement_grading_methods
Fix Gemfile
Fix admin/templates
Merge pull request #259 from Genshin/make_new_student_html

Make new student html
Add external_school_records to students/edit
Merge branch 'implement_grading_methods' of github.com:Genshin/gaku into implement_grading_methods
Merge remote-tracking branch 'origin/master' into implement_grading_methods
Add datepicker to students/external_school_records
Merge branch 'master' of github.com:Genshin/GAKUEngine into external_school_record
Merge pull request #261 from Genshin/external_school_record

External school record
[models] achivement to badge types; studentachievement to badge
[views+controller] change achievement to badge type
Merge branch 'master' into refactor_achivement_to_badge

Conflicts:
	core/spec/models/external_school_record_spec.rb
Merge remote-tracking branch 'origin/master' into implement_grading_methods