conflict test
conflict test
more conflict tests
still trying to cause merge problems
Merge branch 'stas' into back

Conflicts:
	src/classes/Database.php
refactored event to use EventDate more
refactoring bug fixes
constructor fix
hopefully final bug fix
ever notice how you think you fixed a problem but in reality you have to fix like three more things after
According to my prediction there is still something wrong
Merge branch 'back'
link database to event calendar
Merge branch 'Long' into braden

Conflicts:
	src/AddPeople.php
	src/AddingForm.php
	src/CalendarView.php
	src/EditEvent.php
	src/Styles/Stylesheet.css
	src/css/calendarview.css
	src/css/fullcalendar/fullcalendar.css
	src/css/fullcalendar/fullcalendar.print.css
	src/css/jquery.qtip.css
	src/css/jquery.qtip.min.css
	src/css/styles/form.css
	src/css/styles/nova.css
	src/js/calendarview.js
	src/js/fullcalendar/fullcalendar.js
	src/js/fullcalendar/fullcalendar.min.js
	src/js/fullcalendar/gcal.js
	src/js/jotform.js
	src/js/location.js
	src/js/protoplus-ui.js
	src/js/protoplus.js
	src/js/prototype.js
	src/js/qtip/imagesloaded.pkg.min.js
	src/js/qtip/jquery-1.10.2.min.js
	src/js/qtip/jquery.qtip.js
	src/js/qtip/jquery.qtip.min.js
	src/js/qtip/jquery.qtip.min.map
	src/js/vendor/json2.js
	src/lib/jquery-ui.custom.min.js
	src/lib/jquery.min.js
	src/testevent.php