soldved problem of over populating the collection view
Merge branch 'local' into monster_clean
merged branch local