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

Conflicts:
	Electron/Views/Shared/_Layout.cshtml