Update selenium-webdriver to 2.35.1
Merge branch '08_features' into 09_speedup

Conflicts:
	Gemfile
	Gemfile.lock
fix custom matcher example
Merge branch '07_controller_cleanup' into 08_features
Merge branch '08_features' into 09_speedup