Added more information to user profile, create edit, and error checking on profile page.
Merge origin/master