Working version 1.2
Merge branch 'master' of https://github.com/DrailDragon/Event_Management_System