#660 - Working on extracting the restful webservice out of the directive and moving it to the template editor controller.
Merge remote-tracking branch 'origin/t660' into t660