Development of Chi Value
Merge branch 'master' of github.com:ssommerfeldt/TAC_LYKKI

Conflicts:
	Model/Entity Model/EntityResources.resx
	Model/Entity Model/SalesLogix Application Entities/Account/QuickForms/ChiValues.main.quickform.xml
	Model/Entity Model/SalesLogix Application Entities/Account/QuickForms/ChiValues.main.quickform.xml.resx
	Model/Entity Model/SalesLogix Application Entities/LYKCHIVALUES/LYKCHIVALUES.LYKCHIVALUES.entity.xml
	Model/Entity Model/SalesLogix Application Entities/LYKCHIVALUES/OnAfterDelete.method.xml
	Model/Entity Model/SalesLogix Application Entities/LYKCHIVALUES/OnAfterInsert.method.xml
	Model/Entity Model/SalesLogix Application Entities/LYKCHIVALUES/OnAfterUpdate.method.xml
	Model/Entity Model/SalesLogix Application Entities/LYKCHIVALUES/OnBeforeDelete.method.xml
	Model/Entity Model/SalesLogix Application Entities/LYKCHIVALUES/OnBeforeInsert.method.xml
	Model/Entity Model/SalesLogix Application Entities/LYKCHIVALUES/OnBeforeUpdate.method.xml
	Model/Entity Model/SalesLogix Application Entities/LYKCHIVALUES/OnCreate.method.xml
	Model/Entity Model/SalesLogix Application Entities/LYKCHIVALUES/QuickForms/InsertChiValues.main.quickform.xml
	Model/Entity Model/SalesLogix Application Entities/LYKCHIVALUES/QuickForms/InsertChiValues.main.quickform.xml.resx
	Model/Portal/SlxClient/ChildPages/Account/SmartParts.order.xml
	Model/Portal/SlxClient/ChildPages/Account/SmartParts/ChiValues.smartpart.xml
	Model/Portal/SlxClient/ChildPages/Account/SmartParts/InsertChiValues.smartpart.xml
	Model/project.info.xml
Chi Values Changes