Add client reset on unknown uaid+channels or excess channels
Merge branch 'master' into dev

Conflicts:
	mod_test/test_push_api.py
Update tests for new client reset

* Fixed bug with getting a blank UAID