fix profile.php
query
Merge remote-tracking branch 'origin/master'