reverted back to old csv/database files
Merge branch 'master' into parse