Fixed bugs, Final Push
Merge branch 'new-server'
Merge branch 'master' of https://github.com/suparngp/AOSProject2