customer register and manufature register
update custmer register
update the customer info and password
update customer info and password
update the manufature info and password
update manufature info and password
update manufature info and password
update custmerinfo and password
e
1
cmt
cmt
Merge branch 'develop' of
https://github.com/PracticalTraining/nourriture.git into develop

Conflicts:
	source/android/nourriture-android/.gitignore
	source/android/nourriture-android/bin/classes/com/handmark/pulltorefresh/library/OverscrollHelper.class
	source/android/nourriture-android/bin/classes/com/handmark/pulltorefresh/library/PullToRefreshAdapterViewBase.class
	source/android/nourriture-android/bin/classes/com/handmark/pulltorefresh/library/PullToRefreshBase.class
	source/android/nourriture-android/bin/classes/com/handmark/pulltorefresh/library/internal/FlipLoadingLayout.class
	source/android/nourriture-android/bin/classes/com/handmark/pulltorefresh/library/internal/LoadingLayout.class
	source/android/nourriture-android/res/layout/activity_index.xml
	source/android/nourriture-android/res/layout/activity_splash.xml
	source/android/nourriture-android/res/values/strings.xml
	source/android/nourriture-android/src/cn/edu/bjtu/nourriture/ui/SearchActivity.java
update addfood and recipe
update
food detail activity
cmt
cmt
c
cmt