csv import now works with information type decorator
Merge branch 'refs/heads/master' into csv_import