Feanil/xavier rc cale fix

Cale's hotfix with imports reverted to not break manage.py.