added controller and salesforce controller test
Merge remote-tracking branch 'rp/master'