1.1

Merge remote-tracking branch 'purus/master' into develop

# Conflicts:
#	src/haven/GameUI.java
#	src/haven/Gob.java
#	src/haven/LocalMiniMap.java
#	src/haven/MapView.java
#	src/haven/MenuGrid.java
#	src/purus/DragonflyCollector.java
#	src/purus/MusselPicker.java

16.03.17

Merge remote-tracking branch 'purus/master' into develop