backup
fixed merge
deleted html mockups
Merge pull request #75 from rhsu/chosen

Chosen
Merge branch 'master' into viewDataRemoval