WIP files and folder stuff
Merge branch 'master' of https://github.com/instructure/ic-data

Conflicts:
	lib/adapters/file.js
	lib/adapters/folder.js
	lib/main.js
	lib/models/file.js
	lib/models/folder.js
	lib/serializers/file.js
	lib/serializers/folder.js