Queries
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/com/newcodingtoncity/model/daos/EventsDAO.class