Finished the Options Panel
Fixed a bug with the loader.
Merge branch 'launcher'

Conflicts:
	ResearchProgram/src/Project/CaptureLancher.java
	ResearchProgram/src/Project/Settings.java