Added spec for returning to show view on cancelling edit.
Modified form actions to customise cancel.
Added on edit orphan cancel return to show orphan feature spec and f.options changes.
Added feature on cancel edit partner spec return to partner show page and updated controller to get spec to pass.
Added spec for returning to show view on cancelling edit.
Modified form actions to customise cancel.
Added on edit orphan cancel return to show orphan feature spec and f.options changes.
Added feature on cancel edit partner spec return to partner show page and updated controller to get spec to pass.
Write scenario for request_fulfilled updating when requested_orphan_count changes
Make Sponsor#set_request_fulfilled private; adjust & improve specs
Added father_alive field to Orphan model

OSRA-221 #code-review
Removed all hardcoded gender strings and put them in yaml config file
Refactored feature specs.
Refactored specs for return to view page on cancelling edit.
Resolved conflict.
Updated orphans.feature spec reincluding city which causes failure.
Resolved merge issue.
Merge pull request #141 from 4lexm/osra197_show_view_on_cancel_edit

Osra197 show view on cancel edit
OSRA-197 #resolve