Second slide staged
Merge branch 'master' of https://github.com/sckol/whistle

Conflicts:
	dispatcher/res/css/ius.css