Fixing my own mess
adding some new files
Updating
updating
Merge branch 'master' of https://github.com/NobrainerWeb/Silverstripe-Content-Blocks

Conflicts:
	_config/betterbuttons.yml