aaa
Merge branch 'master' of https://github.com/whipsnade/BLDClient.git

Conflicts:
	bin/BLD.apk
update
update