A whole bunch of stuff done! Some layout, some database, but not there yet..
Merge remote-tracking branch 'origin/master'

Conflicts:
	EventManager/src/main/java/edu/uno/eventmanager/MainActivity.java