changed all the button
Merge branch 'master' of https://github.com/mellwa/ClassTalk

Conflicts:
	gen/com/example/classtalk/R.java
	gen/com/facebook/android/R.java