upgrade to rails 3.2.12. upgrade json gem to 1.7.7
web interface does not support oauth scopes. closes gh-354
fix selecting primary and deleting profile photo. closes gh-353
use attr-accessible for Photo, Address and Group. closes gh-357
Merge remote-tracking branch 'upstream/master'