[upd] presentation
Merge branch 'work' of github.com:Inouit/t3uni14-presentation into work

Conflicts:
	presentation/css/source/theme.scss
	presentation/css/theme.css
	presentation/slides/conclusion.md
	presentation/slides/t3-skinFlex.md