Merged conflict codes : Edwin 25-02-2014

-SIListing.m
-SIUtilities.m