update
Merge branch 'master' of https://github.com/khiemvu/ATA

Conflicts:
	res/values/strings.xml