Merge pull request #56 from dimagi/upgrade_sandbox_move

Fix for Upgrades breaking out of their sandbox
Update graph colors
Merge pull request #60 from dimagi/update-graph-colors

Update graph colors
Fix bubble graphs with annotations crashing
Merge pull request #67 from dimagi/bubble-graph-annotations

Fix bubble graphs with annotations crashing
update project properties
make html markup work with jars
export
Merge pull request #69 from dimagi/update_project_properties

update project properties
Merge branch 'master' into tdh_demo