Revert "2013-11-05"

This reverts commit 32f7b0e9a42b3942bd5f1196ccd9517e629ec1b2.

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	api/apiconfig.xml
	api/settings.py
	api/settings.pyc
	api/swift/swiftAPI.py
	api/swift/swiftAPI.pyc
	metadata/scloud.sql
	proxy/config.ini
	proxy/controller.py
	proxy/controller.pyc
	services/frontend/resmgr/container.py
	services/frontend/resmgr/container.pyc
	services/frontend/resmgr/domain.py
	services/frontend/resmgr/domain.pyc
	services/frontend/resmgr/obj.py
	services/frontend/resmgr/obj.pyc