war file upload and server index.html add
Merge branch 'master' of
https://github.com/OpenGDSMobile/ApplicationServer.git

Conflicts:
	src/main/webapp/WEB-INF/web.xml
	war/OpenGDSMobileApplicationServer1.0.war