Merge branch 'master' of https://github.com/nicolaikruger/Oz_fra_BNDN-BSUP

Conflicts:
	Services/RentItService.svc.cs
Merge branch 'production' of https://github.com/nicolaikruger/Oz_fra_BNDN-BSUP into production