Fixed time compare
Merge remote-tracking branch 'origin/master'

Conflicts:
	Time/Time/nbproject/private/private.xml
Merge branch 'master' of https://github.com/FHICT-S3-S33-JenE/GSO31-JenE