Version bump to prevent an ancient version of fs from polluting
Merge branch 'develop' of github.com:caribou/caribou-frontend into develop

Conflicts:
	project.clj