Merge origin/master

Conflicts:
	build.xml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	test/CryptoHelper.java
Merge origin/master

Conflicts:
	test/TestDbController.java