Merge origin/master

Conflicts:
	src/Domain/DesignEngine.java
Merge origin/master