Owner
Merge branch 'master' of https://github.com/DotConnectSA/TookaV1

Conflicts:
	RealEstateV1/RealEstateV1.v12.suo
	RealEstateV1/RealEstateV1/App_Data/tooka.mdf
	RealEstateV1/RealEstateV1/App_Data/tookaSecurity.mdf
	RealEstateV1/RealEstateV1/App_Data/tookaSecurity_log.ldf
	RealEstateV1/RealEstateV1/App_Data/tooka_log.ldf
	RealEstateV1/RealEstateV1/bin/RealEstateV1.dll
	RealEstateV1/RealEstateV1/bin/RealEstateV1.pdb

	RealEstateV1/RealEstateV1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RealEstateV1/RealEstateV1/obj/Debug/RealEstateV1.dll
	RealEstateV1/RealEstateV1/obj/Debug/RealEstateV1.pdb