KidSoft
Merge branch 'master' of https://github.com/robertoissc/KidSoftLogica

Conflicts:
	KidSoftWeb/Views/Logica/Index.cshtml
	KidSoftWeb/Views/Shared/_Layout.cshtml