Merge pull request #7 from japastor/master

Actualizado paquete puppet a version 0.6.5-4
	deleted:    clients/puppet/controlies-puppet.tgz
	new file:   puppet/actualizaciones_controlies.zip
	new file:   puppet/actualizaciones_controlies/files/despierta_thinclients
	new file:   puppet/actualizaciones_controlies/files/zjstream.py
	new file:   puppet/actualizaciones_controlies/manifests/init.pp
	new file:   puppet/instala_controlies.zip
	new file:   puppet/instala_controlies/files
	new file:   puppet/instala_controlies/manifests/init.pp
	deleted:    files
	new file:   files/controlies-client_0.6.5-4_all.deb
	new file:   files/controlies-thinclient_0.6.5-4_all.deb
	new file:   files/controlies_0.6.5-4_all.deb
	new file:   buildPackages.sh
	deleted:    deleteCache.sh
	deleted:    packages/controlies-client_0.6.5-4_all.deb
	new file:   packages/controlies-client_0.6.5-5_all.deb
	deleted:    packages/controlies-thinclient_0.6.5-4_all.deb
	new file:   packages/controlies-thinclient_0.6.5-5_all.deb
	deleted:    packages/controlies_0.6.5-4_all.deb
	new file:   packages/controlies_0.6.5-5_all.deb
	modified:   puppet/instala_controlies.zip
	deleted:    puppet/instala_controlies/files/controlies-client_0.6.5-4_all.deb
	new file:   puppet/instala_controlies/files/controlies-client_0.6.5-5_all.deb
	deleted:    puppet/instala_controlies/files/controlies-thinclient_0.6.5-4_all.deb
	new file:   puppet/instala_controlies/files/controlies-thinclient_0.6.5-5_all.deb
	deleted:    puppet/instala_controlies/files/controlies_0.6.5-4_all.deb
	new file:   puppet/instala_controlies/files/controlies_0.6.5-5_all.deb
	modified:   applications/controlies/static/js/utils.js
	modified:   applications/controlies/views/gestion/servidores_aula.html
	modified:   applications/controlies/views/layout.html
	modified:   clients/rpc/RPCServer.py
	modified:   debian/changelog
	modified:   puppet/instala_controlies/manifests/init.pp
	modified:   buildPackages.sh
	modified:   packages/controlies-client_0.6.5-5_all.deb
	modified:   packages/controlies-thinclient_0.6.5-5_all.deb
	modified:   packages/controlies_0.6.5-5_all.deb
	modified:   puppet/instala_controlies.zip
	modified:   puppet/instala_controlies/files/controlies-client_0.6.5-5_all.deb
	modified:   puppet/instala_controlies/files/controlies-thinclient_0.6.5-5_all.deb
	modified:   puppet/instala_controlies/files/controlies_0.6.5-5_all.deb
Delete init.pp~
	new file:   controlies_borrar_antiguos/manifests/init.pp
	modified:   applications/controlies/controllers/logprinter.py
	modified:   applications/controlies/controllers/reports.py
	modified:   applications/controlies/views/laptops/index.html
	modified:   applications/controlies/views/logprinter/index.html
	modified:   debian/changelog
	modified:   packages/controlies-client_0.6.5-5_all.deb
	modified:   packages/controlies-thinclient_0.6.5-5_all.deb
	modified:   packages/controlies_0.6.5-5_all.deb
	deleted:    puppet/controlies_borrar_antiguos/manifests/init.pp~
	modified:   puppet/instala_controlies.zip
	modified:   puppet/instala_controlies/files/controlies-client_0.6.5-5_all.deb
	modified:   puppet/instala_controlies/files/controlies-thinclient_0.6.5-5_all.deb
	modified:   puppet/instala_controlies/files/controlies_0.6.5-5_all.deb
Merge branch 'master' of https://github.com/manumora/controlies
	new file:   .gitmodules
	modified:   applications/controlies/controllers/logprinter.py
	modified:   applications/controlies/controllers/maquinas.py
	modified:   applications/controlies/controllers/seguimiento.py
	modified:   applications/controlies/static/js/utils.js
	modified:   applications/controlies/views/gestion/servidores_aula.html
	modified:   applications/controlies/views/layout.html
	modified:   applications/controlies/views/logprinter/index.html
	modified:   applications/controlies/views/maquinas/index.html
	modified:   applications/controlies/views/seguimiento/formdelete.html
	modified:   applications/controlies/views/seguimiento/index.html
	new file:   docs
	new file:   clearCache.sh
	modified:   packages/controlies-client_0.6.5-5_all.deb
	modified:   packages/controlies-thinclient_0.6.5-5_all.deb
	modified:   packages/controlies_0.6.5-5_all.deb
	modified:   puppet/instala_controlies.zip
	modified:   puppet/instala_controlies/files/controlies-client_0.6.5-5_all.deb
	modified:   puppet/instala_controlies/files/controlies-thinclient_0.6.5-5_all.deb
	modified:   puppet/instala_controlies/files/controlies_0.6.5-5_all.deb