Merge 'version-2.0' into development
Minor work, bumping build number
Revert "Cleaning experimental work out of master"

This reverts commit 0da7631fbc40903fcb46753293af10e77956bfcb.

Conflicts:
	TypeExtensions/Other Extensions/Misc.h
saving work
Moving BTree stuff to branch (1/2)
Moving proxy stuff to branch (1/2)
Moving proxy stuff to branch (2/2)
Moving weak collection stuff to branch (1/2)
Moving dealloc listener stuff to branch (1/2)
Forgot to move something to ER-DeallocListener
Switching to ARC
Merge branch 'development' into ER-WeakProxy
Switching to ARC
ER-WeakProxy finished
Merge branch 'ER-WeakProxy' into development
Version bump
Merge branch 'Version-2.1'