Added new strings
Merge branch 'master' into dev

Conflicts:
	AmiHuntAndroid/res/values/strings.xml