update manufactur
android
temp
android
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