Fix bundle argument.
Merge pull request #20 from shushu/19

Fix bundle argument.
Update to latest entity api module.
Merge pull request #21 from shushu/19

Update to latest entity api module.
Avoid error messages.
Merge branch 'DEMO-1.x' into 14-new