Test for notification in listening.
Notification test done + Back to right page.
Finish Login Event
modify a little
Finish Register And Login
conversation block done.
viewpager onTouch onClick & custom listview done.
animation,viewpager done
commit again
project properties change
Merge branch 'Wei' into MergeWithVicky

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/R.txt
	bin/SecretTalk5.apk
	bin/classes.dex
	bin/resources.ap_
	res/layout/fragment_achievement.xml
	res/layout/fragment_listening_my.xml
	res/layout/fragment_main.xml
	res/layout/fragment_main2.xml
	res/layout/fragment_navigation.xml
	res/layout/fragment_preference_setting.xml
	res/values/strings.xml
	src/com/example/secrettalk5/Listening_MyFragment.java
	src/com/example/secrettalk5/MainActivity.java
Create Article Module
finish article module
logo icon done
Modify Register Page
Talking Fragment Basic Function Finish
modify code style
viewpager layout initial setup.
Modify ArticleModule
Merge remote-tracking branch 'origin/vicky' into MergeWithVicky

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/R.txt
	bin/SecretTalk5.apk
	bin/classes.dex
	bin/dexedLibs/appcompat_v7-f78f1fc4b4b6c3205d69f2d2f93558df.jar
	bin/res/crunch/drawable-hdpi/ic_launcher.png
	bin/resources.ap_
	res/layout/fragment_listening_my.xml
	res/values/strings.xml
	src/com/example/secrettalk5/ImageAdapter.java
	src/com/example/secrettalk5/Listening_MyFragment.java
	src/com/example/secrettalk5/Talking_MyFragment.java