Merge pull request #377 from BuracayBeach/team2_v6.1

fix bugs
- fixed : update profile page no safeguard
Merge remote-tracking branch 'origin/master'
Merge pull request #378 from BuracayBeach/team1/bugfixing

Team1/bugfixing
Initial team 5 bugfix
Initial team 5 merge
Merge pull request #379 from BuracayBeach/Team_5_version_3.0

Team 5 version 3.0