8.1 Upgrade and recent Customizations
Merge branch 'master' of github.com:ssommerfeldt/TAC_LYKKI

Conflicts:
	Model/Entity Model/SalesLogix Application Entities/Account/Account.ACCOUNT.entity.xml
	Model/Entity Model/SalesLogix Application Entities/LykkiDefaults/LykkiDefaults.LYKKIDEFAULTS.entity.xml
	Model/Entity Model/SalesLogix Application Entities/SalesOrder/SalesOrder.SALESORDER.entity.xml
	Model/project.info.xml