switched branch to develo
added newer version of entity api
Merge branch 'develop' into 7.x-1.x
switching wysiwyg back to stable