layout(talking,listening,setting),icon,button;
Merge remote-tracking branch 'origin/vicky' into MergeWithVicky

Conflicts:
	bin/R.txt
	bin/SecretTalk5.apk
	bin/classes.dex
	bin/res/crunch/drawable-mdpi/ic_launcher.png
	bin/res/crunch/drawable-xhdpi/ic_launcher.png
	bin/res/crunch/drawable-xxhdpi/ic_launcher.png
	bin/resources.ap_
	res/drawable-mdpi/ic_launcher.png
	res/drawable-xhdpi/ic_launcher.png
	res/layout/conversation.xml
	res/layout/fragment_listening_my.xml
	res/layout/fragment_setting_my.xml
	res/layout/fragment_talking_my.xml
	res/values/strings.xml
	src/com/example/secrettalk5/Setting_MyFragment.java
	src/com/example/secrettalk5/Talking_MyFragment.java