Cleaned up in project due to tools for codeinspection complaining
Name of application window is now defined in Constants
Resolved merge conflict