Merge branch 'master' of https://github.com/molgenis/molgenis into 2014_03_22_data_mysql
Merge branch 'master' of https://github.com/molgenis/molgenis into 2014_03_22_data_mysql
fix Entity [import_city] already registered.
Merge pull request #1482 from mswertz/2014_03_22_data_mysql

Fix: Entity [import_city] already registered.