Merge branch 'master' into gh-pages

Conflicts:
	javascripts/app.js

javascripts/models/task.js

@@ -1,13 +1,26 @@
 define(
-['backbone'
+['backbone',
+'localforage',
+'localforagebackbone'
 ],
 
 function(
-Backbone
+Backbone,
+localforage,
+localforageBackbone
 ) {
 
   var TaskModel = Backbone.Model.extend({
 
+    offlineSync: Backbone.localforage.sync('TaskModel'),
+    /** switches sync between server and local databases **/
+    sync: function(){
+              if (window.hackflowyOffline)
+                  return this.offlineSync.apply(this,arguments);
+              else
+                  return Backbone.sync.apply(this, arguments);
+    },
+
     defaults: {
 	  parentId: 0,
       content: '',
@@ -25,7 +38,7 @@ Backbone
     			//REVERT BACK ON ERROR
     			self.set({'isCompleted':prev_isCompleted});
     		}
-    	})
+    	});
     }
 
  });