Merge remote-tracking branch 'sfdev/2.0' into 2.0
Merge remote-tracking branch 'sfdev/2.0' into 2.0
Merge remote-tracking branch 'sfdev/2.0' into 2.0
BK-850 Try using an existing chapter heading
BK-855 Different user activity in the editing environment should trigger different kind of events
BK-855 Different user activity in the editing environment should trigger different kind of events
Merge branch 'bjandras-2.0' into 2.0
BK-803 Aloha plugin for inserting images
BK-872 Upgrade version of Aloha editor to 0.24
BK-866 Preserve fragments on links
Merge remote-tracking branch 'sf_booktype/2.0' into ticket_BK-794

Conflicts:
	lib/booktype/apps/edit/templates/edit/aloha_header.html