Removed waiting state. Reimplemented state change logic.
Fixed and improved guide in client template logic files.
Merge branch 'master' into better-client

New states.