updates models and population
Merge branch 'master' of https://github.com/c-rhodes/collab

Conflicts:
	colab/ogidni/models.py
fix