Arreglos menores.
Merge branch 'master' of https://github.com/hugoruscitti/pilasweb

Conflicts:
	Gruntfile.js
	Makefile