Debugging of edit

Error result in unable to edit time
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Constants.java
	src/Logic.java