Merge branch 'develop' of github.com:unl/wdntemplates into develop