Mai & Anoop: Story 1126: rename Field.enabled to Field.visible
Mai & Anoop: Story 1126: rename Field.enabled to Field.visible
Story 1126: fix some text in comment that was renamed by mistake
fix merge conflict
#1374 - Mark - Updated the application erb so that the navigation part of the header is only rendered when the user is logged in.
Initial commit
Update README.md
Update README.md
merge conflict
Merge remote-tracking branch 'upstream/master'
RapidFTR #1380 (Sumit/Nazneen) initial commit.
Merge remote-tracking branch 'upstream/master'
RapidFTR #1380 (Sumit/Nazneen) Adding "Flag as suspect" functionality to children list page.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Argha - [#1394] Hiding FORMS link based on Manage Forms permission
RapidFTR #1384 <Sumit/Nazneen> Added filtering to list of users. Created a view for User model to support simultaneous sorting and filtering functionality.Removed one test from controller spec which was no longer needed.
Merge remote-tracking branch 'upstream/master'
Removed merge conflict
Removed merge conflict