Merge branch 'feature/177-change-texts' into develop
Typo fixed.
refactor halls and admin panel
Merge branch 'feature/178_add_time_slots' into staging