Revert "Merge branch 'ngfeature' into develop"

This reverts commit 6616466d5ab768d93ed86fa882bb8cde1570151f, reversing
changes made to 9e047a3f91bc6708312e1f44cdf7acb9691e486c.
contact template
Merge branch 'ngfeature' into develop