Data changes
resolving conflict from revert
Revert "replacing inline markup with templates. on the way to backbone"

This reverts commit b611b9666e31df41c22d4ad70f5c37bb78d04e23.
update appcache to put changes live