...
Added more lights and rooms
...
Merge branch 'development' of https://github.com/MiikaLumme/Projekti into development

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteLights/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.jdt.core/3036814593.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	RemoteLights/bin/classes/kesaprojekti/remotelights/PullParserHandler.class
	RemoteLights/src/kesaprojekti/remotelights/PullParserHandler.java
	appcompat_v7/bin/appcompat_v7.jar
...
Added more in xml