Merge pull request #9 from japastor/master

Bugs tareas puppet
	modified:   applications/controlies/controllers/laptops.py
	modified:   applications/controlies/controllers/logprinter.py
	modified:   applications/controlies/languages/es-es.py
	modified:   applications/controlies/models/controliesDB.py
	modified:   applications/controlies/views/laptops/index.html
	modified:   debian/changelog
	deleted:    packages/controlies-client_0.6.5-5_all.deb
	new file:   packages/controlies-client_0.6.5-6_all.deb
	deleted:    packages/controlies-thinclient_0.6.5-5_all.deb
	new file:   packages/controlies-thinclient_0.6.5-6_all.deb
	deleted:    packages/controlies_0.6.5-5_all.deb
	new file:   packages/controlies_0.6.5-6_all.deb
	modified:   puppet/instala_controlies.zip
	deleted:    puppet/instala_controlies/files/controlies-client_0.6.5-5_all.deb
	new file:   puppet/instala_controlies/files/controlies-client_0.6.5-6_all.deb
	deleted:    puppet/instala_controlies/files/controlies-thinclient_0.6.5-5_all.deb
	new file:   puppet/instala_controlies/files/controlies-thinclient_0.6.5-6_all.deb
	deleted:    puppet/instala_controlies/files/controlies_0.6.5-5_all.deb
	new file:   puppet/instala_controlies/files/controlies_0.6.5-6_all.deb
	modified:   puppet/instala_controlies/manifests/init.pp
Merge remote-tracking branch 'upstream/master'
Definidos stages en las tareas puppet