test
[WIP] thinreports test for 指導要録
Merge remote-tracking branch 'kagetsuki/master'
Merge remote-tracking branch 'tapalilov/develop' into develop
updated locales
Merge branch 'develop' of github.com:absolu7/GAKUEngine into develop
[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
[views] fix admissions index js error
[views] fix admission period edit validations
[views] fix admissions index js error 2
[models] admission state before destroy - refactor
[controllers] when creating admission record - find default state and assign to it