part 1: user acceptance agreement requirement
part 2: accept user agreement
part 3: reset all users for new user agreement
User Agreement Part 4: turn on and off form in content
Merge commit '6297c8605ecd7c9c5ad7bbdb7872aef703566797' into mantamatcher.org

Conflicts:
	src/main/resources/bundles/commonConfiguration.properties