time to pull
Merge branch 'master' of https://github.com/kmjungersen/znc_admin

Conflicts:
	znc_webadmin.pyc
Merge branch 'master' of https://github.com/kmjungersen/znc_admin
Merge branch 'master' of https://github.com/kmjungersen/znc_admin
refactor socketform stuff
Merge pull request #4 from asmacdo/feature/resocket

Feature/resocket