change in view logic and time checker
Resolving conflicts due to merge

Conflicts:
	indigoSrc/FillUpMainWindow.java
	indigoSrc/TabbedPaneDisplay.java