changes
attempting to merge
compatibility with old tidepools platform
fixed delete button and other interactions
bug fixes
merge changes from master