//
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	gen/com/yuf/app/ui/R.java