no message
Merge branch 'master' of https://github.com/smartfeeling/NSmartly

Conflicts:
	Smartly.Mono/Smartly.userprefs
	Smartly.Mono/Tests/Framework/test-results/Tests.csproj.test-cache