GCP-7302
GCP-5761
GCP-7303
GCP-7301
GCP-7303
Merge branch 'branch_01282014_02052014' of https://github.com/digitalabs/Fieldbook into branch_01282014_02052014
GCP-7317
GCP-7317
Merge branch 'branch_01282014_02052014' of https://github.com/digitalabs/Fieldbook into branch_01282014_02052014

Conflicts:
	src/main/webapp/WEB-INF/pages/NurseryManager/nurseryDetails.html
GCP-7318
GCP-7317
Merge branch 'branch_01282014_02052014' of https://github.com/digitalabs/Fieldbook into branch_01282014_02052014
GCP-7317
fix the tables
GCP-7317
GCP-7317
GCP-7317
GCP-7317
GCP-7317
GCP-7317