20131008 git motley
Merge branch 'master' of https://github.com/heavensay/project-java

Conflicts:
	motley/WebRoot/index.html
	motley/WebRoot/index.jsp