Adding browser option for the webdriver tests
Merge branch 'master' into jjgarcia/browser-option

Conflicts:
	ChangeLog
Merge pull request #47 from Zentyal/jjgarcia/browser-option

Adding browser option for the webdriver tests