locking jquery-rails 2.2.1
removed extra blanks
Merge branch 'master' of https://github.com/tsauvine/o4

Conflicts:
	Gemfile