GCP-7320
Merge branch 'branch_01282014_02052014' of https://github.com/digitalabs/Fieldbook into branch_01282014_02052014

Conflicts:
	src/main/webapp/WEB-INF/pages/NurseryManager/addOrRemoveTraits.html