fix some stuff
Merge branch 'master' of github.com:KrakenCRM/core

Conflicts:
	src/Kraken/Core/Models/Contact.php
catching up