Merge branch 'develop' of github.com:scholarslab/prism
Merge branch 'master' of github.com:scholarslab/prism
Merge branch 'develop'
Upgraded Rails.

This upgrades Rails to 3.2.11. This is for the security issue described
here:

http://weblog.rubyonrails.org/2013/1/8/Rails-3-2-11-3-1-10-3-0-19-and-2-3-15-have-been-released/
Merge branch 'develop' of github.com:scholarslab/prism into develop

Conflicts:
	Gemfile.lock