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

Conflicts:
	.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/.markers
	.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/3036814593.index
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	appcompat_v7/bin/appcompat_v7.jar
listActivity