mostrar calendario (al fiiin) #7
Merge branch 'admin' of github.com:LabPLC/EventarioWeb into admin

Conflicts:
	app/views/layouts/application.html.erb