final deploy refinaments 2
Merge branch 'devel'