command
Merge branch 'master' of https://github.com/rockst/VWSL

Conflicts:
	import_test_data.php
fix