fixed template formatting
changing rest endpoints back for compatibility
Merge branch 'develop'