Fixes the View Deck tab bug.
Merge branch 'feature/Iteration-4-dev-view-deck-tab-bug' into Iteration-4-dev

Conflicts:
	Janeway/.classpath