Changed target to 16, commented out the code to start activity "Edit"
Merge sriess with Master branch