Updated UI
Merge branch 'master' of https://github.com/yhmahw/android

Conflicts:

	app/src/main/java/me/gethelloworld/android/youhadmeathelloworld/api/HelloAPI.java