Some more work on cat history view

Next is merging the functionality of the edit and save buttons, and
adding login permission to do so. When I get a response from the client
on the Cat History form, I will continue work on that.
Merge remote-tracking branch 'origin/master'

Conflicts:
	NewBeginnings/test.db