update
Merge branch 'master' of git@github.com:tchoudiw/LiveSoccer.git

Conflicts:
	res/values/strings.xml