issue#198 - profile and home page pannel
edit a user who are login
user profile with entry
fix confic
 fix conflicts
confict........
fix conflictssssssssssssssssss
Merge pull request #452 from kevin000/issue#201

fix conflict