Fixed conflict PR Dexie
Merge branch 'dxii-issue-12-responsive' into develop