Merge remote-tracking branch 'origin/master'

Conflicts:
	pom-deprecated.xml
	src/main/java/org/apache/tapestry/unicorn/services/AppModule.java
remove old tapestry-finder code