update
Merge branch 'master' of https://github.com/sala223/DelicacyFusion

Conflicts:
	modules/android/android-client/gen/com/df/android/R.java