Worked on introscreen
Merge branch 'master' of git@github.com:joosterman/Accurator.git

Conflicts:
	Accurator/src/org/sealinc/accurator/client/component/IntroScreen.ui.xml