added insert statements that create test org hierarchy
machine type changes
Merge branch 'branch_20130208' of https://github.com/open-infinity/cmt into branch_20130208

Conflicts:
	cloud/cloud-administrator/sql/cmt_extension_data.sql
	cloud/cloud-administrator/src/main/webapp/js/cloudadmin/dialog/dialog.instance.js