change notificationAcitivity
Merge branch 'master' of https://github.com/njuyyz/ebayFriends

Conflicts:
	bin/AndroidManifest.xml
	bin/classes.dex
	bin/classes/activity/MainActivity.class
	bin/classes/activity/item/ItemDetailActivity.class
	bin/classes/activity/newsfeed/NewsFeedActivity.class
	bin/classes/activity/notification/NotificationActivity.class
	bin/classes/activity/post/AttachItemActivity.class
	bin/classes/activity/profile/ProfileActivity.class
	bin/classes/com/ebay/ebayfriend/R$id.class
	bin/classes/com/ebay/ebayfriend/R$layout.class
	bin/classes/com/ebay/ebayfriend/R$string.class
	bin/classes/com/ebay/ebayfriend/R$style.class
	bin/eBayFriend.apk
	bin/resources.ap_
	gen/com/ebay/ebayfriend/R.java
	res/layout/main.xml