#y-30 work 6h
#y-30 work
Merge branch 'master' of https://github.com/KernelCorp/yufu
Merge branch 'master' of https://github.com/KernelCorp/yufu
#y-45 fixed work 30m
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/language.rb