Merge branch 'v1.0'

Conflicts:
	package.json

runtime/raptor-templates-runtime.js

@@ -49,12 +49,15 @@ function Template(renderFunc) {
 }
 
 Template.prototype = {
-    render: function(data, callback, context) {
+    render: function(data, context) {
         if (data == null) {
             data = {};
         }
 
-        if (typeof callback === 'function') {
+        var callback;
+
+        if (typeof context === 'function') {
+            callback = context;
             context = new Context();
 
             context
@@ -67,11 +70,17 @@ Template.prototype = {
 
             context.end();
         } else {
+            var shouldEnd = false;
+            if (!context) {
+                context = new Context();
+                shouldEnd = true;
+            }
             // A context object was provided instead of a callback
-            context = callback;
-            callback = null;
-
             this._(data, context);    //Invoke the template rendering function with the required arguments
+            
+            if (shouldEnd) {
+                context.end();
+            }
         }
 
         return context;

taglibs/core/core-tag-transformer.js

@@ -281,6 +281,9 @@ module.exports = function transform(node, compiler, template) {
         },
         'c-input': function(attr) {
             inputAttr = attr.value;
+        },
+        'c-data': function(attr) {
+            inputAttr = attr.value;
         }
     };