Propertyy hantering.
Merge origin/develop into develop

Conflicts:
	navet-file/src/main/java/se/blinfo/navet/file/domain/impl/DefaultStoredFile.java