temp
temp
temp
Merge branch 'develop' of
https://github.com/PracticalTraining/nourriture.git into develop
Merge branch 'develop' of
https://github.com/PracticalTraining/nourriture.git into develop
Merge branch 'develop' of https://github.com/PracticalTraining/nourriture.git into develop
temp
Merge branch 'develop'

Conflicts:
	source/android/nourriture-android/bin/nourriture-android.apk
	source/android/nourriture-android/bin/resources.ap_
	source/server/nourriture-web/.classpath