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