added uid method for Source model
fixed conflicts in models.py