In base/Enumerated.m, loadobj() is commented out and int() is modified to support MATLAB 2013
Conflict in base/Enumerated.m is resolved
Conflict made in base/Enumerated is resolved while merging master