finish the function of adjusting the contents of list of Action List
Items.
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/model/conditions.js
	WebContent/ui/whoiswhere.view.js