Merge origin/master

Conflicts:
	nb-configuration.xml
	pom.xml
	src/main/java/mycode/gae/MyListener.java
	src/main/webapp/WEB-INF/appengine-web.xml
	src/main/webapp/WEB-INF/web.xml