Conflict resolution
interface
Merge pull request #14 from arnebech/kendo-ui

Kendo ui