LS: New Layouts (WIP)
Merge branch 'master' of https://github.com/andreaslarsen/parentheme

Conflicts:
	LockScreen/_css/style.css
LS: New Layout (WIP)