Personal info stuff in-progress.
fixed merge conflicts
ProfilePage.jsp all working, now all that's left to do is add more
PersonalInfo enums