2.1 Changes

* Fixed demo projects to use master copy of NSObject-ObjectMap
* Changed instances of int to NSInteger to prepare for 64bit
architectures