fix package license
refactor EnabledTilesVocabulary to avoid issues with situations in which we have no context/request
HT @datakurre (closes #211)
Merge branch 'master' into ericof-plone.app.blocks-1.1

Conflicts:
	docs/HISTORY.rst