Upgraded bootstrap. Reverted back to previous commit where everything works.
Updated views/styles to be consistent with old branch.
Resolved database problem and upgraded all views pages. Beginning of adding user friendships.
Resolving merge conflicts