Merge branch 'master' of https://github.com/voilet/voilet_code

Conflicts:
	templates/server_idc/list.html
Merge branch 'master' of https://github.com/voilet/voilet_code

Conflicts:
	templates/server_idc/list.html
Merge remote-tracking branch 'origin/master'