Marital status code was changed to string
Merge branch 'master' of https://github.com/nysenate/ESS-Time-Attendance

Conflicts:
	src/main/java/gov/nysenate/seta/dao/EmployeeRowMapper.java
work in progress of slightly complicated supervisor retrieval