Layout
Merge branch 'master' of https://github.com/bey0nd/Electron

Conflicts:
	Electron.v11.suo