Add the uploader class to upload a pupil picture
Merge remote-tracking branch 'origin/model-setup' into model-setup

Conflicts:
	Gemfile
Merge remote-tracking branch 'origin/model-setup' into model-setup

Conflicts:
	Gemfile