Commit
Merge branch 'master' of https://github.com/nilsberglund/RoboLink

Conflicts:
	serial_test/.metadata/.log
	serial_test/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	serial_test/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	serial_test/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	serial_test/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	serial_test/.metadata/.plugins/org.eclipse.debug.ui/dialog_settings.xml
	serial_test/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	serial_test/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	serial_test/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	serial_test/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
	serial_test/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	serial_test/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
	serial_test/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	serial_test/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml