Merge pull request #3 from proppy/sync

sync with caravel_user_project