creating branch aegir (using port 4569)
(branch aegir) adding selenium tests and making Travis run selenium tests aswell
(branch aegir) adding selenium tests and making Travis run selenium tests aswell.
fixing selenium tests
mergin master-aegir with master, solving conflicts in .travis.yml