Merge pull request #376 from BuracayBeach/team1/bugfixing

Team1/bugfixing
fix bugs
Merge pull request #377 from BuracayBeach/team2_v6.1

fix bugs
- fixed : update profile page no safeguard
Merge remote-tracking branch 'origin/master'