added project show action and related views and partials
resolved conflicts