Merge origin/master

Conflicts:
	src/DataSource/DesignDB.java
	src/Presentation/Control.java
Merge origin/master
Merge origin/master

Conflicts:
	src/DataSource/DesignDB.java
	src/Presentation/Control.java