wda: shake/warmup, wds: commandline
Merge branch 'master' of github.com:jakubfi/mera400

Conflicts:
	wdreader/wda/wda.py
	wdreader/wda/wda2.py