NO-ISSUE refactoring EventScreen
Merge pull request #93 from CienProject2014/NO-ISSUE-refactor

NO-ISSUE refactoring EventScreen