Minor modifications to server
Merge branch 'master' of https://github.com/rc2811/Web_App