JNDI
Merge branch 'team2' of https://wase1012@github.com/wase1012/awp_palaver.git into team2