+
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/mvc/Controller.java
	src/mvc/DataExchange.java
	src/mvc/MVC.java
+