pulled and fixed merge conflict
pulled and fixed merge conflict

Brodan/GroupMeteor,zikrimarquel/group-messenger-meteor,Brodan/GroupMeteor,Brodan/group-messenger-meteor,mickstevens/GroupMeteor,mickstevens/GroupMeteor,Brodan/group-messenger-meteor,zikrimarquel/group-messenger-meteor