bliggityblah
Merge branch 'five_minute_poller_refactor' into phils_rolly_polly_super_usage_refactor_branch
updating spring for usage events
merged conflict..'
updating entities for proper entitieness. also updating pom with dependency for javassit error
Merge branch 'phils_rolly_polly_super_usage_refactor_branch' into mupphils