use Bootstrap included in tapestry 5.4, update maven with jetty's versions
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml