jetzt ohne Kern
List statt Map als Parameter
kleine Anpassungen, Test angefangen
javadoc für die Interfaces ist fertig
Merge branch 'umbau'

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	doc/allclasses-frame.html
	doc/allclasses-noframe.html
	doc/com/de/haw/wpp/enums/Action.html
	doc/com/de/haw/wpp/enums/Element.html
	doc/com/de/haw/wpp/enums/Raum.html
	doc/com/de/haw/wpp/enums/class-use/Action.html
	doc/com/de/haw/wpp/enums/class-use/Element.html
	doc/com/de/haw/wpp/enums/class-use/Raum.html
	doc/com/de/haw/wpp/enums/package-frame.html
	doc/com/de/haw/wpp/enums/package-summary.html
	doc/com/de/haw/wpp/enums/package-tree.html
	doc/com/de/haw/wpp/enums/package-use.html
	doc/com/de/haw/wpp/fassade/IFassade.html
	doc/com/de/haw/wpp/fassade/class-use/IFassade.html
	doc/com/de/haw/wpp/fassade/package-frame.html
	doc/com/de/haw/wpp/fassade/package-summary.html
	doc/com/de/haw/wpp/fassade/package-tree.html
	doc/com/de/haw/wpp/fassade/package-use.html
	doc/com/de/haw/wpp/smarthomecontrol/BuildConfig.html
	doc/com/de/haw/wpp/smarthomecontrol/ColourWheel.OnColourWheelChangeListener.html
	doc/com/de/haw/wpp/smarthomecontrol/ColourWheel.html
	doc/com/de/haw/wpp/smarthomecontrol/ColourWheelActivity.html
	doc/com/de/haw/wpp/smarthomecontrol/ContextMenuTest.html
	doc/com/de/haw/wpp/smarthomecontrol/TrianglePath.html
	doc/com/de/haw/wpp/smarthomecontrol/WohnungActivity.html
	doc/com/de/haw/wpp/smarthomecontrol/class-use/BuildConfig.html
	doc/com/de/haw/wpp/smarthomecontrol/class-use/ColourWheel.OnColourWheelChangeListener.html
	doc/com/de/haw/wpp/smarthomecontrol/class-use/ColourWheel.html
	doc/com/de/haw/wpp/smarthomecontrol/class-use/ColourWheelActivity.html
	doc/com/de/haw/wpp/smarthomecontrol/class-use/ContextMenuTest.html
	doc/com/de/haw/wpp/smarthomecontrol/class-use/TrianglePath.html
	doc/com/de/haw/wpp/smarthomecontrol/class-use/WohnungActivity.html
	doc/com/de/haw/wpp/smarthomecontrol/package-frame.html
	doc/com/de/haw/wpp/smarthomecontrol/package-summary.html
	doc/com/de/haw/wpp/smarthomecontrol/package-tree.html
	doc/com/de/haw/wpp/smarthomecontrol/package-use.html
	doc/constant-values.html
	doc/help-doc.html
	doc/index-files/index-1.html
	doc/index-files/index-10.html
	doc/index-files/index-11.html
	doc/index-files/index-12.html
	doc/index-files/index-13.html
	doc/index-files/index-14.html
	doc/index-files/index-15.html
	doc/index-files/index-16.html
	doc/index-files/index-17.html
	doc/index-files/index-18.html
	doc/index-files/index-19.html
	doc/index-files/index-2.html
	doc/index-files/index-20.html
	doc/index-files/index-21.html
	doc/index-files/index-22.html
	doc/index-files/index-3.html
	doc/index-files/index-4.html
	doc/index-files/index-5.html
	doc/index-files/index-6.html
	doc/index-files/index-7.html
	doc/index-files/index-8.html
	doc/index-files/index-9.html
	doc/index.html
	doc/overview-frame.html
	doc/overview-summary.html
	doc/overview-tree.html
	doc/package-list
	src/com/de/haw/wpp/enums/Element.java
	src/com/de/haw/wpp/enums/Raum.java
	src/com/de/haw/wpp/fassade/FassadeImpl.java
	src/com/de/haw/wpp/fassade/FassadeKonfigurator.java
	src/com/de/haw/wpp/fassade/IFassade.java
	src/com/de/haw/wpp/fassade/kern/KernImpl.java
	src/com/de/haw/wpp/fassade/kern/manager/FensterManagerImpl.java
	src/com/de/haw/wpp/filter/Filter.java
	src/com/de/haw/wpp/smarthomecontrol/WohnungActivity.java
Fixing all kinds of merge errors. Manually insert application core from branch 'umbau' and preserved the GUI from master branch.