Added running tab
Rename fileUpload
Merge branch 'master' of github.com:Flashed/system-managment

Conflicts:
	control-panel/src/main/resources/main.fxml
	control-panel/src/main/resources/runningTab.fxml