created new Repo api; removed need to generate JpaRepository; merged JpaEntity and Entity; added Entity.getEntityMetaData
Merge branch 'master' of https://github.com/molgenis/molgenis into data_api_2014_01_12
removed Repository.getEntityMetaData()
Merge branch 'data_api_2014_01_12' of https://github.com/mswertz/molgenis

Conflicts:
	molgenis-data/src/main/java/org/molgenis/data/support/MapEntity.java
Fix #1046 Importing Protocol entities does not call indexProtocols
Simplified data api. Merged Morris his code
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-charts/src/main/java/org/molgenis/charts/data/ChartDataServiceImpl.java
launch index events outside of transaction
Merge pull request #1115 from dennishendriksen/master

Fix #1046 Importing Protocol entities does not call indexProtocols
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-omx-importer/src/main/java/org/molgenis/omx/importer/OmxImporterServiceImpl.java
remove console logging
Fix merge.
Fix cyclic method call
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #1117 from erwinwinder/master

Simpler entity api
Merge pull request #1116 from RoanKanninga/master

fixed issue #901
remove rollbackFor for exception that can't be thrown
improve shopping cart performance to solve deadlocks #1110
add transactions
Merge branch 'master' of https://github.com/molgenis/molgenis
undo change