update
Merge branch 'master' of https://github.com/tianshan20081/DefinitiveGuide

Conflicts:
	bin/classes/com/aoeng/degu/receiver/ReceiverUI.class
	bin/classes/com/aoeng/degu/ui/nt/NetWorkUI.class
	bin/classes/com/aoeng/degu/ui/security/AntiDebugUI.class
	bin/classes/com/aoeng/degu/ui/services/ServiceUI.class
	bin/classes/com/aoeng/degu/ui/uis/Group1UI.class
	bin/classes/com/aoeng/degu/ui/uis/Group2UI.class
	bin/classes/com/aoeng/degu/ui/uis/Group3UI.class
	bin/classes/com/aoeng/degu/ui/uis/GroupMainUI.class