test commit
Merge branch 'master' of https://github.com/nycodes9/TnuhIma.git into
dev

Conflicts:
	AmiHuntAndroid/res/values/strings.xml