Increase pas datelock to 60 seconds to help avoid duplicate records
during heavy load
Merge branch 'master' into release/1.4

Conflicts:
	models/PasAssignment.php