Adding error checking on settings.
Merge origin/master

Conflicts:
	Project/PresentationLayer/Settings.java
Merge origin/master

Conflicts:
	Project/PresentationLayer/Settings.java