Added ScrollView to UI
Merge branch 'master' of https://github.com/LarryBarge/ThreadEx

Conflicts:
	res/layout/main.xml