Fixing route error
Changing back to merge full change without conflict(?)
Merge branch 'uat' of https://github.com/Sage-Bionetworks/BridgePF into uat
Merge tag 'release-20141016' into uat
Merge pull request #283 from Sage-Bionetworks/uat

Merge uat back to develop