Hej
Merge branch 'develop' of https://github.com/linlind/Shotris into develop

Conflicts:
	.metadata/.mylyn/.tasks.xml.zip
	.metadata/.mylyn/tasks.xml.zip
	.metadata/.plugins/org.eclipse.core.resources/.projects/Shotris/.indexes/e4/be/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Shotris/.indexes/e4/fd/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Shotris/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/Shotris/.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.epp.usagedata.recording/usagedata.csv
	.metadata/.plugins/org.eclipse.jdt.core/1145625852.index