[MOD] Firs collection
Merge branch 'sprint3' of https://github.com/blstream/myHoard_Android into sprint3

Conflicts:
	myHoard/src/main/res/values/strings.xml