Merge branch 'master' into LS_Home
Add LS_Home to master and set default/default theme
Merge branch 'LS_Home'
Merge branch 'master' into develop