Merge branch 'templates' into develop

modules/default/helloworld/helloworld.html

@@ -0,0 +1,5 @@
+<!--
+	Use | striptags(true) for HTML rendering
+	https://mozilla.github.io/nunjucks/templating.html#striptags-value-preserve_linebreaks
+-->
+<div class="normal">{{text | striptags(true)}}</div>

modules/default/helloworld/helloworld.js

@@ -14,10 +14,11 @@ Module.register("helloworld",{
 		text: "Hello World!"
 	},
 
-	// Override dom generator.
-	getDom: function() {
-		var wrapper = document.createElement("div");
-		wrapper.innerHTML = this.config.text;
-		return wrapper;
+	getTemplate: function () {
+		return "helloworld.html"
+	},
+
+	getTemplateData: function () {
+		return this.config
 	}
 });