I'm testing extra merge commits.
updating spring for usage events
merged conflict..'
updating entities for proper entitieness. also updating pom with dependency for javassit error