fixed a port conflict in the web-app
Merge branch 'master' of https://github.com/sonjayatandon/boilerplate