Merge branch 'master' of https://github.com/devdav2014/helloworld into ready/helloworldwar

Conflicts:
	src/main/webapp/index.html