Merge branch 'master' of github.com:Genshin/GAKUEngine into external_school_record
Add deface and fix menu
Merge branch 'master' of github.com:Genshin/GAKUEngine
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