changed homepage
Merge branch 'development'