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
[Jmeter] Yekkanti - Configs
Merge branch 'master' of github.com:rapidftr/RapidFTR
1444 | Subhas | First round of purging admin permission from system

Conflicts:
	app/controllers/roles_controller.rb
1444 | Subhas | Clean traces of admin from the system
1444 | Subhas | Fix failing unit tests

Conflicts:
	Gemfile.lock
1444 | Subhas | Cleaning up more admin functionality

Conflicts:
	app/views/children/_summary_row.html.erb
	capybara_features/add_roles.feature
	lib/tasks/sunspot.rake
Merge branch 'master' of github.com:rapidftr/RapidFTR
FIX - Ashok - Adding '' for name if name field is not filled when we create the child recprd
Fix - Ashok - Check child.name before setting '' for child name
1444 | Subhas | Fix a lot of cukes
ci | Subhas | Speed up cucumber tests by not creating unnecessary form sections
ci | Subhas | Fix cuke errors when running in Travis
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge pull request #315 from rdsubhas/master

Merge #1444, #1458, #1452
1458 | Subhas | Added caching for profile images as well
ci | Subhas | Fixing Travis Issues