language bug fix ,portfolio, menu
Merge remote-tracking branch 'origin/master'