tests
(cherry picked from commit 262a16f)
Now able to test javascripts!
Upgrading rails
Merge branch 'test_test'

Conflicts:
	Gemfile.lock
Merging test selenium stuff