Users now have to accept T&Cs on registration
Merge branch 'master' of https://github.com/DigitalCurationCentre/DMPonline_v4

Conflicts:
	app/models/user.rb