bubble cloud hooked up to django app and almost working. Fixed static files issue
merge conflict resolved