//update demo
Merge remote-tracking branch 'origin/master'

Conflicts:
	demo11/.apt_generated/com/zhh/demo11/view/ViewActivity_.java