companies name clickable, show page working, questions now ajaxified
updated user model, resolve git conflict
fixed merge conflict