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

Conflicts:
	source/android/nourriture-android/bin/classes.dex
	source/android/nourriture-android/bin/nourriture-android.apk