Merge pull request #1665 from Airblader/feature-1658

Added criterion 'window_type'

diff --cc docs/userguide
Simple merge

diff --cc include/data.h
Simple merge

diff --cc include/window.h
Simple merge

diff --cc include/xcb.h
Simple merge

diff --cc parser-specs/commands.spec
Simple merge

diff --cc parser-specs/config.spec
Simple merge

diff --cc src/commands.c
Simple merge

diff --cc src/config_directives.c
Simple merge

diff --cc src/ewmh.c
Simple merge

diff --cc src/handlers.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/manage.c
Simple merge

diff --cc src/match.c
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xcb.c
Simple merge