merged new features from tabbed_properties branch into trunk
tabbed_properties branch merged into trunk completely