Merged changes from integration
Merge branch 'a_and_a' of github.com:CodeCoreYVR/event_management into a_and_a