add New Edit activity and some data models and integrate edit with main activity
 fix merge conflicts and remove spurious files