Merge branch 'user_info'
migration correction
Merge branch 'user_info'
Merge branch 'through_model'

Conflicts:
	dashboard/migrations/0001_initial.py
commenting village filter
adding server log add/edit functionality + initial server log migrations
serverlog migration
cocouser model addition + migrations + initial view for coco
removing prints
view for website from incremental
Merge branch 'data_log' into new_website

Conflicts:
	urls.py
adding update person fuinctionality in website log + renaming the file
renaming
adding pma to incremental
api V3
user based api
Merge branch 'new_website' of https://github.com/digitalgreenorg/dg into new_website

Conflicts:
	website/models.py
updating migrations
Merge branch 'new_website' into test_server_alt

Conflicts:
	forms.py
changes in migrations