before meger
Merge branch 'raven' of https://github.com/ludwiksh/Etales
update protection
fix
add decision period & fix period problem
Merge branch 'master' of https://github.com/ludwiksh/Etales into raven