annotation form bugfix
Merge branch 'master' of github.com:KWARC/KAT
updated makefile
Patched JSPlumb version to fix ids with '-' not working
Added an option to hdie the control panel link
new picture by Tom
eliminating ednotes
 final minor edits
re-generated
Updated Makefile
Preparation for JOBAD integrat6ion
Basic KAT / JOBAD integration
CSS path adjustments
Added a new-annotation handler for the JOBAD module
Commented and documented kat.display.ControlPanel
Updated kat.Display class
Merge branch 'master' into gh-pages
Fixed some things
Merge branch 'dev' into gh-pages