end to end testing with robotframework
fixed bad input name in form
Merge pull request #95 from ox-it/quick-fix-on-add-talk-form

fixed bad input name in form
Update make test to include func. tests
Makefile: clean selenium screenshots
Test adding functional tests to travis
travis xvfb
Exclude tests todo
Merge branch 'master' into robot-tests

* master:
  fixed bad input name in form
Removed tag todo to two tests passing
Merge pull request #94 from ox-it/robot-tests

end to end testing with robotframework
Gitignore selenium-screenshot
Merge branch 'master' into update-old-talks

* master:
  Gitignore selenium-screenshot
  Removed tag todo to two tests passing
  Exclude tests todo
  travis xvfb
  Test adding functional tests to travis
  Makefile: clean selenium screenshots
  Update make test to include func. tests
  fixed bad input name in form
  end to end testing with robotframework
Attempt to fix func tests for travis
Merge branch 'master' into update-old-talks

* master:
  Attempt to fix func tests for travis