final fixes
Merge branch 'master' of github.com:stevenhornung/InterCloud

Conflicts:
	.DS_Store