dmmurray kkuhn remove all warnings from PlanningPoker
dmmurray kkuhn merging with dev, fix conflicts in mainView.java