editting server port
some work on jsp
my operations
adding on the database change log
struts and liquibase edits
Struts changes
removing uuid's
Merge branch 'feature/EMR-1' into develop