Dev#17

shshshee wants to merge 2 commits into

masterpurplecode-team/switi_server:masterfrom

devpurplecode-team/switi_server:devCopy head branch name to clipboard