tests passing except 1, manual tests pass
instruct user to test manually as test will not pass due to javascript form submission
reason for leaving in commented code.
cleanup - remove ugly broken monkeypatch
ensure tests pass with locale selected
added connection reset for tests on osx
Merge branch 'feature/ruby2.1' into feature/add-theme-support

Conflicts:
	lib/casserver/server.rb
the template should change based on the service url and the host url