Initial commit. Trying to set up NetBeans Java EE project structure correctly with our existing web app.
Merge remote-tracking branch 'origin/master'