Refactor
Fix transactional import
Fix api urls
Merge pull request #1760 from erwinwinder/master

Fix restApi and mysql fixes