reset the git repo
Merge branch 'master' of https://github.com/yimng/vstorage

Conflicts:
	gui/system/migrations/0001_initial.py
	gui/system/migrations/0003_auto__add_email.py
	gui/system/migrations/0052_auto__add_field_advanced_adv_debugkernel.py
	gui/vss/views.py
	nanobsd/Files/etc/rc.conf
	nanobsd/Files/etc/rc.d/vtrans
	nanobsd/Files/etc/vtrans/rsyncd.conf
	nanobsd/os-base