added livestock model
merged livestock into develop