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
[#Fixing Tests] Faris : Removed all I wait for x seconds.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge branch 'master' of https://github.com/kjayamit/RapidFTR into pull-req-449

Conflicts:
	capybara_features/step_definitions/role_steps.rb
Merge pull request #467 from akash/master

merging pull req 449
Merge pull request #466 from farismosman/master

[#Fixing Tests]
Faris/Akash - keeping old json calls in child controller to maintain backwards compatability
Merge pull request #468 from akash/master

reintroducing old json calls for backwards compatability
Faris/Akash/Subhas - updated deploy.rb to clean up old versions
Merge pull request #470 from akash/master

Faris/Akash/Subhas - updated deploy.rb to clean up old versions
Faris/Akash/Subhas - updated deploy.rb to clean up old versions
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	config/deploy.rb
Merge pull request #471 from akash/master

attempting to fix deployment to test
Akash - cleaning up routes file
akash - #1709 - creating child media controller under api namespace to deal with android specific media calls
Merge pull request #474 from akash/master

akash - #1709 - creating child media controller under api namespace to deal with android specific media calls