Se agrega time work, reasons y se hacen modificaciones en modelos existentes.
Merge branch 'master' of https://github.com/carloslfuentes/propymes

Conflicts:
	app/models/working_day.rb