add block elements back into oerpub index file
fix css for note placeholders
fix editing placeholder text
fix editing things with placeholders
fix note plugin mapping errors
fix mapping error with exercises
Revert "add block elements back into oerpub index file"

This reverts commit 78a72257322ed9ca91cd01218892c8bef764a5e6.

Conflicts:

	oerpub/index.html
Merge branch 'block-image' into block-bugfixes
Merge remote-tracking branch 'origin/master' into block-bugfixes

Conflicts:
	src/plugins/oer/popover/lib/popover-plugin.js
Merge remote-tracking branch 'origin/master' into block-bugfixes
Merge pull request #8 from oerpub/block-bugfixes

Block bugfixes