Merged from branch UI_seperation_II part 3
Merged from branch UI_seperation_II part 2
Applied changes to reflect on the moving of classes
Refactoring Logging: Made logging method member methods
Refactoring based on the moving of three classes
Added missing JavaDoc
Don't externalize constant strings
Fix some wrongfully merged artifacts
Merged from branch
Externalize Strings