added fields of study
Merge remote-tracking branch 'origin/experimental' into experimental

Conflicts:
	account/models.py