Added base classes
Merge branch '2013.12.02' into develop