University user with devise, fixed project paths following shallow routing
fixed merge conflicts