rm *.svn
remove nasdisk
fix diskops
Merge branch 'master' of github.com:forkcode/znas

Conflicts:
	rootfs/etc/scripts/diskops
fix script