* new selenate version 0.2.15

Signed-off-by: Davor Stimac <davor.stimac@gmail.com>
Merge remote-tracking branch 'tomo/master'
Merge remote-tracking branch 'tomo/feature-ff-screens' into feature-ff-screens
* SessionDisplay  override toString

Signed-off-by: Davor Stimac <davor.stimac@gmail.com>
* added trace-logger to selenate server
* new selenate version 0.2.15-1

Signed-off-by: Davor Stimac <davor.stimac@gmail.com>
* akka application config load dependant on branch.config

Signed-off-by: Davor Stimac <davor.stimac@gmail.com>
* info about branch is loaded via jvm params
* configs moved to ~/.config/selenate/<branch>/ folder
* application.conf for "akka.remote.netty.hostname" is loaded in runtime (branch dependant)
* new SELENATE CLIENT/SERVER VERSION = 0.2.16

Signed-off-by: Davor Stimac <davor.stimac@gmail.com>
upstreamed config loading to feature-ff-sreeens

Merge branch 'master' into feature-ff-screens

Conflicts:
	code/Client/src/main/java/net/selenate/client/user/ActorFactory.java
	code/Server/src/main/scala/net/selenate/server/C.scala
	code/Server/src/main/scala/net/selenate/server/actors/ActorFactory.scala
	code/project/Settings.scala

Signed-off-by: Davor Stimac <davor.stimac@gmail.com>
config load fix

Signed-off-by: Davor Stimac <davor.stimac@gmail.com>
* multi xvfb screen fix
* scala 2.10.4
* sbt 0.13.5

Signed-off-by: Davor Stimac <davor.stimac@gmail.com>
* Selenium bump to 2.42.2
* logging to DriverPool
* removed import SendKeys
* fixed bug in selenate firefox for window title
Merge remote-tracking branch 'presjednik/feature-ff-screens' into feature-ff-screens