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
ci | Subhas | Fix specs
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
RapidFTR #1457 (Sumit/Nazneen) Initially display only a set number of records on the Child List Page. Need to improve pagination logic, by moving from Kaminary.paginate_array to Couchrest 1.1.2 supported pagination with Kaminari or WillPaginate.
Removed Merge conflict
[Fix Build] Kavitha - Fixed a failing cuke
#1459 - Ashok/Suganthi - Changed the sunspot to commit after 60secs or 10000 docs instead if commiting for ever request in production env alone
REFACTORING - Suganthi - Added star after textbox in register user form
Fix : Ashok/Suganthi - Fixed Advanced Search
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge pull request #318 from rdsubhas/master

Fix User Disabled Specs
FIX - Ashok/Yekkati - Reset the locale to en in form_section_spec
RapidFTR #1457 (Sumit/Nazneen) Changed pagination from kaminari to WillPaginate. To support WillPagination 'paginated_collection' method. Also moved logic of filtering records from 'ChildrenPresenter' to CouchDB views.
Merge remote-tracking branch 'upstream/master' into pagination
Fix - Ashok/Kishore - Made changes to the rake task to pick solr pid location or Dir.tmpdir
Fix - Ashok - Downgraded sunspot_solr to 1.3.1 as 1.3.3 having some issues with stopping and starting solr
changing the listing of roles, that can be ascending or descending