Working on getting dropbox directory stuff
Merge branch 'master' of github.com:darioml/soh-get-stuff-done

Conflicts:
	rails-backend/app/models/project.rb