version 0.1
version 0.2
test the add method of recipeCategoryrestfulService and
regionrestfulsercvice
version 0.5
temp
test flavourrestfulservice ,all successful  excpet getSuperior
CookingStep and Recipe Restfullservice (not tested)
Recipe-CookingStep Restfull Service -> FINAL
cmt
m
Merge branch 'develop' of https://github.com/PracticalTraining/nourriture.git into develop
1
2
3
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
template
template
tamplate