nuevas vistas
Merge branch 'master' of github.com:Nardoz/kiwi

Conflicts:
	kiwiweb/lib/cons.js
	kiwiweb/lib/fixtures.js