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

Conflicts:
	sbin/tareasfunc.php