[FIX]
Merge branch 'sprint7' of https://github.com/blstream/myHoard_Android into sprint7

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