Update
Conflict fix

Conflicts:
	Project1/EKSTRAINFO.DTA
	Project1/Eiendom.cpp
Conflict fix