Merge pull request #1 from nadinejamila/master

latest with new models
bug fixes
Merge branch 'master' of https://github.com/josefmonje/workshop

Conflicts:
	db.py
	models/AllowancesDB.py
	models/AuthorizedManHoursDB.py
	models/ClientContactPersonsDB.py
	models/ClientsDB.py
	models/DetachmentContactPersonsDB.py
	models/DetachmentsDB.py
	models/FieldEmployeeTypesDB.py
	models/FieldEmployeesDB.py
	models/HolidayMORDB.py
	models/IncentiveMORDB.py
	models/Logs.py
	models/LogsDB.py
	models/ManHourLogsDB.py
	models/OfficeEmployeeTypesDB.py
	models/OfficeEmployees.py
	models/OfficeEmployeesDB.py
	models/PagibigCalamityLoansDB.py
	models/PagibigSalaryLoansDB.py
	models/PayrollRecordDB.py
	models/PersonalPayablesDB.py
	models/RateTypes.py
	models/RateTypesDB.py
	models/RatesDB.py
	models/ReceivablesDB.py
	models/SSSContributionsDB.py
	models/SSSLoansDB.py
	models/UniformDepositsDB.py
	models/db.py
	views.py
removed <<<<<HEAD, >>>>, etc from conflicts
fixing manhours. DE.Name not yet showing
fixed manhour. detachment name showing.
merge with josef