makeup of no-groups
fix conflicts
invite lightbox started
Merge branch 'react' of https://github.com/c58/StudyTime-client into react