ima

ima
cookie
Merge branch 'master' of https://github.com/ALSephirot/MallTopicApp

Conflicts:
	MalltopicNewsCMS/MalltopicNewsCMS.v12.suo
	MalltopicNewsCMS/MalltopicNewsCMS/Scripts/MostrarImg.js
	MalltopicNewsCMS/MalltopicNewsCMS/Views/Noticias/Edit.cshtml
	MalltopicNewsCMS/MalltopicNewsCMS/Views/Shared/_Layout.cshtml