Merge pull request #19 from japastor/master

Arreglo controlies-seguimiento
	modified:   applications/controlies/controllers/gestion.py
	modified:   applications/controlies/views/gestion/servidores_aula.html
	modified:   applications/controlies/views/thinclients/index.html
	renamed:    clients/rpc/97controlies-client -> clients/daemon/97controlies-client
	renamed:    clients/rpc/controlies-client -> clients/daemon/controlies-client
	renamed:    clients/rpc/controlies.dhcp -> clients/daemon/controlies-client.dhcp
	modified:   clients/rpc/RPCServer.py
	modified:   debian/changelog
	modified:   debian/control
	modified:   debian/controlies-client.install
	deleted:    packages/controlies-client_0.6.6-1_all.deb
	deleted:    packages/controlies-thinclient_0.6.6-1_all.deb
	deleted:    packages/controlies_0.6.6-1_all.deb
	modified:   puppet/instala_controlies.zip
	deleted:    puppet/instala_controlies/files/controlies-client_0.6.6-1_all.deb
	deleted:    puppet/instala_controlies/files/controlies-thinclient_0.6.6-1_all.deb
	deleted:    puppet/instala_controlies/files/controlies_0.6.6-1_all.deb
	modified:   puppet/instala_controlies/manifests/init.pp
	applications/controlies/views/gestion/classroom_computers.html
	clients/avahi/avahiRoute.py
	clients/daemon/97controlies-ltspserver
	clients/daemon/controlies-ltspserver
	clients/daemon/controlies-ltspserver.dhcp
	debian/controlies-ltspserver.debhelper.log
	debian/controlies-ltspserver.dirs
	debian/controlies-ltspserver.install
	debian/controlies-ltspserver.postinst
	debian/controlies-ltspserver.postrm
	new file:   applications/controlies/views/gestion/classroom_computers.html
	new file:   clients/avahi/avahiRoute.py
	new file:   clients/daemon/97controlies-ltspserver
	new file:   clients/daemon/controlies-ltspserver
	new file:   clients/daemon/controlies-ltspserver.dhcp
	new file:   debian/controlies-ltspserver.debhelper.log
	new file:   debian/controlies-ltspserver.dirs
	new file:   debian/controlies-ltspserver.install
	new file:   debian/controlies-ltspserver.postinst
	new file:   debian/controlies-ltspserver.postrm
	modified:   debian/controlies-client.install
	modified:   debian/controlies-ltspserver.install
	new file:   packages/controlies-client_0.6.6-2_all.deb
	new file:   packages/controlies-ltspserver_0.6.6-2_all.deb
	new file:   packages/controlies-thinclient_0.6.6-2_all.deb
	new file:   packages/controlies_0.6.6-2_all.deb
	modified:   puppet/instala_controlies.zip
	new file:   puppet/instala_controlies/files/controlies-client_0.6.6-2_all.deb
	new file:   puppet/instala_controlies/files/controlies-ltspserver_0.6.6-2_all.deb
	new file:   puppet/instala_controlies/files/controlies-thinclient_0.6.6-2_all.deb
	new file:   puppet/instala_controlies/files/controlies_0.6.6-2_all.deb
	modified:   puppet/instala_controlies/manifests/init.pp
	modified:   buildPackages.sh
	deleted:    debian/controlies-ltspserver.debhelper.log
	modified:   packages/controlies-client_0.6.6-2_all.deb
	modified:   packages/controlies-ltspserver_0.6.6-2_all.deb
	modified:   packages/controlies-thinclient_0.6.6-2_all.deb
	modified:   packages/controlies_0.6.6-2_all.deb
	modified:   puppet/instala_controlies.zip
	modified:   puppet/instala_controlies/files/controlies-client_0.6.6-2_all.deb
	modified:   puppet/instala_controlies/files/controlies-ltspserver_0.6.6-2_all.deb
	modified:   puppet/instala_controlies/files/controlies-thinclient_0.6.6-2_all.deb
	modified:   puppet/instala_controlies/files/controlies_0.6.6-2_all.deb
	modified:   debian/controlies-ltspserver.postinst
	modified:   debian/controlies-ltspserver.postrm
	modified:   packages/controlies-client_0.6.6-2_all.deb
	modified:   packages/controlies-ltspserver_0.6.6-2_all.deb
	modified:   packages/controlies-thinclient_0.6.6-2_all.deb
	modified:   packages/controlies_0.6.6-2_all.deb
	modified:   puppet/instala_controlies.zip
	modified:   puppet/instala_controlies/files/controlies-client_0.6.6-2_all.deb
	modified:   puppet/instala_controlies/files/controlies-ltspserver_0.6.6-2_all.deb
	modified:   puppet/instala_controlies/files/controlies-thinclient_0.6.6-2_all.deb
	modified:   puppet/instala_controlies/files/controlies_0.6.6-2_all.deb
	modified:   puppet/instala_controlies/manifests/init.pp
	modified:   puppet/instala_controlies/manifests/init.pp
	new file:   debian/controlies-client.prerm
	new file:   debian/controlies-ltspserver.prerm
	modified:   packages/controlies-client_0.6.6-2_all.deb
	modified:   packages/controlies-ltspserver_0.6.6-2_all.deb
	modified:   packages/controlies-thinclient_0.6.6-2_all.deb
	modified:   packages/controlies_0.6.6-2_all.deb
	modified:   puppet/instala_controlies.zip
	modified:   puppet/instala_controlies/files/controlies-client_0.6.6-2_all.deb
	modified:   puppet/instala_controlies/files/controlies-ltspserver_0.6.6-2_all.deb
	modified:   puppet/instala_controlies/files/controlies-thinclient_0.6.6-2_all.deb
	modified:   puppet/instala_controlies/files/controlies_0.6.6-2_all.deb
	modified:   puppet/instala_controlies/manifests/init.pp
	modified:   applications/controlies/avahiClient.py
	modified:   applications/controlies/controllers/gestion.py
	modified:   applications/controlies/views/gestion/classroom_computers.html
	modified:   applications/controlies/views/gestion/servidores_aula.html
	new file:   clients/avahi/controlies-ltspserver
	new file:   clients/avahi/controlies-ltspserver.desktop
	modified:   debian/controlies-ltspserver.install
	modified:   packages/controlies-client_0.6.6-2_all.deb
	modified:   packages/controlies-ltspserver_0.6.6-2_all.deb
	modified:   packages/controlies-thinclient_0.6.6-2_all.deb
	modified:   packages/controlies_0.6.6-2_all.deb
	modified:   puppet/instala_controlies.zip
	modified:   puppet/instala_controlies/files/controlies-client_0.6.6-2_all.deb
	modified:   puppet/instala_controlies/files/controlies-ltspserver_0.6.6-2_all.deb
	modified:   puppet/instala_controlies/files/controlies-thinclient_0.6.6-2_all.deb
	modified:   puppet/instala_controlies/files/controlies_0.6.6-2_all.deb
	modified:   applications/controlies/controllers/gestion.py
	modified:   applications/controlies/views/gestion/classroom_computers.html
	modified:   applications/controlies/views/gestion/servidores_aula.html
	modified:   debian/controlies-ltspserver.postinst
	modified:   packages/controlies-client_0.6.6-2_all.deb
	modified:   packages/controlies-ltspserver_0.6.6-2_all.deb
	modified:   packages/controlies-thinclient_0.6.6-2_all.deb
	modified:   packages/controlies_0.6.6-2_all.deb
	modified:   puppet/instala_controlies.zip
	modified:   puppet/instala_controlies/files/controlies-client_0.6.6-2_all.deb
	modified:   puppet/instala_controlies/files/controlies-ltspserver_0.6.6-2_all.deb
	modified:   puppet/instala_controlies/files/controlies-thinclient_0.6.6-2_all.deb
	modified:   puppet/instala_controlies/files/controlies_0.6.6-2_all.deb
	modified:   applications/controlies/avahiClient.py
	modified:   applications/controlies/controllers/gestion.py
	modified:   applications/controlies/modules/Thinclients.py
	modified:   applications/controlies/static/js/utils.js
	modified:   applications/controlies/views/gestion/classroom_computers.html
	modified:   applications/controlies/views/gestion/servidores_aula.html
	modified:   debian/changelog
	deleted:    packages/controlies-client_0.6.6-2_all.deb
	new file:   packages/controlies-client_0.6.6-3_all.deb
	deleted:    packages/controlies-ltspserver_0.6.6-2_all.deb
	new file:   packages/controlies-ltspserver_0.6.6-3_all.deb
	deleted:    packages/controlies-thinclient_0.6.6-2_all.deb
	new file:   packages/controlies-thinclient_0.6.6-3_all.deb
	deleted:    packages/controlies_0.6.6-2_all.deb
	new file:   packages/controlies_0.6.6-3_all.deb
	modified:   puppet/instala_controlies.zip
	deleted:    puppet/instala_controlies/files/controlies-client_0.6.6-2_all.deb
	new file:   puppet/instala_controlies/files/controlies-client_0.6.6-3_all.deb
	deleted:    puppet/instala_controlies/files/controlies-ltspserver_0.6.6-2_all.deb
	new file:   puppet/instala_controlies/files/controlies-ltspserver_0.6.6-3_all.deb
	deleted:    puppet/instala_controlies/files/controlies-thinclient_0.6.6-2_all.deb
	new file:   puppet/instala_controlies/files/controlies-thinclient_0.6.6-3_all.deb
	deleted:    puppet/instala_controlies/files/controlies_0.6.6-2_all.deb
	new file:   puppet/instala_controlies/files/controlies_0.6.6-3_all.deb
	modified:   puppet/instala_controlies/manifests/init.pp
	modified:   applications/controlies/controllers/gestion.py
	modified:   packages/controlies-client_0.6.6-3_all.deb
	modified:   packages/controlies-ltspserver_0.6.6-3_all.deb
	modified:   packages/controlies-thinclient_0.6.6-3_all.deb
	modified:   packages/controlies_0.6.6-3_all.deb
	modified:   puppet/instala_controlies.zip
	modified:   puppet/instala_controlies/files/controlies-client_0.6.6-3_all.deb
	modified:   puppet/instala_controlies/files/controlies-ltspserver_0.6.6-3_all.deb
	modified:   puppet/instala_controlies/files/controlies-thinclient_0.6.6-3_all.deb
	modified:   puppet/instala_controlies/files/controlies_0.6.6-3_all.deb
	new file:   clients/avahi/sessionControl_thinclient.py
	modified:   clients/thinclients/K99_seguimiento_usuario
	modified:   debian/changelog
	new file:   debian/controlies-thinclient.dirs
	modified:   debian/controlies-thinclient.install
	modified:   packages/controlies-client_0.6.6-3_all.deb
	modified:   packages/controlies-ltspserver_0.6.6-3_all.deb
	modified:   packages/controlies-thinclient_0.6.6-3_all.deb
	modified:   packages/controlies_0.6.6-3_all.deb
	modified:   puppet/instala_controlies.zip
	modified:   puppet/instala_controlies/files/controlies-client_0.6.6-3_all.deb
	modified:   puppet/instala_controlies/files/controlies-ltspserver_0.6.6-3_all.deb
	modified:   puppet/instala_controlies/files/controlies-thinclient_0.6.6-3_all.deb
	modified:   puppet/instala_controlies/files/controlies_0.6.6-3_all.deb
	modified:   applications/controlies/controllers/gestion.py
	modified:   applications/controlies/views/gestion/classroom_computers.html
	modified:   applications/controlies/views/gestion/servidores_aula.html
	modified:   clients/avahi/sessionControl.py
	modified:   clients/rpc/RPCServer.py