James Allen c56648ab80 Merge branch 'master' into master-redesign ... Conflicts: app/views/project/list.jade public/coffee/list.coffee public/stylesheets/less/list.less public/stylesheets/less/style.less		2014-06-17 11:54:29 +01:00
..
Doc.coffee
File.coffee
Folder.coffee
Project.coffee
Subscription.coffee
User.coffee