update main
Merge branch 'master' of https://github.com/hongyan520/JXDemo

Conflicts:
	src/com/demo/jxdemo/ui/fragment/main/AllFragment.java