Merge branch 'master' of https://github.com/y4nn/MobWebApp_ComemStar.git