Added 2 new communites
merge conflicts
Merge branch 'ty221-master'