1
Merge branch 'master' of https://github.com/phucdkbk/xosoclient

Conflicts:
	bin/classes/com/alandk/xosomienbac/activity/LotteryResultActivity.class
	bin/classes/com/alandk/xosomienbac/activity/StatisticActivity.class
	bin/classes/com/alandk/xosomienbac/activity/ThongkeLoganActivity$DownloadWebpageTask$1.class
	bin/classes/com/alandk/xosomienbac/activity/ThongkeLoganActivity$DownloadWebpageTask.class
	bin/classes/com/alandk/xosomienbac/activity/ThongkeLoganActivity.class