Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
	src/main/webapp/WEB-INF/sitemesh3.xml
	src/main/webapp/WEB-INF/views/index.jsp
	src/main/webapp/WEB-INF/views/play.jsp
	src/main/webapp/decorator/index.jsp