after data report is implemented
Merge branch 'DataReport_Josh' into code

Conflicts:
	core/src/com/ubuntuserver/frontend/Logic/Logic_Dates.java