test1
Merge branch 'dev_1.0' of https://github.com/karencatearabit/tcgroupapp into dev_1.0