New button color
Merge branch 'master' of https://github.com/kevinychen/waypal.git

Conflicts:
	android/src/com/example/waypal/DisplayMessageActivity.java