GUI-187
fixed issues listed except for register-as-image
merged develop
GUI-187
refined statement based on feedback
Merge branch 'develop' into GUI-187

Conflicts:
	koala/views/volumes.py
Merge pull request #37 from eucalyptus/GUI-187

Gui 187