Fixed bug with MAGIC QUOTES durin importing
Merge with development
Merge branch 'development' into dev/j3/common