Jaya|Fixed enable disable forms and added cukes for roles
Merge branch 'master' of github.com:rapidftr/RapidFTR
Jaya | Added tests for change log
Jaya|Fixed conflicts enable disable forms
Jaya|Fixed add role tests, merged the 2 steps
Merge pull request #465 from akash/master

merging pull req 458
Merge branch 'master' of https://github.com/kjayamit/RapidFTR into pull-req-449

Conflicts:
	capybara_features/step_definitions/role_steps.rb