[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
[fix&refactor] extended search;change achievemnt to badge type
[views] student achievement to badge
[controller] student achievements to badges
[spec/controller] student achievement to badges
[spec/feature] student achievement to badges
[model] change student association with badges
[spec/routes] student achievement to badges
[decorator] refator to use badges
[routes] badges
[locale] badges
[spec/model] students/badges assoc
[sample] badges
[menu] badges menu
Merge branch 'master' into refactor_achivement_to_badge

Conflicts:
	admin/app/views/gaku/shared/menu/_admin.html.erb
	archive/app/views/gaku/shared/menu/_admin.html.erb
Fix menu