fix bugs
merger
merge
improve facilitator view
merge
fix bugs
fix bugs
Merge branch 'master' of https://github.com/ludwiksh/Etales into raven
update