newest changes
Merge branch 'master' of https://github.com/ErnestWong/UWInfoSession

Conflicts:
	src/com/example/uwinfosession/MainActivity.java