styling, placement, inpage knote indicators
Merge branch 'master' into inpageknotes

Conflicts:
	knotesy/assets/js/bookmarklet.js
	knotesy/user/views.py
moving indicators
Merge branch 'master' into inpageknotes
in page styles
Merge branch 'master' into inpageknotes

Conflicts:
	knotesy/templates/knotes/list.html
hilite not ready yet