updated gem file
deal with the jquery-ui issue
fix sign_in collision
fix pagination collision
one more paginaiton conflict
add admin resources
fix root routing
add a few model tests