minor change to the internal location of the upgrade sandbox. Fixes a really really silly bug with resources breaking out of the sandbox.
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
Wired in caching hooks for ledgers and general improvements to our capacity to move common iterative I/O lookups into bulk requests with memory caching.
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
Soften background colors
Merge pull request #71 from dimagi/update-background-colors

Soften background colors
Merge pull request #65 from dimagi/ledger_iterate_performance

Caching and Performance Improvements
Merge branch 'master' into inline_entity_tiles

Conflicts:
	app/res/values/colors.xml