[MERGE]

addons/hr/__terp__.py

addons/hr/hr_wizard.xml

addons/hr/report/__init__.py

addons/hr/report/siso.xml

addons/hr/report/siso.xsl

addons/hr/wizard/__init__.py

addons/hr/wizard/sign_in_out.py

addons/hr_attendance/hr_attendance_wizard.xml

addons/hr_attendance/report/__init__.py

addons/hr_attendance/report/bymonth.py

addons/hr_attendance/report/bymonth.xsl

addons/hr_attendance/report/timesheet.py

addons/hr_attendance/report/timesheet.xsl

addons/hr_attendance/wizard/__init__.py

addons/hr_attendance/wizard/print_bymonth.py

addons/hr_attendance/wizard/print_byweek.py