sessions control removed incorrect revision names from branch
added redirect to user show page after login.
fixed conflicts in the sessions controller after merging friendhips branch into master.
Merge branch 'friendships'
changed all associations to lowercase as they should not be uppercase.
fixed registration where user was not being redirected to the home page.
fixed new post facility. because of uppercase current_user.Posts.build, it was not posting a new status. changed Posts to lowercase p.
set default value for userType as 1 when registering. 1 = user.
added crud for articles.
moved the method to check if the correct user is trying to perform an action, i.e. to edit a profile. This is now moved into the sessions helper, so it can be used from anywhere.
added user permissions. another user cannot edit or delete an article.
added assocation in user model. added code to retreve the sspecified article for the show action of article controller. changed view to display the name of the author.
added full_name method in he user model to et the user's full name instead of joining the first and last name in each view.
Merge branch 'master' into wiki
added method in the article model to return articles with status = 2 for approved.
added method to check if current user is admin. userType 3 is admin.
Revert "added ajax to the follow/unfollow buttons on the user profile page."

This reverts commit 07aa787f130cd5fd5dfb90e36a24d4f3a2f65cb9.
changed education create and show action to custom and not scafold code. added error partial in the education new form.
added university and course dropdown lists, which get the names of universities and courses and pass the id on submit. also created user-friendly labeles.
Merge branch 'wiki' into educations