Merging with Elizabeth experimental

Added EditTaskActivity!