Super commit
Merge branch 'develop' of github.com:knutesten/kad into develop

Conflicts:
	src/main/java/no/mesan/persistence/UserDaoImpl.java
	src/main/java/no/mesan/properties/PropertiesProvider.java
	src/main/resources/sql.properties
Merge branch 'develop' of github.com:knutesten/kad into develop

Conflicts:
	database/create_user_tables.sql
Merge branch 'develop' of github.com:knutesten/kad into develop