Cambios generales.
Merge branch 'master' of https://github.com/mobarrio/TimeSheet

Conflicts:
	index.php
	js/plugins/mobarrio/timer/jquery.timer.js
	sbin/tareasfunc.php