Updated UML chart to represent most recent code.
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project
Fixed profile uploading, need to fix avatar.
Fixed the profile picture disappearing.
Fixed profile page from clearing entered info when uploading image.