fixed formatting
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/at/pavlov/cannons/cannon/DesignStorage.java
fixed formatting