regenerated assets. removed the dependency to will_paginate in docs
deleted conflicted files