test
[WIP] thinreports test for 指導要録
Merge remote-tracking branch 'kagetsuki/master'
Merge remote-tracking branch 'tapalilov/develop' into develop
updated locales
[controller] fix admissions controller - when no period and method return nil
Merge branch 'develop' of github.com:absolu7/GAKUEngine into develop
[views][locales] show message if no phase/state in selected period and method
[views] when only one state in phase, no dropdown for change state
[model] add validation to period method association model
WIP
merged kagetsuki/develop
FIX admissions/index.xls.erb
FIX admissions/index.xls.erb 調整用
add comment admissions/index.xls.erb
Merge remote-tracking branch 'kalkov/develop'
fix for merge : absolu7/develop
Merge branch 'develop' of https://github.com/absolu7/GAKUEngine into develop

Conflicts:
	admissions/app/views/gaku/admin/admissions/_links.html.slim
[views] fix admissions index js error
[views] fix admission period edit validations