Trying to fix stress saving and loading
Changed algorithm to merge stress results

Fixed bug in viewer for files relating to the same deal in different folders
Increased Version Number
Closes #170
Implementing Libor Floors and Caps
Implemented floors and caps.

Needs testing.
Relates to #80