Started writing JUnit Tests
Created blank test class for SettingsManager
Setting up the project for IntelliJ
Restructuring project
Restructuring project - moving files to new structure
Fixing project setup for IntelliJ
Merge branch 'develop' into maven