Organized imports and formatted the code
Merge branch 'master' of https://github.com/AndreeaUrsulescu/issue-tracker
Formatted code and organized imports part II