Merge branch 'master' of https://github.com/JurajBurian/slick-presentation1

Conflicts:
	slides/slides.odp
	src/main/scala/jubu/presentation/slick/inserts.sc
	src/main/scala/jubu/presentation/slick/optimisticLocking.sc
	src/main/scala/jubu/presentation/slick/updates.sc

just update
Merge branch 'master' of https://github.com/JurajBurian/slick-presentation1

Conflicts:
	slides/slides.odp
	src/main/scala/jubu/presentation/slick/inserts.sc
	src/main/scala/jubu/presentation/slick/optimisticLocking.sc
	src/main/scala/jubu/presentation/slick/updates.sc