commit
Merge branch 'master' of https://github.com/thans/LaosTrainingApp

Conflicts:
	src/com/uwcse/morepractice/DownloadActivity.java
	src/com/uwcse/morepractice/Splash.java