Merge pull request #103 from benjello/master

Fixing some fucntion to deal with entity heterogeneity
Minor modif and fix survey import