Merge branch 'release/presentation_draft' into develop
Merge branch 'pres_20140403' into develop

* pres_20140403:
  more notes, skipping a slide (possibly removing or re-using later)
  keywords, short information on slides
use maven for dependencies in test project
Merge branch 'develop'

* develop:
  use maven for dependencies in test project