Object window
Merge branch 'master' of github.com:ibre5041/PBM

Conflicts:
	src/org/ibre5041/parsing/window/WindowFactory.java
	src/org/ibre5041/parsing/window/WindowTypeEnum.java