Merge all new Features/additions of cm10.1/CMFileManager to Xylon