Merge branch 'feature/285-ipad-affix-bug' into develop
Merge branch 'feature/272-iphone-ipad-modals' into develop
Merge branch 'feature/279-change-simtech-logo' into develop
refactoring timepad user synchronization
refactoring unicorn config
fix timepad require file
fix #251 halls select yes/no options
add notice for banned soc network user
Merge branch 'develop' into staging