part 2: accept user agreement
Merge branch 'origin/caribwhale'

Conflicts:
	src/main/java/org/ecocean/servlet/LoginUser.java