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/internal/IndicatorLayout.class
	source/android/nourriture-android/bin/classes/com/handmark/pulltorefresh/library/internal/LoadingLayout.class
	source/android/nourriture-android/res/layout/activity_add_food.xml
	source/android/nourriture-android/res/layout/activity_add_recipe.xml
	source/android/nourriture-android/res/layout/activity_change_pwd.xml
	source/android/nourriture-android/res/layout/activity_edit_manu_info.xml
	source/android/nourriture-android/res/layout/activity_edit_normal_info.xml
	source/android/nourriture-android/res/layout/activity_register_manu.xml
	source/android/nourriture-android/res/layout/activity_register_normal.xml
	source/android/nourriture-android/src/cn/edu/bjtu/nourriture/entity/IndexGalleryItemData.java
	source/android/nourriture-android/src/cn/edu/bjtu/nourriture/ui/ChangePwdActivity.java
	source/android/nourriture-android/src/cn/edu/bjtu/nourriture/ui/EditBormalInfoActivity.java
	source/android/nourriture-android/src/cn/edu/bjtu/nourriture/ui/EditManuInfoActivity.java
	source/android/nourriture-android/src/cn/edu/bjtu/nourriture/ui/LoginActivity.java
	source/android/nourriture-android/src/cn/edu/bjtu/nourriture/ui/PersonalActivity.java
	source/android/nourriture-android/src/cn/edu/bjtu/nourriture/ui/RegisterBormalActivity.java
	source/android/nourriture-android/src/cn/edu/bjtu/nourriture/ui/RegisterManuActivity.java
	source/android/nourriture-android/src/cn/edu/bjtu/nourriture/ui/SearchActivity.java
cmt