Merge pull request #47 from andredempsey/andre

Andre
resolved minor issues with users show/edit and links before deployment