A lot of changes ...
Merge branch 'master' of https://github.com/MagIO2/Web2Home---lcars