self refresh
merge fixed
Merge branch 'homeScreen' into development