Removed boost headers, as they are no longer needed.
Fix for ambiguous enable_shared_from_this(). Each (derived) class now has a proper getPtr() method to get a shared pointer from the instance.
Merge remote-tracking branch 'upstream/master' into scons