To be discussed with pakorn
Merge branch 'master' of https://github.com/amerdibs/Strukt_Front_End