Merge branch 'master' into fastPhantomJs
Merge branch 'master' into fastPhantomJs
Update fast phantomJs code to new selenium version
Merge branch 'fastPhantomJs' into fastProcessor

Conflicts:
	src/main/java/com/xebia/incubator/xebium/fastphantomjsdriver/FastDriverCommandExecutor.java