rollbacked devise and tweaked pictures index viex
resolved conflicts