sync
Merge branch 'master' of github.com:jewalky/a2mgr

Conflicts:
	network_hat_enter.cpp