States fixed (except special)
Merge branch 'master' of github.com:jmcomets/EUSDAB

Conflicts:
	include/states/all.h
	include/states/wait.h
	src/states/wait.cpp