Merge branch 'hotfix'
changed name of  main php file
Merge branch 'hotfix' into develop