Ajaxified import and implemented the entity api
Merge branch 'develop'