Merging develop on master

Before cloning the project to create the dictyHeaderFooter-angular-directive, I will merge everything to master