Encoding fixed. DAL: varchar changed to nvarchar
Merge branch 'master' into test-markups