messing with integration tests
Merge branch 'master' into integration-tests
working integration test
Merge branch 'master' into integration-tests
Merge branch 'master' into integration-tests
test for signing out
working both session tests
jquery update
updated rails to rc2
Merge branch 'master' into sse

Conflicts:
	Gemfile.lock