Merge branch 'master' into gh-pages

Conflicts:
	javascripts/app.js

javascripts/collections/list.js

@@ -1,21 +1,35 @@
 define(
 [
 'backbone',
-'models/task'
+'models/task',
+'localforage',
+'localforagebackbone'
 ],
 
 function(
 Backbone,
-Task
+Task,
+localforage,
+localforageBackbone
 ) {
 
   var List = Backbone.Collection.extend({
 
+
     model: Task,
+    offlineSync: Backbone.localforage.sync("tasks"),
+    /** 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);
+    },
+
     url: '/tasks'
-    
+
  });
 
 return List;
 
-});
+});