[FIX] bugs: MYHOARD-512, MYHOARD-513, MYHOARD-500
Merge branch 'sprint3' of https://github.com/blstream/myHoard_Android into sprint3

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