added userprofile and edituserprofile
on the meeeerge
onthemergeMerge branch 'dev' of github.com:VitoInfinito/codedark into dev