Selenium admin and website testing done.
Fixed merged conflicts, added Selenium tests.
Merge pull request #25 from gkadillak/selenium-testing

Selenium admin and website testing done.