JNDI Datasource
Merge branch 'develop' of https://github.com/v-eliseev/RoomPlanner into develop