some stuff for annotation ui
Added a JSON endpoint
Bug from elasticsearvh
Merge remote-tracking branch 'origin/bootstrap' into dev