Home page design changes
Home page design changes
conflict resolved
Merge branch 'develop' of https://github.com/pipecomo/projectsunshine into develop
Planner page changes