Initial commit according to new mockups
fixed semicolon issue
some mods
User profile update - initial implementation
User profile update implementation
finished implementation of user profile update
merge issue fix
Merged new_mockup_vs branch