edit
delete
change package
commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/orange/game/draw/activity/home/fragment/DrawHomeFragment.java