Change date format and some constants
Changed string constants of Controller and Logic
Merge branch 'UI'

Conflicts:
	src/Logic.java