Merge pull request #289 from sfmailand/sbl-dev

Change import in entity manager to PlanningPokerUser
Tested by: ajthompson
Fix some CodePro audit volations
Fix more CodePro audit tool issues
Fix javadoc issues using CodePro javadoc repari tool