add a backend block edition
Merge branch 'master' into remove_inline_edition

Conflicts:
	Admin/BlockAdmin.php
deprecated inline edition, enable block creation from the backend
Merge branch 'remove_inline_edition'