jndi in dao
Merge branch 'michal'