server side
merge serverside .gitignore
serverside cleanups
Merge branch 'master' of https://github.com/Mephasto/admin
merge
merge
setting up