further worked admin
Merge branch 'master' of https://github.com/jparicka/cloudly

Conflicts:
	cloud_storage/views.py