Add data on homepage
Merged develop fixed conflict