Test
Merge remote-tracking branch 'origin'
did a dbinit, no changes done to schema
DB view change
Merge remote-tracking branch 'ta/master'
Move rails to 4.0.1.rc2, paperclip 3.5.2, coffee-rails 4.0.1