Fix conflits after rebase to master
Merge branch 'MH-550' into dev
Fix add new person in group member page
Merge branch 'dev' of github.com:thelabtech/missionhub into dev
Merge branch 'MH-514' into dev