Changed JavaScript driver from selenium to phantomjs.
Merge branch 'master' of github.com:eaterprises/openfoodweb

Conflicts:
	Gemfile