Implemented so much i don't even remember it.
Merge remote-tracking branch 'origin/JavaFX' into JavaFX

Conflicts:
	src/Client/MainViewController.java
	src/Model/Project.java