Removed html folder from branch social-Colour-enhancement-Branch-v1.0
Changed port to 8080 and tomcat version to 7x
Merge branch 'master' of https://github.com/alim10081989/Social into social-Colour-Enhancement-Branch-v1.0