[MOD] Collections types
Merge branch 'sprint5' of https://github.com/blstream/myHoard_Android into sprint5