Fixed validation.
Deleted unused import.
Added and changed parse Time methods.
Deleted unused import.
Fixed conflict
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/resources/i18n/messages_es.properties