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

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteLights/.indexes/e4/60/e3/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteLights/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteLights/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteLights/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.root/11.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/2811512151.index
	.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/RemoteLights.apk
	RemoteLights/bin/jarlist.cache
	RemoteLights/bin/resources.ap_
	appcompat_v7/bin/appcompat_v7.jar