Fix issue 213
Fixed issues related to last commit (dcd363f2cb8cbb08a0113a370c0fcc506061aa8b)
   - characterset issue with ita
   - commited conflict info from nor
Merge remote-tracking branch 'origin/develop' into develop