modified application controller
added collaborators
Merge branch 'mentor' of https://github.com/CliffRegis/HRkin into paid_users
added has_many through to Page, User and collaborators
paginate users on Wiki,table for users, edit wiki button
Collaboration controller & model added.
created colloborations
fixed user.friend count, and added js to Pages
added document column to Pages
various changes
Merge branch 'master' into paid_users
changes
other changes