Web client stuffs
Merge branch 'master' of https://github.com/ApolloCoding/Apollo-Coding