update
add docs
Merge branch 'master' of https://github.com/yimng/vstorage

Conflicts:
	gui/account/admin.py
	gui/account/forms.py
	gui/account/models.py
	gui/account/nav.py
	gui/account/urls.py
	gui/account/views.py
	gui/freeadmin/api/resources.py
	gui/freeadmin/middleware.py
	gui/freeadmin/options.py
	gui/freeadmin/static/css/custom.css
	gui/freeadmin/static/css/halsign.css
	gui/freeadmin/static/lib/js/freeadmin.js
	gui/freeadmin/static/lib/js/freeadmin/Menu.js
	gui/freeadmin/static/lib/js/freeadmin/VolumeManager.js
	gui/locale/zh_CN/LC_MESSAGES/django.po
	gui/locale/zh_CN/LC_MESSAGES/djangojs.po
	gui/policy/fixtures/initial_data.json
	gui/policy/models.py
	gui/policy/nav.py
	gui/policy/urls.py
	gui/policy/views.py
	gui/templates/account/bsdgroups_datagrid.html
	gui/templates/account/bsdusers_datagrid.html
	gui/templates/account/index.html
	gui/templates/base.html
	gui/templates/freeadmin/generic_form.html
	gui/templates/freeadmin/generic_model_datagrid.html
	gui/templates/freeadmin/index.html
	gui/templates/network/summary.html
	gui/templates/policy/add_device_policy.html
	gui/templates/policy/add_userdata_policy.html
	gui/templates/policy/delete_device_policy_confirm.html
	gui/templates/policy/delete_userdata_policy_confirm.html
	gui/templates/policy/index.html
	gui/templates/policy/view_device_policy.html
	gui/templates/policy/view_userdata_policy.html
	gui/templates/vtopmanage/bind_host.html
	gui/templates/vtopmanage/view_host.html
	gui/templates/vtopmanage/view_hosts.html
	gui/templates/vtopmanage/view_template.html
	gui/urls.py
	gui/vss/models.py
	gui/vss/test.py
	gui/vss/urls.py
	gui/vss/views.py
	gui/vtopmanage/models.py
	gui/vtopmanage/nav.py
	gui/vtopmanage/urls.py
	gui/vtopmanage/views.py