Merge pull request #1 from amitnarvar/master

Testing Fork
Changing db cofig to prodNarvar db
Jetty settings
Merge branch 'master' of https://github.com/narvar/EEI

Conflicts:
	ship-data-import/app/pom.xml
java 1.6
Merge remote-tracking branch 'upstream/master'