P20 support
re-add config
Merge branch 'master' of https://github.com/AlucardZero/adom-server

Conflicts:
	etc/config
Merge branch 'master' of https://github.com/AlucardZero/adom-server