initial commit
Merge branch 'master' of https://github.com/gcauchon/j2ee_web