...
...
...
Merge branch 'development' of https://github.com/MiikaLumme/Projekti into development

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.history/44/e0afd8eb490300141293ed14fd908a22
	.metadata/.plugins/org.eclipse.core.resources/.history/6/6012b4824a0300141293ed14fd908a22
	.metadata/.plugins/org.eclipse.core.resources/.history/a9/2098fa914a0300141293ed14fd908a22
	.metadata/.plugins/org.eclipse.core.resources/.history/c3/109bff24470300141293ed14fd908a22
	.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteLights/.indexes/e4/60/e3/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteLights/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteLights/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteLights/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/29.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.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.jdt.ui/jdt-images/0.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/4.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/5.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/7.png
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
...
Merge branch 'development' of https://github.com/MiikaLumme/Projekti into development

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteLights/.indexes/e4/60/e3/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteLights/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteLights/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteLights/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/34.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.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.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	RemoteLights/bin/RemoteLights.apk
	RemoteLights/bin/classes.dex
	RemoteLights/bin/resources.ap_
	RemoteLights/src/kesaprojekti/remotelights/ConnectionHandler.java
.
...
..
Merge branch 'development' of https://github.com/MiikaLumme/Projekti into development

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteLights/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteLights/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.jdt.core/3036814593.index
	RemoteLights/bin/RemoteLights.apk
	RemoteLights/bin/classes.dex
......
Switch Button Color, Added more stuff on list layout