Merge into 'master' from https://github.com/DarkAnge39/Events.git
Merge into 'master' from https://github.com/DarkAngel39/Events.git