Current master version didn't compile with Ogre 1.11.5

Hi,

I downloaded the current master version and wanted to use it in my program which is based on Ogre 1.11.5. The current code won't compile. Method signatures are not corresponding between AssimpLoader and AssimpImporter class. Looks like a wrong of code from Ogre 1.X and Ogre 2.
Also some types didnÄt match, e.g. "AssetOptions"  vs "AssOptions".
