resolve asset merge conflict
Merge branch 'master' of https://gitlab.com/starkingdoms.tk/starkingdoms.tk
move tcp handler into its own file