Working on #557, making importing more reliable
Merge branch 'master' of https://github.com/bherila/n2cms