event db
Merge branch 'master' of https://github.com/awanderson/photo_journal.git

Conflicts:
	Mobile Application Backend/src/APIs/Classes/Database
Objects/event_db.py