Merge origin/master

Conflicts:
	test/TestDbController.java
Merge origin/master

Conflicts:
	test/TestDbController.java
Merge origin/master