Merge branch 'master' of C:\java\code\paromticket with conflicts.
Hibernate + Jaas first ed