Added the data activity and drawable entities
merged conflicts