First aproach to alere pima beads instrument interfice
LIMS-1500 Alere Pima's Instrument Interfice
Robotests for LIMS-1500

pau@Soliva-Laptop:~/dev/Espurna/bikalims/zinstance$ bin/test -t test_InstrumentInterficeAlerePima.robot
Running bika.lims.testing.BikaTestingLayer:Robot tests:
  Set up plone.testing.zca.LayerCleanup in 0.000 seconds.
  Set up plone.testing.z2.Startup in 0.220 seconds.
  Set up plone.app.testing.layers.PloneFixture in 7.257 seconds.
  Set up bika.lims.testing.BikaTestLayer in 1 minutes 2.007 seconds.
  Set up plone.testing.z2.ZServer in 0.519 seconds.
  Set up bika.lims.testing.BikaTestingLayer:Robot in 0.000 seconds.
  Running:
    1/2 (50.0%)The following test left new threads behind:
Import a slk Beads file (test_InstrumentInterficeAlerePima.robot)
New thread(s): [<_DummyThread(Dummy-1, started daemon 140412092290816)>]

  Ran 2 tests with 0 failures and 0 errors in 2 minutes 3.295 seconds.
Tearing down left over layers:
  Tear down bika.lims.testing.BikaTestingLayer:Robot in 0.000 seconds.
  Tear down plone.testing.z2.ZServer in 3.877 seconds.
  Tear down bika.lims.testing.BikaTestLayer in 0.030 seconds.
  Tear down plone.app.testing.layers.PloneFixture in 0.063 seconds.
  Tear down plone.testing.z2.Startup in 0.005 seconds.
  Tear down plone.testing.zca.LayerCleanup in 0.009 seconds.

Conflicts:
	bika/lims/tests/test_AnalysisRequest.robot
remove left-over merge markers
Merge pull request #1363 from Espurna/feature/LIMS-1500

Feature/lims 1500
Merge branch 'develop' of github.com:Adam-Brown/Bika-LIMS into LIMS-1493