edit block with animation
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/index.html
	build/js/main.min.js
	build/js/main.min.map
	build/views.js
	index.html