added selenium server and moved some stuff around
resolved merge conflict between selenium and ftp changes