Merge branch 'dev' into 'master'

Restricted generation of documenation to master branch.

See merge request !3