JMS fronta waaa
Merge remote-tracking branch 'origin/master'

Conflicts:
	simpleWebApp-archetype/src/main/java/javaee/mail/MailServlet.java