Final adjustments
Merge branch 'master' of https://github.com/acntech/SW2014-presentation

Conflicts:
	slides/slides.jade