Merge branch 'develop'
requiriment
gportfolio page