temp
temp
11
111
Merge branch 'develop'

Conflicts:
	source/android/nourriture-android/bin/nourriture-android.apk
	source/android/nourriture-android/bin/resources.ap_
	source/server/nourriture-web/.classpath
Merge branch 'develop'

Conflicts:
	source/android/nourriture-android/bin/classes/com/handmark/pulltorefresh/library/internal/FlipLoadingLayout.class
	source/android/nourriture-android/bin/classes/com/handmark/pulltorefresh/library/internal/IndicatorLayout.class
	source/android/nourriture-android/bin/classes/com/handmark/pulltorefresh/library/internal/LoadingLayout.class
	source/android/nourriture-android/bin/classes/com/handmark/pulltorefresh/library/internal/RotateLoadingLayout.class
Delete AndroidManifest.xml
delete bin
delete bin gen
cmt
cmt
Merge remote-tracking branch 'origin/master'
gitignore
search history
Merge branch 'master' into develop

Conflicts:
	source/android/nourriture-android-test/.gitignore
	source/android/nourriture-android/.gitignore
	source/android/nourriture-android/src/cn/edu/bjtu/nourriture/ui/SearchActivity.java